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.118 by root, Thu Jun 15 15:47:35 2006 UTC vs.
Revision 1.194 by root, Thu Jul 12 17:56:50 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)
		9	#endif
		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
6	#endif	14	#endif
7		15
8	#include "EXTERN.h"	16	#include "EXTERN.h"
9	#include "perl.h"	17	#include "perl.h"
10	#include "XSUB.h"	18	#include "XSUB.h"
11		19
		20	#ifdef _WIN32
		21	# undef pipe
		22	#endif
		23
		24	#include <assert.h>
12	#include <math.h>	25	#include <math.h>
13	#include <string.h>	26	#include <string.h>
14	#include <stdio.h>	27	#include <stdio.h>
15	#include <stdlib.h>	28	#include <stdlib.h>
16		29
…		…
18	#include <SDL_endian.h>	31	#include <SDL_endian.h>
19	#include <SDL_image.h>	32	#include <SDL_image.h>
20	#include <SDL_mixer.h>	33	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	34	#include <SDL_opengl.h>
22		35
		36	#define PANGO_ENABLE_BACKEND
		37	#define G_DISABLE_CAST_CHECKS
		38
23	#include <glib/gmacros.h>	39	#include <glib/gmacros.h>
24		40
25	#include <pango/pango.h>	41	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		42
30	#ifndef _WIN32	43	#ifndef _WIN32
31	# include <sys/types.h>	44	# include <sys/types.h>
32	# include <sys/socket.h>	45	# include <sys/socket.h>
33	# include <netinet/in.h>	46	# include <netinet/in.h>
34	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
35	# include <inttypes.h>	48	# include <inttypes.h>
36	#else
37	typedef unsigned char uint8_t;
38	typedef unsigned short uint16_t;
39	typedef unsigned int uint32_t;
40	typedef signed char int8_t;
41	typedef signed short int16_t;
42	typedef signed int int32_t;
43	#endif	49	#endif
44		50
45	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46		52
47	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
48		54
49	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
51		57
52	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
		59
		60	#if 0
		61	# define PARACHUTE SDL_INIT_NOPARACHUTE
		62	#else
		63	# define PARACHUTE 0
		64	#endif
		65
		66	static AV *texture_av;
53		67
54	static struct	68	static struct
55	{	69	{
56	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	71	#include "glfunc.h"
58	#undef GL_FUNC	72	#undef GL_FUNC
59	} gl;	73	} gl;
60		74
		75	static void
61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
62	{	77	{
63	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
64	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
65	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	82	else
68	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
69	}	84	}
70		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/*glBindTexture (GL_TEXTURE_2D, name);*/
		105	/*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
		110	#include "texcache.c"
		111
		112	#include "pango-font.c"
		113	#include "pango-fontmap.c"
		114	#include "pango-render.c"
		115
71	typedef Mix_Chunk *CFClient__MixChunk;	116	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	117	typedef Mix_Music *CFPlus__MixMusic;
73		118
74	typedef PangoFontDescription *CFClient__Font;	119	typedef PangoFontDescription *CFPlus__Font;
		120
		121	static int
		122	shape_attr_p (PangoLayoutRun *run)
		123	{
		124	GSList *attrs = run->item->analysis.extra_attrs;
		125
		126	while (attrs)
		127	{
		128	PangoAttribute *attr = attrs->data;
		129
		130	if (attr->klass->type == PANGO_ATTR_SHAPE)
		131	return 1;
		132
		133	attrs = attrs->next;
		134	}
		135
		136	return 0;
		137	}
75		138
76	typedef struct cf_layout {	139	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	140	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	141	float r, g, b, a; // default color for rgba mode
80	int base_height;	142	int base_height;
81	CFClient__Font font;	143	CFPlus__Font font;
82	} *CFClient__Layout;	144	} *CFPlus__Layout;
83		145
84	static CFClient__Font default_font;	146	static CFPlus__Font default_font;
85	static PangoContext *ft2_context, *cairo_context;	147	static PangoContext *opengl_context;
86	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	148	static PangoFontMap *opengl_fontmap;
87		149
88	static void	150	static void
89	substitute_func (FcPattern *pattern, gpointer data)	151	substitute_func (FcPattern *pattern, gpointer data)
90	{	152	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	153	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	154	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	155	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	156	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	157	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	158	}
101		159
102	static void	160	static void
103	layout_update_font (CFClient__Layout self)	161	layout_update_font (CFPlus__Layout self)
104	{	162	{
105	/* use a random scale factor to account for unknown descenders, 0.8 works	163	/* use a random scale factor to account for unknown descenders, 0.8 works
106	* reasonably well with bitstream vera	164	* reasonably well with bitstream vera
107	*/	165	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	166	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		170
113	pango_layout_set_font_description (self->pl, font);	171	pango_layout_set_font_description (self->pl, font);
114	}	172	}
115		173
116	static void	174	static void
117	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	175	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118	{	176	{
		177	PangoRectangle rect;
		178
		179	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	180	pango_layout_get_extents (self->pl, 0, &rect);
120		181
121	if (!*w) *w = 1;	182	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!*h) *h = 1;	183	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		184
124	*w = (*w + 3) & ~3;	185	if (!rect.width) rect.width = 1;
125	}	186	if (!rect.height) rect.height = 1;
126		187
		188	*w = rect.width;
		189	*h = rect.height;
		190	}
		191
		192	typedef uint16_t tileid;
127	typedef uint16_t mapface;	193	typedef uint16_t faceid;
128		194
129	typedef struct {	195	typedef struct {
130	GLint name;	196	int name;
131	int w, h;	197	int w, h;
132	float s, t;	198	float s, t;
133	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
134	} maptex;	202	} maptex;
135		203
136	typedef struct {	204	typedef struct {
		205	uint32_t player;
		206	tileid tile[3];
137	int16_t darkness;	207	uint16_t darkness;
138	mapface face[3];	208	uint8_t stat_width, stat_hp, flags, smoothmax;
139	} mapcell;	209	} mapcell;
140		210
141	typedef struct {	211	typedef struct {
142	int32_t c0, c1;	212	int32_t c0, c1;
143	mapcell *col;	213	mapcell *col;
144	} maprow;	214	} maprow;
145		215
146	typedef struct map {	216	typedef struct map {
147	int x, y, w, h;	217	int x, y, w, h;
148	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
149	int faces;	219	int faces; tileid *face2tile; // [faceid]
150	mapface *face;	220	int texs; maptex *tex; // [tileid]
151
152	int texs;
153	maptex *tex;
154		221
155	int32_t rows;	222	int32_t rows;
156	maprow *row;	223	maprow *row;
157	} *CFClient__Map;	224	} *CFPlus__Map;
158		225
159	static char *	226	static char *
160	prepend (char *ptr, int sze, int inc)	227	prepend (char *ptr, int sze, int inc)
161	{	228	{
162	char *p;	229	char *p;
…		…
179	}	246	}
180		247
181	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
		270
184	static maprow *	271	static maprow *
185	map_get_row (CFClient__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
186	{	273	{
187	if (0 > y)	274	if (0 > y)
188	{	275	{
189	int extend = - y + MAP_EXTEND_Y;	276	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	277	Prepend (maprow, self->row, self->rows, extend);
…		…
228		315
229	return row->col + (x - row->c0);	316	return row->col + (x - row->c0);
230	}	317	}
231		318
232	static mapcell *	319	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	320	map_get_cell (CFPlus__Map self, int x, int y)
234	{	321	{
235	return row_get_cell (map_get_row (self, y), x);	322	return row_get_cell (map_get_row (self, y), x);
236	}	323	}
237		324
238	static void	325	static void
239	map_clear (CFClient__Map self)	326	map_clear (CFPlus__Map self)
240	{	327	{
241	int r;	328	int r;
242		329
243	for (r = 0; r < self->rows; r++)	330	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	331	Safefree (self->row[r].col);
…		…
252	self->row = 0;	339	self->row = 0;
253	self->rows = 0;	340	self->rows = 0;
254	}	341	}
255		342
256	static void	343	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	344	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	345	{
259	int x, y;	346	int x, y;
260	maprow *row;	347	maprow *row;
		348	mapcell *cell;
261		349
262	for (y = y0; y < y0 + h; y++)	350	for (y = y0; y < y0 + h; y++)
263	if (y >= 0)	351	if (y >= 0)
264	{	352	{
265	if (y >= self->rows)	353	if (y >= self->rows)
…		…
271	if (x >= row->c0)	359	if (x >= row->c0)
272	{	360	{
273	if (x >= row->c1)	361	if (x >= row->c1)
274	break;	362	break;
275		363
276	row->col[x - row->c0].darkness = -1;	364	cell = row->col + x - row->c0;
		365
		366	cell->darkness = 0;
		367	cell->stat_hp = 0;
		368	cell->flags = 0;
		369	cell->player = 0;
277	}	370	}
278	}	371	}
		372	}
		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV *hv, smooth_key *key, IV bits)
		381	{
		382	SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (*sv, SvIVX (*sv) | bits);
		386	else
		387	sv_setiv (*sv, bits);
279	}	388	}
280		389
281	static void	390	static void
282	music_finished (void)	391	music_finished (void)
283	{	392	{
…		…
319	n |= n >> 16;	428	n |= n >> 16;
320		429
321	return n + 1;	430	return n + 1;
322	}	431	}
323		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
		436
324	MODULE = CFClient PACKAGE = CFClient	437	MODULE = CFPlus PACKAGE = CFPlus
325		438
326	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
327		440
328	BOOT:	441	BOOT:
329	{	442	{
330	HV *stash = gv_stashpv ("CFClient", 1);	443	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	444	static const struct {
332	const char *name;	445	const char *name;
333	IV iv;	446	IV iv;
334	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	448	# define const_iv(name) { # name, (IV)name }
		449	const_iv (SDLK_MODIFIER_MIN),
		450	const_iv (SDLK_MODIFIER_MAX),
		451
336	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
337	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
338	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
339	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
340	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
349	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
350	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
351	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
352	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
353	const_iv (SDL_USEREVENT),	469	const_iv (SDL_USEREVENT),
		470
		471	const_iv (SDL_APPINPUTFOCUS),
		472	const_iv (SDL_APPMOUSEFOCUS),
		473	const_iv (SDL_APPACTIVE),
		474
354	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
355	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
356	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
357	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
358	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
413	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
414	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
415	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
416	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
417	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
418	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
419	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
420	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
421	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
422	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
423	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
424	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
425	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
426	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
427	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
428	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
429	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
430	const_iv (KMOD_CTRL),
431	const_iv (KMOD_SHIFT),
432	const_iv (KMOD_ALT),
433	const_iv (KMOD_META)
434	# undef const_iv	556	# undef const_iv
435	};	557	};
436		558
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	559	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	560	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		561
		562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
439	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
		571
		572	int
		573	in_destruct ()
		574	CODE:
		575	RETVAL = PL_main_cv == Nullcv;
		576	OUTPUT:
		577	RETVAL
440		578
441	NV floor (NV x)	579	NV floor (NV x)
442		580
443	NV ceil (NV x)	581	NV ceil (NV x)
444		582
445	void	583	void
446	pango_init ()	584	pango_init ()
447	CODE:	585	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	586	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	588	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454	}
455	{
456	cairo_font_options_t *fopt = cairo_font_options_create ();
457	cairo_fontmap = pango_cairo_font_map_get_default ();
458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459	#ifdef _WIN32
460	// cairo looks like shit eaten twice on windows
461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462	#else
463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464	#endif
465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467	pango_cairo_context_set_font_options (cairo_context, fopt);
468	cairo_font_options_destroy (fopt);
469	}
470	}	590	}
471		591
472	int	592	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	593	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
474		594
475	void	595	void
476	SDL_Quit ()	596	SDL_Quit ()
477		597
478	void	598	void
…		…
493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496		616
497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	617	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		618	#if SDL_VERSION_ATLEAST(1,2,10)
		619	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		620	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		621	#endif
498		622
499	SDL_EnableUNICODE (1);	623	SDL_EnableUNICODE (1);
500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	624	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501		625
502	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
522	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
523	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
524	);	648	);
525	if (RETVAL)	649	if (RETVAL)
526	{	650	{
		651	av_clear (texture_av);
		652
527	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
528	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
529	# include "glfunc.h"	655	# include "glfunc.h"
530	# undef GL_FUNC	656	# undef GL_FUNC
		657
531	}	658	}
532	OUTPUT:	659	OUTPUT:
533	RETVAL	660	RETVAL
534		661
535	void	662	void
…		…
554	case SDL_KEYDOWN:	681	case SDL_KEYDOWN:
555	case SDL_KEYUP:	682	case SDL_KEYUP:
556	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	683	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
557	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	684	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
558	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	685	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		686	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
559	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	687	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
560	break;	688	break;
561		689
562	case SDL_ACTIVEEVENT:	690	case SDL_ACTIVEEVENT:
563	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	691	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	717	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	718	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591	break;	719	break;
592	}	720	}
593		721
594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	722	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595	}	723	}
596	}	724	}
597		725
598	int	726	int
599	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	727	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
608	Mix_AllocateChannels (int numchans = -1)	736	Mix_AllocateChannels (int numchans = -1)
609		737
610	void	738	void
611	lowdelay (int fd, int val = 1)	739	lowdelay (int fd, int val = 1)
612	CODE:	740	CODE:
		741	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		742
		743	void
		744	win32_proxy_info ()
		745	PPCODE:
		746	{
613	#ifndef _WIN32	747	#ifdef _WIN32
614	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	748	char buffer[2048];
		749	DWORD buflen;
		750
		751	EXTEND (SP, 3);
		752
		753	buflen = sizeof (buffer);
		754	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		755	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		756	{
		757	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		758
		759	buflen = sizeof (buffer);
		760	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		761	{
		762	PUSHs (newSVpv (buffer, 0));
		763
		764	buflen = sizeof (buffer);
		765	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		766	PUSHs (newSVpv (buffer, 0));
		767	}
		768	}
615	#endif	769	#endif
		770	}
616		771
617	void	772	void
618	add_font (char *file)	773	add_font (char *file)
619	CODE:	774	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	775	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		776
626	void	777	void
627	load_image_inline (SV *image_)	778	load_image_inline (SV *image_)
628	ALIAS:	779	ALIAS:
629	load_image_file = 1	780	load_image_file = 1
…		…
671		822
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	823	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		824
674	assert (surface2->pitch == surface2->w * 4);	825	assert (surface2->pitch == surface2->w * 4);
675		826
		827	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	828	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	829	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	830	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	831	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681	SDL_UnlockSurface (surface2);
682	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	832	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	833	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	834	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		835	SDL_UnlockSurface (surface2);
685		836
686	SDL_FreeSurface (surface);	837	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	838	SDL_FreeSurface (surface2);
688	}	839	}
689		840
…		…
728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	879	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
729	#endif	880	#endif
730	_exit (1);	881	_exit (1);
731		882
732	void	883	void
733	_exit (int retval)	884	_exit (int retval = 0)
734	CODE:	885	CODE:
		886	#ifdef WIN32
		887	ExitThread (retval); // unclean, please beam me up
		888	#else
735	_exit (retval);	889	_exit (retval);
		890	#endif
736		891
		892	void
		893	debug ()
		894	CODE:
		895	{
		896	#if DEBUG
		897	VALGRIND_DO_LEAK_CHECK;
		898	#endif
		899	}
		900
737	MODULE = CFClient PACKAGE = CFClient::Font	901	MODULE = CFPlus PACKAGE = CFPlus::Font
738		902
739	CFClient::Font	903	CFPlus::Font
740	new_from_file (SV *class, char *path, int id = 0)	904	new_from_file (SV *class, char *path, int id = 0)
741	CODE:	905	CODE:
742	{	906	{
743	int count;	907	int count;
744	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	908	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
747	}	911	}
748	OUTPUT:	912	OUTPUT:
749	RETVAL	913	RETVAL
750		914
751	void	915	void
752	DESTROY (CFClient::Font self)	916	DESTROY (CFPlus::Font self)
753	CODE:	917	CODE:
754	pango_font_description_free (self);	918	pango_font_description_free (self);
755		919
756	void	920	void
757	make_default (CFClient::Font self)	921	make_default (CFPlus::Font self)
758	CODE:	922	CODE:
759	default_font = self;	923	default_font = self;
760		924
761	MODULE = CFClient PACKAGE = CFClient::Layout	925	MODULE = CFPlus PACKAGE = CFPlus::Layout
762		926
763	CFClient::Layout	927	void
764	new (SV *class, int rgba = 0)	928	reset_glyph_cache ()
		929	CODE:
		930	tc_clear ();
		931
		932	CFPlus::Layout
		933	new (SV *class)
765	CODE:	934	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	935	New (0, RETVAL, 1, struct cf_layout);
767		936
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	937	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	938	RETVAL->r = 1.;
771	RETVAL->g = 1.;	939	RETVAL->g = 1.;
772	RETVAL->b = 1.;	940	RETVAL->b = 1.;
773	RETVAL->a = 1.;	941	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	942	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
778	layout_update_font (RETVAL);	946	layout_update_font (RETVAL);
779	OUTPUT:	947	OUTPUT:
780	RETVAL	948	RETVAL
781		949
782	void	950	void
783	DESTROY (CFClient::Layout self)	951	DESTROY (CFPlus::Layout self)
784	CODE:	952	CODE:
785	g_object_unref (self->pl);	953	g_object_unref (self->pl);
786	Safefree (self);	954	Safefree (self);
787		955
		956	void
		957	set_text (CFPlus::Layout self, SV *text_)
		958	CODE:
		959	{
		960	STRLEN textlen;
		961	char *text = SvPVutf8 (text_, textlen);
		962
		963	pango_layout_set_text (self->pl, text, textlen);
		964	}
		965
		966	void
		967	set_markup (CFPlus::Layout self, SV *text_)
		968	CODE:
		969	{
		970	STRLEN textlen;
		971	char *text = SvPVutf8 (text_, textlen);
		972
		973	pango_layout_set_markup (self->pl, text, textlen);
		974	}
		975
		976	void
		977	set_shapes (CFPlus::Layout self, ...)
		978	CODE:
		979	{
		980	PangoAttrList *attrs = 0;
		981	const char *text = pango_layout_get_text (self->pl);
		982	const char *pos = text;
		983	int arg = 4;
		984
		985	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		986	{
		987	PangoRectangle inkrect, rect;
		988	PangoAttribute *attr;
		989
		990	int x = SvIV (ST (arg - 3));
		991	int y = SvIV (ST (arg - 2));
		992	int w = SvIV (ST (arg - 1));
		993	int h = SvIV (ST (arg ));
		994
		995	inkrect.x = 0;
		996	inkrect.y = 0;
		997	inkrect.width = 0;
		998	inkrect.height = 0;
		999
		1000	rect.x = x * PANGO_SCALE;
		1001	rect.y = y * PANGO_SCALE;
		1002	rect.width = w * PANGO_SCALE;
		1003	rect.height = h * PANGO_SCALE;
		1004
		1005	if (!attrs)
		1006	attrs = pango_layout_get_attributes (self->pl);
		1007
		1008	attr = pango_attr_shape_new (&inkrect, &rect);
		1009	attr->start_index = pos - text;
		1010	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		1011	pango_attr_list_insert (attrs, attr);
		1012
		1013	arg += 4;
		1014	pos += sizeof (OBJ_STR) - 1;
		1015	}
		1016
		1017	if (attrs)
		1018	pango_layout_set_attributes (self->pl, attrs);
		1019	}
		1020
		1021	void
		1022	get_shapes (CFPlus::Layout self)
		1023	PPCODE:
		1024	{
		1025	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		1026
		1027	do
		1028	{
		1029	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		1030
		1031	if (run && shape_attr_p (run))
		1032	{
		1033	PangoRectangle extents;
		1034	pango_layout_iter_get_run_extents (iter, 0, &extents);
		1035
		1036	EXTEND (SP, 2);
		1037	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		1038	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		1039	}
		1040	}
		1041	while (pango_layout_iter_next_run (iter));
		1042
		1043	pango_layout_iter_free (iter);
		1044	}
		1045
788	int	1046	int
789	is_rgba (CFClient::Layout self)	1047	has_wrapped (CFPlus::Layout self)
790	CODE:	1048	CODE:
791	RETVAL = self->rgba;	1049	{
		1050	int lines = 1;
		1051	const char *text = pango_layout_get_text (self->pl);
		1052
		1053	while (*text)
		1054	lines += *text++ == '\n';
		1055
		1056	RETVAL = lines < pango_layout_get_line_count (self->pl);
		1057	}
792	OUTPUT:	1058	OUTPUT:
793	RETVAL	1059	RETVAL
794		1060
795	void
796	set_text (CFClient::Layout self, SV *text_)
797	CODE:
798	{
799	STRLEN textlen;
800	char *text = SvPVutf8 (text_, textlen);
801
802	pango_layout_set_text (self->pl, text, textlen);
803	}
804
805	void
806	set_markup (CFClient::Layout self, SV *text_)
807	CODE:
808	{
809	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);
811
812	pango_layout_set_markup (self->pl, text, textlen);
813	}
814
815	SV *	1061	SV *
816	get_text (CFClient::Layout self)	1062	get_text (CFPlus::Layout self)
817	CODE:	1063	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1064	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819	sv_utf8_decode (RETVAL);	1065	sv_utf8_decode (RETVAL);
820	OUTPUT:	1066	OUTPUT:
821	RETVAL	1067	RETVAL
822		1068
823	void	1069	void
824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1070	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825	CODE:	1071	CODE:
826	self->r = r;	1072	self->r = r;
827	self->g = g;	1073	self->g = g;
828	self->b = b;	1074	self->b = b;
829	self->a = a;	1075	self->a = a;
830		1076
831	void	1077	void
832	set_font (CFClient::Layout self, CFClient::Font font = 0)	1078	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833	CODE:	1079	CODE:
834	if (self->font != font)	1080	if (self->font != font)
835	{	1081	{
836	self->font = font;	1082	self->font = font;
837	layout_update_font (self);	1083	layout_update_font (self);
838	}	1084	}
839		1085
840	void	1086	void
841	set_height (CFClient::Layout self, int base_height)	1087	set_height (CFPlus::Layout self, int base_height)
842	CODE:	1088	CODE:
843	if (self->base_height != base_height)	1089	if (self->base_height != base_height)
844	{	1090	{
845	self->base_height = base_height;	1091	self->base_height = base_height;
846	layout_update_font (self);	1092	layout_update_font (self);
847	}	1093	}
848		1094
849	void	1095	void
850	set_width (CFClient::Layout self, int max_width = -1)	1096	set_width (CFPlus::Layout self, int max_width = -1)
851	CODE:	1097	CODE:
852	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1098	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853		1099
854	void	1100	void
855	set_indent (CFClient::Layout self, int indent)	1101	set_indent (CFPlus::Layout self, int indent)
856	CODE:	1102	CODE:
857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1103	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858		1104
859	void	1105	void
860	set_spacing (CFClient::Layout self, int spacing)	1106	set_spacing (CFPlus::Layout self, int spacing)
861	CODE:	1107	CODE:
862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1108	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863		1109
864	void	1110	void
865	set_ellipsise (CFClient::Layout self, int ellipsise)	1111	set_ellipsise (CFPlus::Layout self, int ellipsise)
866	CODE:	1112	CODE:
867	pango_layout_set_ellipsize (self->pl,	1113	pango_layout_set_ellipsize (self->pl,
868	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1114	ellipsise == 1 ? PANGO_ELLIPSIZE_START
869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1115	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1116	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
871	: PANGO_ELLIPSIZE_NONE	1117	: PANGO_ELLIPSIZE_NONE
872	);	1118	);
873		1119
874	void	1120	void
875	set_single_paragraph_mode (CFClient::Layout self, int spm)	1121	set_single_paragraph_mode (CFPlus::Layout self, int spm)
876	CODE:	1122	CODE:
877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1123	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878		1124
879	void	1125	void
880	size (CFClient::Layout self)	1126	size (CFPlus::Layout self)
881	PPCODE:	1127	PPCODE:
882	{	1128	{
883	int w, h;	1129	int w, h;
884		1130
885	layout_get_pixel_size (self, &w, &h);	1131	layout_get_pixel_size (self, &w, &h);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	1134	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	1135	PUSHs (sv_2mortal (newSViv (h)));
890	}	1136	}
891		1137
892	int	1138	int
		1139	descent (CFPlus::Layout self)
		1140	CODE:
		1141	{
		1142	PangoRectangle rect;
		1143	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1144	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1145	RETVAL = PANGO_DESCENT (rect);
		1146	}
		1147	OUTPUT:
		1148	RETVAL
		1149
		1150	int
893	xy_to_index (CFClient::Layout self, int x, int y)	1151	xy_to_index (CFPlus::Layout self, int x, int y)
894	CODE:	1152	CODE:
895	{	1153	{
896	int index, trailing;	1154	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1155	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898	RETVAL = index;	1156	RETVAL = index + trailing;
899	}	1157	}
900	OUTPUT:	1158	OUTPUT:
901	RETVAL	1159	RETVAL
902		1160
903	void	1161	void
904	cursor_pos (CFClient::Layout self, int index)	1162	cursor_pos (CFPlus::Layout self, int index)
905	PPCODE:	1163	PPCODE:
906	{	1164	{
907	PangoRectangle strong_pos;	1165	PangoRectangle strong_pos;
908	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1166	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909		1167
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1170	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1171	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1172	}
915		1173
916	void	1174	void
917	render (CFClient::Layout self)	1175	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
918	PPCODE:	1176	PPCODE:
919	{	1177	{
920	SV *retval;	1178	int line, x;
921	int w, h;
922		1179
923	layout_get_pixel_size (self, &w, &h);	1180	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1181	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
924		1182
925	if (self->rgba)
926	{
927	cairo_surface_t *surface;
928	cairo_t *cairo;
929
930	retval = newSV (w * h * 4);
931	SvPOK_only (retval);
932	SvCUR_set (retval, w * h * 4);
933
934	memset (SvPVX (retval), 0, w * h * 4);
935
936	surface = cairo_image_surface_create_for_data (
937	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
938	cairo = cairo_create (surface);
939	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941	pango_cairo_show_layout (cairo, self->pl);
942
943	cairo_destroy (cairo);
944	cairo_surface_destroy (surface);
945
946	// what a mess, and its premultiplied, too :(
947	{
948	uint32_t *p = (uint32_t *)SvPVX (retval);
949	uint32_t *e = p + w * h;
950
951	while (p < e)
952	{
953	uint32_t rgba = *p;
954	rgba = (rgba >> 24) | (rgba << 8);
955	#if 0
956	#ifdef _WIN32
957	{//D
958	uint8_t r = rgba >> 24;
959	uint8_t g = rgba >> 16;
960	uint8_t b = rgba >> 8;
961	uint8_t a = rgba >> 0;
962
963	rgba = (rgba & 0xffffff00) | a;
964	}
965	#endif
966	#endif
967	rgba = SDL_SwapBE32 (rgba);
968	*p++ = rgba;
969	}
970	}
971
972	EXTEND (SP, 5);	1183	EXTEND (SP, 2);
973	PUSHs (sv_2mortal (newSViv (w)));	1184	PUSHs (sv_2mortal (newSViv (line - 1)));
		1185	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1186	}
		1187
		1188	void
		1189	line_x_to_index (CFPlus::Layout self, int line, int x)
		1190	PPCODE:
		1191	{
		1192	PangoLayoutLine *lp;
		1193	int index, trailing;
		1194
		1195	if (line < 0)
		1196	XSRETURN_EMPTY;
		1197
		1198	if (!(lp = pango_layout_get_line (self->pl, line)))
		1199	XSRETURN_EMPTY; /* do better */
		1200
		1201	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1202
		1203	EXTEND (SP, 2);
		1204	if (GIMME_V == G_SCALAR)
974	PUSHs (sv_2mortal (newSViv (h)));	1205	PUSHs (sv_2mortal (newSViv (index + trailing)));
975	PUSHs (sv_2mortal (retval));
976	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978	}
979	else	1206	else
980	{	1207	{
981	FT_Bitmap bitmap;
982
983	retval = newSV (w * h);
984	SvPOK_only (retval);
985	SvCUR_set (retval, w * h);
986
987	bitmap.rows = h;
988	bitmap.width = w;
989	bitmap.pitch = w;
990	bitmap.buffer = (unsigned char*)SvPVX (retval);
991	bitmap.num_grays = 256;
992	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994	memset (bitmap.buffer, 0, w * h);
995
996	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998	EXTEND (SP, 5);
999	PUSHs (sv_2mortal (newSViv (w)));	1208	PUSHs (sv_2mortal (newSViv (index)));
1000	PUSHs (sv_2mortal (newSViv (h)));	1209	PUSHs (sv_2mortal (newSViv (trailing)));
1001	PUSHs (sv_2mortal (retval));
1002	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004	}	1210	}
1005	}	1211	}
1006		1212
		1213	void
		1214	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1215	PPCODE:
		1216	pango_opengl_render_layout_subpixel (
		1217	self->pl,
		1218	x * PANGO_SCALE, y * PANGO_SCALE,
		1219	self->r, self->g, self->b, self->a,
		1220	flags
		1221	);
		1222
1007	MODULE = CFClient PACKAGE = CFClient::Texture	1223	MODULE = CFPlus PACKAGE = CFPlus::Texture
1008		1224
1009	void	1225	void
1010	pad2pot (SV *data_, SV *w_, SV *h_)	1226	pad2pot (SV *data_, SV *w_, SV *h_)
1011	CODE:	1227	CODE:
1012	{	1228	{
…		…
1090	glDisable (GL_ALPHA_TEST);	1306	glDisable (GL_ALPHA_TEST);
1091	glDisable (GL_BLEND);	1307	glDisable (GL_BLEND);
1092	}	1308	}
1093	}	1309	}
1094		1310
1095	MODULE = CFClient PACKAGE = CFClient::Map	1311	MODULE = CFPlus PACKAGE = CFPlus::Map
1096		1312
1097	CFClient::Map	1313	CFPlus::Map
1098	new (SV *class, int map_width, int map_height)	1314	new (SV *class)
1099	CODE:	1315	CODE:
1100	New (0, RETVAL, 1, struct map);	1316	New (0, RETVAL, 1, struct map);
1101	RETVAL->x = 0;	1317	RETVAL->x = 0;
1102	RETVAL->y = 0;	1318	RETVAL->y = 0;
1103	RETVAL->w = map_width;	1319	RETVAL->w = 0;
1104	RETVAL->h = map_height;	1320	RETVAL->h = 0;
1105	RETVAL->ox = 0;	1321	RETVAL->ox = 0;
1106	RETVAL->oy = 0;	1322	RETVAL->oy = 0;
1107	RETVAL->faces = 8192;	1323	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1108	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1324	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1109	RETVAL->texs = 8192;
1110	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1111	RETVAL->rows = 0;	1325	RETVAL->rows = 0;
1112	RETVAL->row = 0;	1326	RETVAL->row = 0;
1113	OUTPUT:	1327	OUTPUT:
1114	RETVAL	1328	RETVAL
1115		1329
1116	void	1330	void
1117	DESTROY (CFClient::Map self)	1331	DESTROY (CFPlus::Map self)
1118	CODE:	1332	CODE:
1119	{	1333	{
1120	map_clear (self);	1334	map_clear (self);
1121	Safefree (self->face);	1335	Safefree (self->face2tile);
1122	Safefree (self->tex);	1336	Safefree (self->tex);
1123	Safefree (self);	1337	Safefree (self);
1124	}	1338	}
1125		1339
1126	void	1340	void
		1341	resize (CFPlus::Map self, int map_width, int map_height)
		1342	CODE:
		1343	self->w = map_width;
		1344	self->h = map_height;
		1345
		1346	void
1127	clear (CFClient::Map self)	1347	clear (CFPlus::Map self)
1128	CODE:	1348	CODE:
1129	map_clear (self);	1349	map_clear (self);
1130		1350
1131	void	1351	void
1132	set_face (CFClient::Map self, int face, int texid)	1352	set_tileid (CFPlus::Map self, int face, int tile)
1133	CODE:	1353	CODE:
1134	{	1354	{
1135	while (self->faces <= face)	1355	need_facenum (self, face); self->face2tile [face] = tile;
1136	{	1356	need_texid (self, tile);
1137	Append (mapface, self->face, self->faces, self->faces);
1138	self->faces *= 2;
1139	}
1140
1141	self->face [face] = texid;
1142	}	1357	}
1143		1358
1144	void	1359	void
		1360	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1361	CODE:
		1362	{
		1363	tileid texid;
		1364	maptex *tex;
		1365
		1366	if (face < 0 || face >= self->faces)
		1367	return;
		1368
		1369	if (smooth < 0 || smooth >= self->faces)
		1370	return;
		1371
		1372	texid = self->face2tile [face];
		1373
		1374	if (!texid)
		1375	return;
		1376
		1377	tex = self->tex + texid;
		1378	tex->smoothtile = self->face2tile [smooth];
		1379	tex->smoothlevel = level;
		1380	}
		1381
		1382	void
1145	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)	1383	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)
1146	CODE:	1384	CODE:
1147	{	1385	{
1148	while (self->texs <= texid)	1386	need_texid (self, texid);
1149	{
1150	Append (maptex, self->tex, self->texs, self->texs);
1151	self->texs *= 2;
1152	}
1153		1387
1154	{	1388	{
1155	maptex *tex = self->tex + texid;	1389	maptex *tex = self->tex + texid;
1156		1390
1157	tex->name = name;	1391	tex->name = name;
…		…
1174	// from transparent color bleeding and ugly wrapping effects.	1408	// from transparent color bleeding and ugly wrapping effects.
1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1409	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176	}	1410	}
1177		1411
1178	int	1412	int
1179	ox (CFClient::Map self)	1413	ox (CFPlus::Map self)
1180	ALIAS:	1414	ALIAS:
1181	oy = 1	1415	oy = 1
1182	x = 2	1416	x = 2
1183	y = 3	1417	y = 3
1184	w = 4	1418	w = 4
…		…
1195	}	1429	}
1196	OUTPUT:	1430	OUTPUT:
1197	RETVAL	1431	RETVAL
1198		1432
1199	void	1433	void
1200	scroll (CFClient::Map self, int dx, int dy)	1434	scroll (CFPlus::Map self, int dx, int dy)
1201	CODE:	1435	CODE:
1202	{	1436	{
1203	if (dx > 0)	1437	if (dx > 0)
1204	map_blank (self, self->x, self->y, dx - 1, self->h);	1438	map_blank (self, self->x, self->y, dx, self->h);
1205	else if (dx < 0)	1439	else if (dx < 0)
1206	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1440	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1207		1441
1208	if (dy > 0)	1442	if (dy > 0)
1209	map_blank (self, self->x, self->y, self->w, dy - 1);	1443	map_blank (self, self->x, self->y, self->w, dy);
1210	else if (dy < 0)	1444	else if (dy < 0)
1211	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1445	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1212		1446
1213	self->ox += dx; self->x += dx;	1447	self->ox += dx; self->x += dx;
1214	self->oy += dy; self->y += dy;	1448	self->oy += dy; self->y += dy;
1215		1449
1216	while (self->y < 0)	1450	while (self->y < 0)
…		…
1221	self->y += MAP_EXTEND_Y;	1455	self->y += MAP_EXTEND_Y;
1222	}	1456	}
1223	}	1457	}
1224		1458
1225	void	1459	void
1226	map1a_update (CFClient::Map self, SV *data_)	1460	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227	CODE:	1461	CODE:
1228	{	1462	{
1229	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1463	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1230	uint8_t *data_end = (uint8_t *)SvEND (data_);	1464	uint8_t *data_end = (uint8_t *)SvEND (data_);
1231	mapcell *cell;	1465	mapcell *cell;
1232	int x, y, flags;	1466	int x, y, flags;
1233		1467
1234	while (data < data_end)	1468	while (data < data_end - 1)
1235	{	1469	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1470	flags = (data [0] << 8) + data [1]; data += 2;
1237		1471
1238	x = ((flags >> 10) & 63) + self->x;	1472	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1473	y = self->y + ((flags >> 4) & 63);
1240		1474
1241	cell = map_get_cell (self, x, y);	1475	cell = map_get_cell (self, x, y);
1242		1476
1243	if (flags & 15)	1477	if (flags & 15)
1244	{	1478	{
1245	if (cell->darkness < 0)	1479	if (!cell->darkness)
1246	{	1480	{
		1481	memset (cell, 0, sizeof (*cell));
1247	cell->darkness = 0;	1482	cell->darkness = 256;
1248	cell->face [0] = 0;
1249	cell->face [1] = 0;
1250	cell->face [2] = 0;
1251	}	1483	}
1252		1484
1253	cell->darkness = flags & 8 ? *data++ : 255;
1254
1255	//TODO: don't trust server data to be in-range(!)	1485	//TODO: don't trust server data to be in-range(!)
		1486
		1487	if (flags & 8)
		1488	{
		1489	if (extmap)
		1490	{
		1491	uint8_t ext, cmd;
		1492
		1493	do
		1494	{
		1495	ext = *data++;
		1496	cmd = ext & 0x3f;
		1497
		1498	if (cmd < 4)
		1499	cell->darkness = 255 - ext * 64 + 1;
		1500	else if (cmd == 5) // health
		1501	{
		1502	cell->stat_width = 1;
		1503	cell->stat_hp = *data++;
		1504	}
		1505	else if (cmd == 6) // monster width
		1506	cell->stat_width = *data++ + 1;
		1507	else if (cmd == 0x47)
		1508	{
		1509	if (*data == 4)
		1510	; // decode player count
		1511
		1512	data += *data + 1;
		1513	}
		1514	else if (cmd == 8) // cell flags
		1515	cell->flags = *data++;
		1516	else if (ext & 0x40) // unknown, multibyte => skip
		1517	data += *data + 1;
		1518	else
		1519	data++;
		1520	}
		1521	while (ext & 0x80);
		1522	}
		1523	else
		1524	cell->darkness = *data++ + 1;
		1525	}
1256		1526
1257	if (flags & 4)	1527	if (flags & 4)
1258	{	1528	{
1259	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1529	faceid face = (data [0] << 8) + data [1]; data += 2;
		1530	need_facenum (self, face);
		1531	cell->tile [0] = self->face2tile [face];
1260	}	1532	}
1261		1533
1262	if (flags & 2)	1534	if (flags & 2)
1263	{	1535	{
1264	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1536	faceid face = (data [0] << 8) + data [1]; data += 2;
		1537	need_facenum (self, face);
		1538	cell->tile [1] = self->face2tile [face];
1265	}	1539	}
1266		1540
1267	if (flags & 1)	1541	if (flags & 1)
1268	{	1542	{
1269	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1543	faceid face = (data [0] << 8) + data [1]; data += 2;
		1544	need_facenum (self, face);
		1545	cell->tile [2] = self->face2tile [face];
1270	}	1546	}
1271	}	1547	}
1272	else	1548	else
1273	cell->darkness = -1;	1549	cell->darkness = 0;
1274	}	1550	}
1275	}	1551	}
1276		1552
1277	SV *	1553	SV *
1278	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1554	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279	CODE:	1555	CODE:
1280	{	1556	{
1281	int x1, x;	1557	int x1, x;
1282	int y1, y;	1558	int y1, y;
1283	int z;	1559	int z;
…		…
1304	{	1580	{
1305	mapcell *cell = row->col + (x - row->c0);	1581	mapcell *cell = row->col + (x - row->c0);
1306		1582
1307	for (z = 0; z <= 0; z++)	1583	for (z = 0; z <= 0; z++)
1308	{	1584	{
1309	mapface face = cell->face [z];
1310
1311	if (face)
1312	{
1313	maptex tex = self->tex [face];	1585	maptex tex = self->tex [cell->tile [z]];
1314	int a0 = 255 - tex.a;	1586	int a0 = 255 - tex.a;
1315	int a1 = tex.a;	1587	int a1 = tex.a;
1316		1588
1317	r = (r * a0 + tex.r * a1) / 255;	1589	r = (r * a0 + tex.r * a1) / 255;
1318	g = (g * a0 + tex.g * a1) / 255;	1590	g = (g * a0 + tex.g * a1) / 255;
1319	b = (b * a0 + tex.b * a1) / 255;	1591	b = (b * a0 + tex.b * a1) / 255;
1320	a = (a * a0 + tex.a * a1) / 255;	1592	a = (a * a0 + tex.a * a1) / 255;
1321	}
1322	}	1593	}
1323	}	1594	}
1324		1595
1325	*map++ = (r )	1596	*map++ = (r )
1326	| (g << 8)	1597	| (g << 8)
…		…
1333	}	1604	}
1334	OUTPUT:	1605	OUTPUT:
1335	RETVAL	1606	RETVAL
1336		1607
1337	void	1608	void
1338	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1609	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1339	CODE:	1610	CODE:
1340	{	1611	{
1341	int vx, vy;	1612	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1613	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1614	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1615	smooth_key skey;
1342	int x, y, z;	1616	int x, y, z;
1343	int last_name;	1617	int last_name;
1344	mapface face;
1345		1618
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1619	// thats current max. sorry.
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1620	if (sw > 255) sw = 255;
		1621	if (sh > 255) sh = 255;
1348		1622
1349	/*	1623	// clear key, in case of extra padding
1350	int vx = self->vx = self->w >= sw	1624	memset (&skey, 0, sizeof (skey));
1351	? self->x + (self->w - sw) / 2
1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1353
1354	int vy = self->vy = self->h >= sh
1355	? self->y + (self->h - sh) / 2
1356	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1357	*/
1358		1625
1359	glColor4ub (255, 255, 255, 255);	1626	glColor4ub (255, 255, 255, 255);
1360		1627
1361	glEnable (GL_BLEND);	1628	glEnable (GL_BLEND);
1362	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1629	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1365		1632
1366	glBegin (GL_QUADS);	1633	glBegin (GL_QUADS);
1367		1634
1368	last_name = 0;	1635	last_name = 0;
1369		1636
		1637	mx += self->x;
		1638	my += self->y;
		1639
		1640	// first pass: determine smooth_max
		1641	// rather ugly, if you ask me
		1642	// could also be stored inside mapcell and updated on change
		1643	memset (smooth_max, 0, sizeof (smooth_max));
		1644
		1645	for (y = 0; y < sh; y++)
		1646	if (0 <= y + my && y + my < self->rows)
		1647	{
		1648	maprow *row = self->row + (y + my);
		1649
		1650	for (x = 0; x < sw; x++)
		1651	if (row->c0 <= x + mx && x + mx < row->c1)
		1652	{
		1653	mapcell *cell = row->col + (x + mx - row->c0);
		1654
		1655	smooth_max[x + 1][y + 1] =
		1656	MAX (self->tex [cell->tile [0]].smoothlevel,
		1657	MAX (self->tex [cell->tile [1]].smoothlevel,
		1658	self->tex [cell->tile [2]].smoothlevel));
		1659	}
		1660	}
		1661
1370	for (z = 0; z < 3; z++)	1662	for (z = 0; z <= 2; z++)
		1663	{
		1664	memset (smooth_level, 0, sizeof (smooth_level));
		1665
1371	for (y = 0; y < sh; y++)	1666	for (y = 0; y < sh; y++)
1372	if (0 <= y + vy && y + vy < self->rows)	1667	if (0 <= y + my && y + my < self->rows)
1373	{	1668	{
1374	maprow *row = self->row + (y + vy);	1669	maprow *row = self->row + (y + my);
1375		1670
1376	for (x = 0; x < sw; x++)	1671	for (x = 0; x < sw; x++)
1377	if (row->c0 <= x + vx && x + vx < row->c1)	1672	if (row->c0 <= x + mx && x + mx < row->c1)
1378	{	1673	{
1379	mapcell *cell = row->col + (x + vx - row->c0);	1674	mapcell *cell = row->col + (x + mx - row->c0);
1380
1381	face = cell->face [z];	1675	tileid tile = cell->tile [z];
1382		1676
1383	if (face)	1677	if (tile)
		1678	{
		1679	maptex tex = self->tex [tile];
		1680	int px = (x + 1) * T - tex.w;
		1681	int py = (y + 1) * T - tex.h;
		1682
		1683	// suppressing texture state switches here
		1684	// is only moderately effective, but worth the extra effort
		1685	if (last_name != tex.name)
		1686	{
		1687	if (!tex.name)
		1688	tex = self->tex [2]; /* missing, replace by noface */
		1689
		1690	glEnd ();
		1691	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1692	glBegin (GL_QUADS);
		1693	}
		1694
		1695	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1696	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1697	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1698	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1699
		1700	if (cell->flags && z == 2)
		1701	{
		1702	if (cell->flags & 1)
		1703	{
		1704	maptex tex = self->tex [1];
		1705	int px = x * T + T * 2 / 32;
		1706	int py = y * T - T * 6 / 32;
		1707
		1708	glEnd ();
		1709	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1710	glBegin (GL_QUADS);
		1711
		1712	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1713	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1714	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1715	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1716	}
		1717	}
		1718
		1719	// update smooth hash
		1720	if (tex.smoothtile)
		1721	{
		1722	skey.tile = tex.smoothtile;
		1723	skey.level = tex.smoothlevel;
		1724
		1725	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1726
		1727	// add bits to current tile and all neighbours. skey.x|y is
		1728	// shifted +1|+1 so we always stay positive.
		1729
		1730	// bits is ___n cccc CCCC bbbb
		1731	// n do not draw borders&corners
		1732	// c draw these corners, but...
		1733	// C ... not these
		1734	// b draw these borders
		1735
		1736	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1737	// ┃· ·· ·┃ ━━
		1738
		1739	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1740	// ·· ·· ·┏ ┓·
		1741
		1742	// full tile
		1743	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1744
		1745	// borders
		1746	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1747	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1748	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1749	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1750
		1751	// corners
		1752	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1753	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1754	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1755	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1756	}
		1757	}
		1758	}
		1759	}
		1760
		1761	// go through all smoothlevels, lowest to highest, then draw.
		1762	// this is basically counting sort
		1763	{
		1764	int w, b;
		1765
		1766	for (w = 0; w < 256 / 32; ++w)
		1767	{
		1768	uint32_t smask = smooth_level [w];
		1769	if (smask)
		1770	for (b = 0; b < 32; ++b)
		1771	if (smask & (((uint32_t)1) << b))
1384	{	1772	{
1385	maptex tex = self->tex [face];	1773	int level = (w << 5) | b;
		1774	HE *he;
1386		1775
1387	int px = (x + 1) * 32 - tex.w;	1776	hv_iterinit (smooth);
1388	int py = (y + 1) * 32 - tex.h;	1777	while ((he = hv_iternext (smooth)))
1389
1390	if (last_name != tex.name)
1391	{	1778	{
		1779	smooth_key *skey = (smooth_key *)HeKEY (he);
		1780	IV bits = SvIVX (HeVAL (he));
		1781
		1782	if (!(bits & 0x1000)
		1783	&& skey->level == level
		1784	&& level > smooth_max [skey->x][skey->y])
		1785	{
		1786	maptex tex = self->tex [skey->tile];
		1787	int px = (((int)skey->x) - 1) * T;
		1788	int py = (((int)skey->y) - 1) * T;
		1789	int border = bits & 15;
		1790	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1791	float dx = tex.s * .0625f; // 16 images/row
		1792	float dy = tex.t * .5f ; // 2 images/column
		1793
		1794	// this time naively avoiding texture state changes
		1795	// save gobs of state changes.
		1796	if (last_name != tex.name)
		1797	{
		1798	if (!tex.name)
		1799	continue; // smoothing not yet available
		1800
1392	glEnd ();	1801	glEnd ();
1393	last_name = tex.name;
1394	glBindTexture (GL_TEXTURE_2D, last_name);	1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1395	glBegin (GL_QUADS);	1803	glBegin (GL_QUADS);
		1804	}
		1805
		1806	if (border)
		1807	{
		1808	float ox = border * dx;
		1809
		1810	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1811	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1812	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1813	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1814	}
		1815
		1816	if (corner)
		1817	{
		1818	float ox = corner * dx;
		1819
		1820	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1821	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1822	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1823	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1824	}
		1825	}
1396	}	1826	}
1397
1398	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1399	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1400	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1401	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1402	}	1827	}
1403	}
1404	}	1828	}
		1829	}
		1830
		1831	hv_clear (smooth);
		1832	}
1405		1833
1406	glEnd ();	1834	glEnd ();
1407		1835
1408	glDisable (GL_TEXTURE_2D);	1836	glDisable (GL_TEXTURE_2D);
1409	glDisable (GL_BLEND);	1837	glDisable (GL_BLEND);
1410	}
1411		1838
		1839	// top layer: overlays such as the health bar
		1840	for (y = 0; y < sh; y++)
		1841	if (0 <= y + my && y + my < self->rows)
		1842	{
		1843	maprow *row = self->row + (y + my);
		1844
		1845	for (x = 0; x < sw; x++)
		1846	if (row->c0 <= x + mx && x + mx < row->c1)
		1847	{
		1848	mapcell *cell = row->col + (x + mx - row->c0);
		1849
		1850	int px = x * T;
		1851	int py = y * T;
		1852
		1853	if (cell->stat_hp)
		1854	{
		1855	int width = cell->stat_width * T;
		1856	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1857
		1858	glColor3ub (0, 0, 0);
		1859	glRectf (px + 1, py - thick - 2,
		1860	px + width - 1, py);
		1861
		1862	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1863	glRectf (px + 2,
		1864	py - thick - 1,
		1865	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1866	}
		1867	}
		1868	}
		1869	}
		1870
1412	void	1871	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1872	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1873	CODE:
1415	{	1874	{
1416	static float color[16][3] = {	1875	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1876	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1877	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1878	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1879	{ 1.00F, 0.00F, 0.00F },
1421		1880
1422	{ 1.00, 0.54, 0.00 },	1881	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1882	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1883	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1884	{ 0.18F, 0.54F, 0.34F },
1426		1885
1427	{ 0.56, 0.73, 0.56 },	1886	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1887	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1888	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1889	{ 0.99F, 0.77F, 0.26F },
1431		1890
1432	{ 0.74, 0.65, 0.41 },	1891	{ 0.74F, 0.65F, 0.41F },
1433		1892
1434	{ 0.00, 1.00, 1.00 },	1893	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1894	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1895	{ 1.00F, 1.00F, 0.00F },
1437	};	1896	};
1438		1897
1439	int x, y;	1898	int x, y;
1440		1899
1441	glEnable (GL_TEXTURE_2D);	1900	glEnable (GL_TEXTURE_2D);
…		…
1468	glDisable (GL_BLEND);	1927	glDisable (GL_BLEND);
1469	glDisable (GL_TEXTURE_2D);	1928	glDisable (GL_TEXTURE_2D);
1470	}	1929	}
1471		1930
1472	void	1931	void
1473	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1932	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1474	PPCODE:	1933	PPCODE:
1475	{	1934	{
1476	int vx, vy;
1477	int x, y;	1935	int x, y;
1478	int sw4 = (sw + 3) & ~3;	1936	int sw4 = (sw + 3) & ~3;
1479	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1937	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1480	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1938	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1481		1939
1482	memset (darkness, 255, sw4 * sh);	1940	memset (darkness, 255, sw4 * sh);
1483	SvPOK_only (darkness_sv);	1941	SvPOK_only (darkness_sv);
1484	SvCUR_set (darkness_sv, sw4 * sh);	1942	SvCUR_set (darkness_sv, sw4 * sh);
1485		1943
1486	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1944	mx += self->x;
1487	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1945	my += self->y;
1488		1946
1489	for (y = 0; y < sh; y++)	1947	for (y = 0; y < sh; y++)
1490	if (0 <= y + vy && y + vy < self->rows)	1948	if (0 <= y + my && y + my < self->rows)
1491	{	1949	{
1492	maprow *row = self->row + (y + vy);	1950	maprow *row = self->row + (y + my);
1493		1951
1494	for (x = 0; x < sw; x++)	1952	for (x = 0; x < sw; x++)
1495	if (row->c0 <= x + vx && x + vx < row->c1)	1953	if (row->c0 <= x + mx && x + mx < row->c1)
1496	{	1954	{
1497	mapcell *cell = row->col + (x + vx - row->c0);	1955	mapcell *cell = row->col + (x + mx - row->c0);
1498		1956
1499	darkness[y * sw4 + x] = cell->darkness < 0	1957	darkness[y * sw4 + x] = cell->darkness
		1958	? 255 - (cell->darkness - 1)
1500	? 255 - FOW_DARKNESS	1959	: 255 - FOW_DARKNESS;
1501	: 255 - cell->darkness;
1502	}	1960	}
1503	}	1961	}
1504		1962
1505	EXTEND (SP, 3);	1963	EXTEND (SP, 3);
1506	PUSHs (sv_2mortal (newSViv (sw4)));	1964	PUSHs (sv_2mortal (newSViv (sw4)));
1507	PUSHs (sv_2mortal (newSViv (sh)));	1965	PUSHs (sv_2mortal (newSViv (sh)));
1508	PUSHs (darkness_sv);	1966	PUSHs (darkness_sv);
1509	}	1967	}
1510		1968
1511	SV *	1969	SV *
1512	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1970	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1513	CODE:	1971	CODE:
1514	{	1972	{
1515	int x, y, x1, y1;	1973	int x, y, x1, y1;
1516	SV *data_sv = newSV (w * h * 7 + 5);	1974	SV *data_sv = newSV (w * h * 7 + 5);
1517	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1975	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1542	if (row && row->c0 <= x && x < row->c1)	2000	if (row && row->c0 <= x && x < row->c1)
1543	{	2001	{
1544	mapcell *cell = row->col + (x - row->c0);	2002	mapcell *cell = row->col + (x - row->c0);
1545	uint8_t flags = 0;	2003	uint8_t flags = 0;
1546		2004
1547	if (cell->face [0]) flags |= 1;	2005	if (cell->tile [0]) flags |= 1;
1548	if (cell->face [1]) flags |= 2;	2006	if (cell->tile [1]) flags |= 2;
1549	if (cell->face [2]) flags |= 4;	2007	if (cell->tile [2]) flags |= 4;
1550		2008
1551	*data++ = flags;	2009	*data++ = flags;
1552		2010
1553	if (flags & 1)	2011	if (flags & 1)
1554	{	2012	{
		2013	tileid tile = cell->tile [0];
1555	*data++ = cell->face [0] >> 8;	2014	*data++ = tile >> 8;
1556	*data++ = cell->face [0];	2015	*data++ = tile;
1557	}	2016	}
1558		2017
1559	if (flags & 2)	2018	if (flags & 2)
1560	{	2019	{
		2020	tileid tile = cell->tile [1];
1561	*data++ = cell->face [1] >> 8;	2021	*data++ = tile >> 8;
1562	*data++ = cell->face [1];	2022	*data++ = tile;
1563	}	2023	}
1564		2024
1565	if (flags & 4)	2025	if (flags & 4)
1566	{	2026	{
		2027	tileid tile = cell->tile [2];
1567	*data++ = cell->face [2] >> 8;	2028	*data++ = tile >> 8;
1568	*data++ = cell->face [2];	2029	*data++ = tile;
1569	}	2030	}
1570	}	2031	}
1571	else	2032	else
1572	*data++ = 0;	2033	*data++ = 0;
1573	}	2034	}
…		…
1579	}	2040	}
1580	OUTPUT:	2041	OUTPUT:
1581	RETVAL	2042	RETVAL
1582		2043
1583	void	2044	void
1584	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2045	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1585	PPCODE:	2046	PPCODE:
1586	{	2047	{
1587	int x, y, z;	2048	int x, y, z;
1588	int w, h;	2049	int w, h;
1589	int x1, y1;	2050	int x1, y1;
…		…
1613	{	2074	{
1614	uint8_t flags = *data++;	2075	uint8_t flags = *data++;
1615		2076
1616	if (flags)	2077	if (flags)
1617	{	2078	{
1618	mapface face[3] = { 0, 0, 0 };
1619
1620	mapcell *cell = row_get_cell (row, x);	2079	mapcell *cell = row_get_cell (row, x);
		2080	tileid tile[3] = { 0, 0, 0 };
1621		2081
1622	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2082	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1623	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2083	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1624	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2084	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1625		2085
1626	if (cell->darkness <= 0)	2086	if (cell->darkness == 0)
1627	{	2087	{
1628	cell->darkness = -1;	2088	cell->darkness = 0;
1629		2089
1630	for (z = 0; z <= 2; z++)	2090	for (z = 0; z <= 2; z++)
1631	{	2091	{
1632	cell->face[z] = face[z];	2092	tileid t = tile [z];
1633		2093
1634	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2094	if (t >= self->texs || (t && !self->tex [t].name))
		2095	{
1635	XPUSHs (sv_2mortal (newSViv (face[z])));	2096	XPUSHs (sv_2mortal (newSViv (t)));
		2097	need_texid (self, t);
		2098	}
		2099
		2100	cell->tile [z] = t;
1636	}	2101	}
1637	}	2102	}
1638	}	2103	}
1639	}	2104	}
1640	}	2105	}
1641	}	2106	}
1642		2107
1643	MODULE = CFClient PACKAGE = CFClient::MixChunk	2108	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644		2109
1645	CFClient::MixChunk	2110	CFPlus::MixChunk
1646	new_from_file (SV *class, char *path)	2111	new_from_file (SV *class, char *path)
1647	CODE:	2112	CODE:
1648	RETVAL = Mix_LoadWAV (path);	2113	RETVAL = Mix_LoadWAV (path);
1649	OUTPUT:	2114	OUTPUT:
1650	RETVAL	2115	RETVAL
1651		2116
1652	void	2117	void
1653	DESTROY (CFClient::MixChunk self)	2118	DESTROY (CFPlus::MixChunk self)
1654	CODE:	2119	CODE:
1655	Mix_FreeChunk (self);	2120	Mix_FreeChunk (self);
1656		2121
1657	int	2122	int
1658	volume (CFClient::MixChunk self, int volume = -1)	2123	volume (CFPlus::MixChunk self, int volume = -1)
1659	CODE:	2124	CODE:
1660	RETVAL = Mix_VolumeChunk (self, volume);	2125	RETVAL = Mix_VolumeChunk (self, volume);
1661	OUTPUT:	2126	OUTPUT:
1662	RETVAL	2127	RETVAL
1663		2128
1664	int	2129	int
1665	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2130	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1666	CODE:	2131	CODE:
1667	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2132	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668	OUTPUT:	2133	OUTPUT:
1669	RETVAL	2134	RETVAL
1670		2135
1671	MODULE = CFClient PACKAGE = CFClient::MixMusic	2136	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672		2137
1673	int	2138	int
1674	volume (int volume = -1)	2139	volume (int volume = -1)
1675	CODE:	2140	CODE:
1676	RETVAL = Mix_VolumeMusic (volume);	2141	RETVAL = Mix_VolumeMusic (volume);
1677	OUTPUT:	2142	OUTPUT:
1678	RETVAL	2143	RETVAL
1679		2144
		2145	int
		2146	fade_out (int ms)
		2147	CODE:
		2148	RETVAL = Mix_FadeOutMusic (ms);
		2149	OUTPUT:
		2150	RETVAL
		2151
1680	CFClient::MixMusic	2152	CFPlus::MixMusic
1681	new_from_file (SV *class, char *path)	2153	new_from_file (SV *class, char *path)
1682	CODE:	2154	CODE:
1683	RETVAL = Mix_LoadMUS (path);	2155	RETVAL = Mix_LoadMUS (path);
1684	OUTPUT:	2156	OUTPUT:
1685	RETVAL	2157	RETVAL
1686		2158
1687	void	2159	void
1688	DESTROY (CFClient::MixMusic self)	2160	DESTROY (CFPlus::MixMusic self)
1689	CODE:	2161	CODE:
1690	Mix_FreeMusic (self);	2162	Mix_FreeMusic (self);
1691		2163
1692	int	2164	int
1693	play (CFClient::MixMusic self, int loops = -1)	2165	play (CFPlus::MixMusic self, int loops = -1)
1694	CODE:	2166	CODE:
1695	RETVAL = Mix_PlayMusic (self, loops);	2167	RETVAL = Mix_PlayMusic (self, loops);
1696	OUTPUT:	2168	OUTPUT:
1697	RETVAL	2169	RETVAL
1698		2170
1699	MODULE = CFClient PACKAGE = CFClient::OpenGL	2171	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1700		2172
1701	BOOT:	2173	BOOT:
1702	{	2174	{
1703	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2175	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704	static const struct {	2176	static const struct {
1705	const char *name;	2177	const char *name;
1706	IV iv;	2178	IV iv;
1707	} *civ, const_iv[] = {	2179	} *civ, const_iv[] = {
1708	# define const_iv(name) { # name, (IV)name }	2180	# define const_iv(name) { # name, (IV)name }
…		…
1715	const_iv (GL_SCISSOR_TEST),	2187	const_iv (GL_SCISSOR_TEST),
1716	const_iv (GL_DEPTH_TEST),	2188	const_iv (GL_DEPTH_TEST),
1717	const_iv (GL_ALPHA_TEST),	2189	const_iv (GL_ALPHA_TEST),
1718	const_iv (GL_NORMALIZE),	2190	const_iv (GL_NORMALIZE),
1719	const_iv (GL_RESCALE_NORMAL),	2191	const_iv (GL_RESCALE_NORMAL),
		2192	const_iv (GL_FRONT),
		2193	const_iv (GL_BACK),
1720	const_iv (GL_AND),	2194	const_iv (GL_AND),
1721	const_iv (GL_ONE),	2195	const_iv (GL_ONE),
1722	const_iv (GL_ZERO),	2196	const_iv (GL_ZERO),
1723	const_iv (GL_SRC_ALPHA),	2197	const_iv (GL_SRC_ALPHA),
1724	const_iv (GL_DST_ALPHA),	2198	const_iv (GL_DST_ALPHA),
…		…
1769	const_iv (GL_SEPARABLE_2D),	2243	const_iv (GL_SEPARABLE_2D),
1770	const_iv (GL_CONVOLUTION_2D),	2244	const_iv (GL_CONVOLUTION_2D),
1771	const_iv (GL_CONVOLUTION_BORDER_MODE),	2245	const_iv (GL_CONVOLUTION_BORDER_MODE),
1772	const_iv (GL_CONSTANT_BORDER),	2246	const_iv (GL_CONSTANT_BORDER),
1773	const_iv (GL_LINES),	2247	const_iv (GL_LINES),
		2248	const_iv (GL_LINE_STRIP),
1774	const_iv (GL_LINE_LOOP),	2249	const_iv (GL_LINE_LOOP),
1775	const_iv (GL_QUADS),	2250	const_iv (GL_QUADS),
1776	const_iv (GL_QUAD_STRIP),	2251	const_iv (GL_QUAD_STRIP),
1777	const_iv (GL_TRIANGLES),	2252	const_iv (GL_TRIANGLES),
1778	const_iv (GL_TRIANGLE_STRIP),	2253	const_iv (GL_TRIANGLE_STRIP),
…		…
1786	# undef const_iv	2261	# undef const_iv
1787	};	2262	};
1788		2263
1789	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2264	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1790	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2265	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2266
		2267	texture_av = newAV ();
		2268	AvREAL_off (texture_av);
1791	}	2269	}
1792		2270
1793	char *	2271	char *
1794	gl_vendor ()	2272	gl_vendor ()
1795	CODE:	2273	CODE:
…		…
1845	void glPushMatrix ()	2323	void glPushMatrix ()
1846		2324
1847	void glPopMatrix ()	2325	void glPopMatrix ()
1848		2326
1849	void glLoadIdentity ()	2327	void glLoadIdentity ()
		2328
		2329	void glDrawBuffer (int buffer)
		2330
		2331	void glReadBuffer (int buffer)
1850		2332
1851	# near_ and far_ are due to microsofts buggy "c" compiler	2333	# near_ and far_ are due to microsofts buggy "c" compiler
1852	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2334	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1853		2335
1854	# near_ and far_ are due to microsofts buggy "c" compiler	2336	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1884	r *= a;	2366	r *= a;
1885	g *= a;	2367	g *= a;
1886	b *= a;	2368	b *= a;
1887	}	2369	}
1888	// microsoft visual "c" rounds instead of truncating...	2370	// microsoft visual "c" rounds instead of truncating...
1889	glColor4ub (MIN ((int)(r * 256.f), 255),	2371	glColor4f (r, g, b, a);
1890	MIN ((int)(g * 256.f), 255),
1891	MIN ((int)(b * 256.f), 255),
1892	MIN ((int)(a * 256.f), 255));
1893		2372
1894	void glInterleavedArrays (int format, int stride, char *data)	2373	void glInterleavedArrays (int format, int stride, char *data)
1895		2374
1896	void glDrawElements (int mode, int count, int type, char *indices)	2375	void glDrawElements (int mode, int count, int type, char *indices)
1897		2376
…		…
1943		2422
1944	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2423	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1945		2424
1946	int glGenTexture ()	2425	int glGenTexture ()
1947	CODE:	2426	CODE:
1948	{	2427	RETVAL = gen_texture ();
1949	GLuint name;
1950	glGenTextures (1, &name);
1951	RETVAL = name;
1952	}
1953	OUTPUT:	2428	OUTPUT:
1954	RETVAL	2429	RETVAL
1955		2430
1956	void glDeleteTexture (int name)	2431	void glDeleteTexture (int name)
1957	CODE:	2432	CODE:
1958	{
1959	GLuint name_ = name;
1960	glDeleteTextures (1, &name_);	2433	del_texture (name);
1961	}	2434
1962
1963	int glGenList ()	2435	int glGenList ()
1964	CODE:	2436	CODE:
1965	RETVAL = glGenLists (1);	2437	RETVAL = glGenLists (1);
1966	OUTPUT:	2438	OUTPUT:
1967	RETVAL	2439	RETVAL
…		…
1974		2446
1975	void glEndList ()	2447	void glEndList ()
1976		2448
1977	void glCallList (int list)	2449	void glCallList (int list)
1978		2450
1979

Diff Legend

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