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.121 by root, Fri Jun 23 20:28:19 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"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48		52
49	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
50		54
51	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
53		57
54	#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;
55		67
56	static struct	68	static struct
57	{	69	{
58	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
59	#include "glfunc.h"	71	#include "glfunc.h"
60	#undef GL_FUNC	72	#undef GL_FUNC
61	} gl;	73	} gl;
62		74
		75	static void
63	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
64	{	77	{
65	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
66	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
67	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69	else	82	else
70	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
71	}	84	}
72		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
73	typedef Mix_Chunk *CFClient__MixChunk;	116	typedef Mix_Chunk *CFPlus__MixChunk;
74	typedef Mix_Music *CFClient__MixMusic;	117	typedef Mix_Music *CFPlus__MixMusic;
75		118
76	typedef PangoFontDescription *CFClient__Font;	119	typedef PangoFontDescription *CFPlus__Font;
77		120
78	static int	121	static int
79	shape_attr_p (PangoLayoutRun *run)	122	shape_attr_p (PangoLayoutRun *run)
80	{	123	{
81	GSList *attrs = run->item->analysis.extra_attrs;	124	GSList *attrs = run->item->analysis.extra_attrs;
…		…
92		135
93	return 0;	136	return 0;
94	}	137	}
95		138
96	typedef struct cf_layout {	139	typedef struct cf_layout {
97	PangoLayout *pl; // either derived from a cairo or ft2 context	140	PangoLayout *pl;
98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99	float r, g, b, a; // default color for rgba mode	141	float r, g, b, a; // default color for rgba mode
100	int base_height;	142	int base_height;
101	CFClient__Font font;	143	CFPlus__Font font;
102	} *CFClient__Layout;	144	} *CFPlus__Layout;
103		145
104	static CFClient__Font default_font;	146	static CFPlus__Font default_font;
105	static PangoContext *ft2_context, *cairo_context;	147	static PangoContext *opengl_context;
106	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	148	static PangoFontMap *opengl_fontmap;
107		149
108	static void	150	static void
109	substitute_func (FcPattern *pattern, gpointer data)	151	substitute_func (FcPattern *pattern, gpointer data)
110	{	152	{
111	FcPatternAddBool (pattern, FC_HINTING, 1);	153	FcPatternAddBool (pattern, FC_HINTING, 1);
112	#ifdef FC_HINT_STYLE	154	#ifdef FC_HINT_STYLE
113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	155	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114	#endif	156	#endif
115	#ifdef _WIN32
116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117	#else
118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	157	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119	#endif
120	}	158	}
121		159
122	static void	160	static void
123	layout_update_font (CFClient__Layout self)	161	layout_update_font (CFPlus__Layout self)
124	{	162	{
125	/* 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
126	* reasonably well with bitstream vera	164	* reasonably well with bitstream vera
127	*/	165	*/
128	PangoFontDescription *font = self->font ? self->font : default_font;	166	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
132		170
133	pango_layout_set_font_description (self->pl, font);	171	pango_layout_set_font_description (self->pl, font);
134	}	172	}
135		173
136	static void	174	static void
137	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	175	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138	{	176	{
		177	PangoRectangle rect;
		178
		179	// get_pixel_* wrongly rounds down
139	pango_layout_get_pixel_size (self->pl, w, h);	180	pango_layout_get_extents (self->pl, 0, &rect);
140		181
141	if (!*w) *w = 1;	182	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142	if (!*h) *h = 1;	183	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143		184
144	*w = (*w + 3) & ~3;	185	if (!rect.width) rect.width = 1;
145	}	186	if (!rect.height) rect.height = 1;
146		187
		188	*w = rect.width;
		189	*h = rect.height;
		190	}
		191
		192	typedef uint16_t tileid;
147	typedef uint16_t mapface;	193	typedef uint16_t faceid;
148		194
149	typedef struct {	195	typedef struct {
150	GLint name;	196	int name;
151	int w, h;	197	int w, h;
152	float s, t;	198	float s, t;
153	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
154	} maptex;	202	} maptex;
155		203
156	typedef struct {	204	typedef struct {
		205	uint32_t player;
		206	tileid tile[3];
157	int16_t darkness;	207	uint16_t darkness;
158	mapface face[3];	208	uint8_t stat_width, stat_hp, flags, smoothmax;
159	} mapcell;	209	} mapcell;
160		210
161	typedef struct {	211	typedef struct {
162	int32_t c0, c1;	212	int32_t c0, c1;
163	mapcell *col;	213	mapcell *col;
164	} maprow;	214	} maprow;
165		215
166	typedef struct map {	216	typedef struct map {
167	int x, y, w, h;	217	int x, y, w, h;
168	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
169	int faces;	219	int faces; tileid *face2tile; // [faceid]
170	mapface *face;	220	int texs; maptex *tex; // [tileid]
171
172	int texs;
173	maptex *tex;
174		221
175	int32_t rows;	222	int32_t rows;
176	maprow *row;	223	maprow *row;
177	} *CFClient__Map;	224	} *CFPlus__Map;
178		225
179	static char *	226	static char *
180	prepend (char *ptr, int sze, int inc)	227	prepend (char *ptr, int sze, int inc)
181	{	228	{
182	char *p;	229	char *p;
…		…
199	}	246	}
200		247
201	#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))
202	#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))
203		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
204	static maprow *	271	static maprow *
205	map_get_row (CFClient__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
206	{	273	{
207	if (0 > y)	274	if (0 > y)
208	{	275	{
209	int extend = - y + MAP_EXTEND_Y;	276	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	277	Prepend (maprow, self->row, self->rows, extend);
…		…
248		315
249	return row->col + (x - row->c0);	316	return row->col + (x - row->c0);
250	}	317	}
251		318
252	static mapcell *	319	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	320	map_get_cell (CFPlus__Map self, int x, int y)
254	{	321	{
255	return row_get_cell (map_get_row (self, y), x);	322	return row_get_cell (map_get_row (self, y), x);
256	}	323	}
257		324
258	static void	325	static void
259	map_clear (CFClient__Map self)	326	map_clear (CFPlus__Map self)
260	{	327	{
261	int r;	328	int r;
262		329
263	for (r = 0; r < self->rows; r++)	330	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	331	Safefree (self->row[r].col);
…		…
272	self->row = 0;	339	self->row = 0;
273	self->rows = 0;	340	self->rows = 0;
274	}	341	}
275		342
276	static void	343	static void
277	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)
278	{	345	{
279	int x, y;	346	int x, y;
280	maprow *row;	347	maprow *row;
		348	mapcell *cell;
281		349
282	for (y = y0; y < y0 + h; y++)	350	for (y = y0; y < y0 + h; y++)
283	if (y >= 0)	351	if (y >= 0)
284	{	352	{
285	if (y >= self->rows)	353	if (y >= self->rows)
…		…
291	if (x >= row->c0)	359	if (x >= row->c0)
292	{	360	{
293	if (x >= row->c1)	361	if (x >= row->c1)
294	break;	362	break;
295		363
296	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;
297	}	370	}
298	}	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);
299	}	388	}
300		389
301	static void	390	static void
302	music_finished (void)	391	music_finished (void)
303	{	392	{
…		…
339	n |= n >> 16;	428	n |= n >> 16;
340		429
341	return n + 1;	430	return n + 1;
342	}	431	}
343		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
		436
344	MODULE = CFClient PACKAGE = CFClient	437	MODULE = CFPlus PACKAGE = CFPlus
345		438
346	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
347		440
348	BOOT:	441	BOOT:
349	{	442	{
350	HV *stash = gv_stashpv ("CFClient", 1);	443	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	444	static const struct {
352	const char *name;	445	const char *name;
353	IV iv;	446	IV iv;
354	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
355	# 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
356	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
357	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
358	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
359	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
360	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
369	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
370	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
371	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
372	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
373	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
374	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
375	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
376	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
377	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
378	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
433	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
434	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
435	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
436	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
437	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
438	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
439	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
440	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
441	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
442	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
443	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
444	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
445	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
446	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
447	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
448	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
449	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
450	const_iv (KMOD_CTRL),
451	const_iv (KMOD_SHIFT),
452	const_iv (KMOD_ALT),
453	const_iv (KMOD_META)
454	# undef const_iv	556	# undef const_iv
455	};	557	};
456		558
457	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; )
458	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);
459	}	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
460		578
461	NV floor (NV x)	579	NV floor (NV x)
462		580
463	NV ceil (NV x)	581	NV ceil (NV x)
464		582
465	void	583	void
466	pango_init ()	584	pango_init ()
467	CODE:	585	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	586	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
472	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);
473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474	}
475	{
476	cairo_font_options_t *fopt = cairo_font_options_create ();
477	cairo_fontmap = pango_cairo_font_map_get_default ();
478	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479	#ifdef _WIN32
480	// cairo looks like shit eaten twice on windows
481	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482	#else
483	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484	#endif
485	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487	pango_cairo_context_set_font_options (cairo_context, fopt);
488	cairo_font_options_destroy (fopt);
489	}
490	}	590	}
491		591
492	int	592	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	593	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494		594
495	void	595	void
496	SDL_Quit ()	596	SDL_Quit ()
497		597
498	void	598	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		616
517	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
518		622
519	SDL_EnableUNICODE (1);	623	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	624	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		625
522	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
542	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
543	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
544	);	648	);
545	if (RETVAL)	649	if (RETVAL)
546	{	650	{
		651	av_clear (texture_av);
		652
547	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
548	# 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);
549	# include "glfunc.h"	655	# include "glfunc.h"
550	# undef GL_FUNC	656	# undef GL_FUNC
		657
551	}	658	}
552	OUTPUT:	659	OUTPUT:
553	RETVAL	660	RETVAL
554		661
555	void	662	void
…		…
574	case SDL_KEYDOWN:	681	case SDL_KEYDOWN:
575	case SDL_KEYUP:	682	case SDL_KEYUP:
576	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	683	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	684	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578	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 */
579	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	687	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580	break;	688	break;
581		689
582	case SDL_ACTIVEEVENT:	690	case SDL_ACTIVEEVENT:
583	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	691	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	717	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	718	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	719	break;
612	}	720	}
613		721
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	722	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	723	}
616	}	724	}
617		725
618	int	726	int
619	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)
…		…
628	Mix_AllocateChannels (int numchans = -1)	736	Mix_AllocateChannels (int numchans = -1)
629		737
630	void	738	void
631	lowdelay (int fd, int val = 1)	739	lowdelay (int fd, int val = 1)
632	CODE:	740	CODE:
		741	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		742
		743	void
		744	win32_proxy_info ()
		745	PPCODE:
		746	{
633	#ifndef _WIN32	747	#ifdef _WIN32
634	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	}
635	#endif	769	#endif
		770	}
636		771
637	void	772	void
638	add_font (char *file)	773	add_font (char *file)
639	CODE:	774	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	775	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		776
646	void	777	void
647	load_image_inline (SV *image_)	778	load_image_inline (SV *image_)
648	ALIAS:	779	ALIAS:
649	load_image_file = 1	780	load_image_file = 1
…		…
691		822
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	823	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		824
694	assert (surface2->pitch == surface2->w * 4);	825	assert (surface2->pitch == surface2->w * 4);
695		826
		827	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	828	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	829	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	830	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	831	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701	SDL_UnlockSurface (surface2);
702	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)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	833	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	834	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		835	SDL_UnlockSurface (surface2);
705		836
706	SDL_FreeSurface (surface);	837	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	838	SDL_FreeSurface (surface2);
708	}	839	}
709		840
…		…
748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	879	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749	#endif	880	#endif
750	_exit (1);	881	_exit (1);
751		882
752	void	883	void
753	_exit (int retval)	884	_exit (int retval = 0)
754	CODE:	885	CODE:
		886	#ifdef WIN32
		887	ExitThread (retval); // unclean, please beam me up
		888	#else
755	_exit (retval);	889	_exit (retval);
		890	#endif
756		891
		892	void
		893	debug ()
		894	CODE:
		895	{
		896	#if DEBUG
		897	VALGRIND_DO_LEAK_CHECK;
		898	#endif
		899	}
		900
757	MODULE = CFClient PACKAGE = CFClient::Font	901	MODULE = CFPlus PACKAGE = CFPlus::Font
758		902
759	CFClient::Font	903	CFPlus::Font
760	new_from_file (SV *class, char *path, int id = 0)	904	new_from_file (SV *class, char *path, int id = 0)
761	CODE:	905	CODE:
762	{	906	{
763	int count;	907	int count;
764	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	908	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
767	}	911	}
768	OUTPUT:	912	OUTPUT:
769	RETVAL	913	RETVAL
770		914
771	void	915	void
772	DESTROY (CFClient::Font self)	916	DESTROY (CFPlus::Font self)
773	CODE:	917	CODE:
774	pango_font_description_free (self);	918	pango_font_description_free (self);
775		919
776	void	920	void
777	make_default (CFClient::Font self)	921	make_default (CFPlus::Font self)
778	CODE:	922	CODE:
779	default_font = self;	923	default_font = self;
780		924
781	MODULE = CFClient PACKAGE = CFClient::Layout	925	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		926
783	CFClient::Layout	927	void
784	new (SV *class, int rgba = 0)	928	reset_glyph_cache ()
		929	CODE:
		930	tc_clear ();
		931
		932	CFPlus::Layout
		933	new (SV *class)
785	CODE:	934	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	935	New (0, RETVAL, 1, struct cf_layout);
787		936
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	937	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	938	RETVAL->r = 1.;
791	RETVAL->g = 1.;	939	RETVAL->g = 1.;
792	RETVAL->b = 1.;	940	RETVAL->b = 1.;
793	RETVAL->a = 1.;	941	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	942	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	946	layout_update_font (RETVAL);
799	OUTPUT:	947	OUTPUT:
800	RETVAL	948	RETVAL
801		949
802	void	950	void
803	DESTROY (CFClient::Layout self)	951	DESTROY (CFPlus::Layout self)
804	CODE:	952	CODE:
805	g_object_unref (self->pl);	953	g_object_unref (self->pl);
806	Safefree (self);	954	Safefree (self);
807		955
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	956	void
816	set_text (CFClient::Layout self, SV *text_)	957	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	958	CODE:
818	{	959	{
819	STRLEN textlen;	960	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	961	char *text = SvPVutf8 (text_, textlen);
821		962
822	pango_layout_set_text (self->pl, text, textlen);	963	pango_layout_set_text (self->pl, text, textlen);
823	}	964	}
824		965
825	void	966	void
826	set_markup (CFClient::Layout self, SV *text_)	967	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	968	CODE:
828	{	969	{
829	STRLEN textlen;	970	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	971	char *text = SvPVutf8 (text_, textlen);
831		972
832	pango_layout_set_markup (self->pl, text, textlen);	973	pango_layout_set_markup (self->pl, text, textlen);
833	}	974	}
834		975
835	void	976	void
836	set_shapes (CFClient::Layout self, ...)	977	set_shapes (CFPlus::Layout self, ...)
837	CODE:	978	CODE:
838	{	979	{
839	PangoAttrList *attrs = 0;	980	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	981	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	982	const char *pos = text;
842	int arg = 2;	983	int arg = 4;
843		984
844	while (arg < items && (pos = strstr (pos, OBJ_STR)))	985	while (arg < items && (pos = strstr (pos, OBJ_STR)))
845	{	986	{
846	PangoRectangle rect;	987	PangoRectangle inkrect, rect;
847	PangoAttribute *attr;	988	PangoAttribute *attr;
848		989
		990	int x = SvIV (ST (arg - 3));
		991	int y = SvIV (ST (arg - 2));
849	int w = SvIV (ST (arg - 1));	992	int w = SvIV (ST (arg - 1));
850	int h = SvIV (ST (arg));	993	int h = SvIV (ST (arg ));
851		994
852	arg += 2;
853
854	rect.x = 0;	995	inkrect.x = 0;
		996	inkrect.y = 0;
		997	inkrect.width = 0;
		998	inkrect.height = 0;
		999
		1000	rect.x = x * PANGO_SCALE;
855	rect.y = -h * PANGO_SCALE;	1001	rect.y = y * PANGO_SCALE;
856	rect.width = w * PANGO_SCALE;	1002	rect.width = w * PANGO_SCALE;
857	rect.height = h * PANGO_SCALE;	1003	rect.height = h * PANGO_SCALE;
858		1004
859	if (!attrs)	1005	if (!attrs)
860	attrs = pango_layout_get_attributes (self->pl);	1006	attrs = pango_layout_get_attributes (self->pl);
861		1007
862	attr = pango_attr_shape_new (&rect, &rect);	1008	attr = pango_attr_shape_new (&inkrect, &rect);
863	attr->start_index = pos - text;	1009	attr->start_index = pos - text;
864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;	1010	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865	pango_attr_list_insert (attrs, attr);	1011	pango_attr_list_insert (attrs, attr);
866		1012
		1013	arg += 4;
867	pos += sizeof (OBJ_STR) - 1;	1014	pos += sizeof (OBJ_STR) - 1;
868	}	1015	}
869		1016
870	if (attrs)	1017	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	1018	pango_layout_set_attributes (self->pl, attrs);
872	}	1019	}
873		1020
874	void	1021	void
875	get_shapes (CFClient::Layout self)	1022	get_shapes (CFPlus::Layout self)
876	PPCODE:	1023	PPCODE:
877	{	1024	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1025	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		1026
880	do	1027	do
…		…
884	if (run && shape_attr_p (run))	1031	if (run && shape_attr_p (run))
885	{	1032	{
886	PangoRectangle extents;	1033	PangoRectangle extents;
887	pango_layout_iter_get_run_extents (iter, 0, &extents);	1034	pango_layout_iter_get_run_extents (iter, 0, &extents);
888		1035
		1036	EXTEND (SP, 2);
889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	1037	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	1038	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891	}	1039	}
892	}	1040	}
893	while (pango_layout_iter_next_run (iter));	1041	while (pango_layout_iter_next_run (iter));
894		1042
895	pango_layout_iter_free (iter);	1043	pango_layout_iter_free (iter);
896	}	1044	}
897		1045
898	int	1046	int
899	has_wrapped (CFClient::Layout self)	1047	has_wrapped (CFPlus::Layout self)
900	CODE:	1048	CODE:
901	{	1049	{
902	int lines = 1;	1050	int lines = 1;
903	const char *text = pango_layout_get_text (self->pl);	1051	const char *text = pango_layout_get_text (self->pl);
904		1052
…		…
909	}	1057	}
910	OUTPUT:	1058	OUTPUT:
911	RETVAL	1059	RETVAL
912		1060
913	SV *	1061	SV *
914	get_text (CFClient::Layout self)	1062	get_text (CFPlus::Layout self)
915	CODE:	1063	CODE:
916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1064	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917	sv_utf8_decode (RETVAL);	1065	sv_utf8_decode (RETVAL);
918	OUTPUT:	1066	OUTPUT:
919	RETVAL	1067	RETVAL
920		1068
921	void	1069	void
922	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.)
923	CODE:	1071	CODE:
924	self->r = r;	1072	self->r = r;
925	self->g = g;	1073	self->g = g;
926	self->b = b;	1074	self->b = b;
927	self->a = a;	1075	self->a = a;
928		1076
929	void	1077	void
930	set_font (CFClient::Layout self, CFClient::Font font = 0)	1078	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931	CODE:	1079	CODE:
932	if (self->font != font)	1080	if (self->font != font)
933	{	1081	{
934	self->font = font;	1082	self->font = font;
935	layout_update_font (self);	1083	layout_update_font (self);
936	}	1084	}
937		1085
938	void	1086	void
939	set_height (CFClient::Layout self, int base_height)	1087	set_height (CFPlus::Layout self, int base_height)
940	CODE:	1088	CODE:
941	if (self->base_height != base_height)	1089	if (self->base_height != base_height)
942	{	1090	{
943	self->base_height = base_height;	1091	self->base_height = base_height;
944	layout_update_font (self);	1092	layout_update_font (self);
945	}	1093	}
946		1094
947	void	1095	void
948	set_width (CFClient::Layout self, int max_width = -1)	1096	set_width (CFPlus::Layout self, int max_width = -1)
949	CODE:	1097	CODE:
950	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);
951		1099
952	void	1100	void
953	set_indent (CFClient::Layout self, int indent)	1101	set_indent (CFPlus::Layout self, int indent)
954	CODE:	1102	CODE:
955	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1103	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956		1104
957	void	1105	void
958	set_spacing (CFClient::Layout self, int spacing)	1106	set_spacing (CFPlus::Layout self, int spacing)
959	CODE:	1107	CODE:
960	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1108	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961		1109
962	void	1110	void
963	set_ellipsise (CFClient::Layout self, int ellipsise)	1111	set_ellipsise (CFPlus::Layout self, int ellipsise)
964	CODE:	1112	CODE:
965	pango_layout_set_ellipsize (self->pl,	1113	pango_layout_set_ellipsize (self->pl,
966	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1114	ellipsise == 1 ? PANGO_ELLIPSIZE_START
967	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1115	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1116	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
969	: PANGO_ELLIPSIZE_NONE	1117	: PANGO_ELLIPSIZE_NONE
970	);	1118	);
971		1119
972	void	1120	void
973	set_single_paragraph_mode (CFClient::Layout self, int spm)	1121	set_single_paragraph_mode (CFPlus::Layout self, int spm)
974	CODE:	1122	CODE:
975	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1123	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976		1124
977	void	1125	void
978	size (CFClient::Layout self)	1126	size (CFPlus::Layout self)
979	PPCODE:	1127	PPCODE:
980	{	1128	{
981	int w, h;	1129	int w, h;
982		1130
983	layout_get_pixel_size (self, &w, &h);	1131	layout_get_pixel_size (self, &w, &h);
…		…
986	PUSHs (sv_2mortal (newSViv (w)));	1134	PUSHs (sv_2mortal (newSViv (w)));
987	PUSHs (sv_2mortal (newSViv (h)));	1135	PUSHs (sv_2mortal (newSViv (h)));
988	}	1136	}
989		1137
990	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
991	xy_to_index (CFClient::Layout self, int x, int y)	1151	xy_to_index (CFPlus::Layout self, int x, int y)
992	CODE:	1152	CODE:
993	{	1153	{
994	int index, trailing;	1154	int index, trailing;
995	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);
996	RETVAL = index;	1156	RETVAL = index + trailing;
997	}	1157	}
998	OUTPUT:	1158	OUTPUT:
999	RETVAL	1159	RETVAL
1000		1160
1001	void	1161	void
1002	cursor_pos (CFClient::Layout self, int index)	1162	cursor_pos (CFPlus::Layout self, int index)
1003	PPCODE:	1163	PPCODE:
1004	{	1164	{
1005	PangoRectangle strong_pos;	1165	PangoRectangle strong_pos;
1006	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1166	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007		1167
…		…
1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1170	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1171	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012	}	1172	}
1013		1173
1014	void	1174	void
1015	render (CFClient::Layout self)	1175	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1016	PPCODE:	1176	PPCODE:
1017	{	1177	{
1018	SV *retval;	1178	int line, x;
1019	int w, h;
1020		1179
1021	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 */
1022		1182
1023	if (self->rgba)
1024	{
1025	cairo_surface_t *surface;
1026	cairo_t *cairo;
1027
1028	retval = newSV (w * h * 4);
1029	SvPOK_only (retval);
1030	SvCUR_set (retval, w * h * 4);
1031
1032	memset (SvPVX (retval), 0, w * h * 4);
1033
1034	surface = cairo_image_surface_create_for_data (
1035	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1036	cairo = cairo_create (surface);
1037	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1038
1039	pango_cairo_show_layout (cairo, self->pl);
1040
1041	cairo_destroy (cairo);
1042	cairo_surface_destroy (surface);
1043
1044	// what a mess, and its premultiplied, too :(
1045	{
1046	uint32_t *p = (uint32_t *)SvPVX (retval);
1047	uint32_t *e = p + w * h;
1048
1049	while (p < e)
1050	{
1051	uint32_t rgba = *p;
1052	rgba = (rgba >> 24) | (rgba << 8);
1053	#if 0
1054	#ifdef _WIN32
1055	{//D
1056	uint8_t r = rgba >> 24;
1057	uint8_t g = rgba >> 16;
1058	uint8_t b = rgba >> 8;
1059	uint8_t a = rgba >> 0;
1060
1061	rgba = (rgba & 0xffffff00) | a;
1062	}
1063	#endif
1064	#endif
1065	rgba = SDL_SwapBE32 (rgba);
1066	*p++ = rgba;
1067	}
1068	}
1069
1070	EXTEND (SP, 5);	1183	EXTEND (SP, 2);
1071	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)
1072	PUSHs (sv_2mortal (newSViv (h)));	1205	PUSHs (sv_2mortal (newSViv (index + trailing)));
1073	PUSHs (sv_2mortal (retval));
1074	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1075	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076	}
1077	else	1206	else
1078	{	1207	{
1079	FT_Bitmap bitmap;
1080
1081	retval = newSV (w * h);
1082	SvPOK_only (retval);
1083	SvCUR_set (retval, w * h);
1084
1085	bitmap.rows = h;
1086	bitmap.width = w;
1087	bitmap.pitch = w;
1088	bitmap.buffer = (unsigned char*)SvPVX (retval);
1089	bitmap.num_grays = 256;
1090	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1091
1092	memset (bitmap.buffer, 0, w * h);
1093
1094	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1095
1096	EXTEND (SP, 5);
1097	PUSHs (sv_2mortal (newSViv (w)));	1208	PUSHs (sv_2mortal (newSViv (index)));
1098	PUSHs (sv_2mortal (newSViv (h)));	1209	PUSHs (sv_2mortal (newSViv (trailing)));
1099	PUSHs (sv_2mortal (retval));
1100	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1101	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1102	}	1210	}
1103	}	1211	}
1104		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
1105	MODULE = CFClient PACKAGE = CFClient::Texture	1223	MODULE = CFPlus PACKAGE = CFPlus::Texture
1106		1224
1107	void	1225	void
1108	pad2pot (SV *data_, SV *w_, SV *h_)	1226	pad2pot (SV *data_, SV *w_, SV *h_)
1109	CODE:	1227	CODE:
1110	{	1228	{
…		…
1188	glDisable (GL_ALPHA_TEST);	1306	glDisable (GL_ALPHA_TEST);
1189	glDisable (GL_BLEND);	1307	glDisable (GL_BLEND);
1190	}	1308	}
1191	}	1309	}
1192		1310
1193	MODULE = CFClient PACKAGE = CFClient::Map	1311	MODULE = CFPlus PACKAGE = CFPlus::Map
1194		1312
1195	CFClient::Map	1313	CFPlus::Map
1196	new (SV *class, int map_width, int map_height)	1314	new (SV *class)
1197	CODE:	1315	CODE:
1198	New (0, RETVAL, 1, struct map);	1316	New (0, RETVAL, 1, struct map);
1199	RETVAL->x = 0;	1317	RETVAL->x = 0;
1200	RETVAL->y = 0;	1318	RETVAL->y = 0;
1201	RETVAL->w = map_width;	1319	RETVAL->w = 0;
1202	RETVAL->h = map_height;	1320	RETVAL->h = 0;
1203	RETVAL->ox = 0;	1321	RETVAL->ox = 0;
1204	RETVAL->oy = 0;	1322	RETVAL->oy = 0;
1205	RETVAL->faces = 8192;	1323	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1206	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1324	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1207	RETVAL->texs = 8192;
1208	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1209	RETVAL->rows = 0;	1325	RETVAL->rows = 0;
1210	RETVAL->row = 0;	1326	RETVAL->row = 0;
1211	OUTPUT:	1327	OUTPUT:
1212	RETVAL	1328	RETVAL
1213		1329
1214	void	1330	void
1215	DESTROY (CFClient::Map self)	1331	DESTROY (CFPlus::Map self)
1216	CODE:	1332	CODE:
1217	{	1333	{
1218	map_clear (self);	1334	map_clear (self);
1219	Safefree (self->face);	1335	Safefree (self->face2tile);
1220	Safefree (self->tex);	1336	Safefree (self->tex);
1221	Safefree (self);	1337	Safefree (self);
1222	}	1338	}
1223		1339
1224	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
1225	clear (CFClient::Map self)	1347	clear (CFPlus::Map self)
1226	CODE:	1348	CODE:
1227	map_clear (self);	1349	map_clear (self);
1228		1350
1229	void	1351	void
1230	set_face (CFClient::Map self, int face, int texid)	1352	set_tileid (CFPlus::Map self, int face, int tile)
1231	CODE:	1353	CODE:
1232	{	1354	{
1233	while (self->faces <= face)	1355	need_facenum (self, face); self->face2tile [face] = tile;
1234	{	1356	need_texid (self, tile);
1235	Append (mapface, self->face, self->faces, self->faces);
1236	self->faces *= 2;
1237	}
1238
1239	self->face [face] = texid;
1240	}	1357	}
1241		1358
1242	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
1243	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)
1244	CODE:	1384	CODE:
1245	{	1385	{
1246	while (self->texs <= texid)	1386	need_texid (self, texid);
1247	{
1248	Append (maptex, self->tex, self->texs, self->texs);
1249	self->texs *= 2;
1250	}
1251		1387
1252	{	1388	{
1253	maptex *tex = self->tex + texid;	1389	maptex *tex = self->tex + texid;
1254		1390
1255	tex->name = name;	1391	tex->name = name;
…		…
1272	// from transparent color bleeding and ugly wrapping effects.	1408	// from transparent color bleeding and ugly wrapping effects.
1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1409	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274	}	1410	}
1275		1411
1276	int	1412	int
1277	ox (CFClient::Map self)	1413	ox (CFPlus::Map self)
1278	ALIAS:	1414	ALIAS:
1279	oy = 1	1415	oy = 1
1280	x = 2	1416	x = 2
1281	y = 3	1417	y = 3
1282	w = 4	1418	w = 4
…		…
1293	}	1429	}
1294	OUTPUT:	1430	OUTPUT:
1295	RETVAL	1431	RETVAL
1296		1432
1297	void	1433	void
1298	scroll (CFClient::Map self, int dx, int dy)	1434	scroll (CFPlus::Map self, int dx, int dy)
1299	CODE:	1435	CODE:
1300	{	1436	{
1301	if (dx > 0)	1437	if (dx > 0)
1302	map_blank (self, self->x, self->y, dx - 1, self->h);	1438	map_blank (self, self->x, self->y, dx, self->h);
1303	else if (dx < 0)	1439	else if (dx < 0)
1304	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);
1305		1441
1306	if (dy > 0)	1442	if (dy > 0)
1307	map_blank (self, self->x, self->y, self->w, dy - 1);	1443	map_blank (self, self->x, self->y, self->w, dy);
1308	else if (dy < 0)	1444	else if (dy < 0)
1309	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);
1310		1446
1311	self->ox += dx; self->x += dx;	1447	self->ox += dx; self->x += dx;
1312	self->oy += dy; self->y += dy;	1448	self->oy += dy; self->y += dy;
1313		1449
1314	while (self->y < 0)	1450	while (self->y < 0)
…		…
1319	self->y += MAP_EXTEND_Y;	1455	self->y += MAP_EXTEND_Y;
1320	}	1456	}
1321	}	1457	}
1322		1458
1323	void	1459	void
1324	map1a_update (CFClient::Map self, SV *data_)	1460	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325	CODE:	1461	CODE:
1326	{	1462	{
1327	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1463	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1328	uint8_t *data_end = (uint8_t *)SvEND (data_);	1464	uint8_t *data_end = (uint8_t *)SvEND (data_);
1329	mapcell *cell;	1465	mapcell *cell;
1330	int x, y, flags;	1466	int x, y, flags;
1331		1467
1332	while (data < data_end)	1468	while (data < data_end - 1)
1333	{	1469	{
1334	flags = (data [0] << 8) + data [1]; data += 2;	1470	flags = (data [0] << 8) + data [1]; data += 2;
1335		1471
1336	x = self->x + ((flags >> 10) & 63);	1472	x = self->x + ((flags >> 10) & 63);
1337	y = self->y + ((flags >> 4) & 63);	1473	y = self->y + ((flags >> 4) & 63);
1338		1474
1339	cell = map_get_cell (self, x, y);	1475	cell = map_get_cell (self, x, y);
1340		1476
1341	if (flags & 15)	1477	if (flags & 15)
1342	{	1478	{
1343	if (cell->darkness < 0)	1479	if (!cell->darkness)
1344	{	1480	{
		1481	memset (cell, 0, sizeof (*cell));
1345	cell->darkness = 0;	1482	cell->darkness = 256;
1346	cell->face [0] = 0;
1347	cell->face [1] = 0;
1348	cell->face [2] = 0;
1349	}	1483	}
1350		1484
1351	cell->darkness = flags & 8 ? *data++ : 255;
1352
1353	//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	}
1354		1526
1355	if (flags & 4)	1527	if (flags & 4)
1356	{	1528	{
1357	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];
1358	}	1532	}
1359		1533
1360	if (flags & 2)	1534	if (flags & 2)
1361	{	1535	{
1362	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];
1363	}	1539	}
1364		1540
1365	if (flags & 1)	1541	if (flags & 1)
1366	{	1542	{
1367	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];
1368	}	1546	}
1369	}	1547	}
1370	else	1548	else
1371	cell->darkness = -1;	1549	cell->darkness = 0;
1372	}	1550	}
1373	}	1551	}
1374		1552
1375	SV *	1553	SV *
1376	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)
1377	CODE:	1555	CODE:
1378	{	1556	{
1379	int x1, x;	1557	int x1, x;
1380	int y1, y;	1558	int y1, y;
1381	int z;	1559	int z;
…		…
1402	{	1580	{
1403	mapcell *cell = row->col + (x - row->c0);	1581	mapcell *cell = row->col + (x - row->c0);
1404		1582
1405	for (z = 0; z <= 0; z++)	1583	for (z = 0; z <= 0; z++)
1406	{	1584	{
1407	mapface face = cell->face [z];
1408
1409	if (face)
1410	{
1411	maptex tex = self->tex [face];	1585	maptex tex = self->tex [cell->tile [z]];
1412	int a0 = 255 - tex.a;	1586	int a0 = 255 - tex.a;
1413	int a1 = tex.a;	1587	int a1 = tex.a;
1414		1588
1415	r = (r * a0 + tex.r * a1) / 255;	1589	r = (r * a0 + tex.r * a1) / 255;
1416	g = (g * a0 + tex.g * a1) / 255;	1590	g = (g * a0 + tex.g * a1) / 255;
1417	b = (b * a0 + tex.b * a1) / 255;	1591	b = (b * a0 + tex.b * a1) / 255;
1418	a = (a * a0 + tex.a * a1) / 255;	1592	a = (a * a0 + tex.a * a1) / 255;
1419	}
1420	}	1593	}
1421	}	1594	}
1422		1595
1423	*map++ = (r )	1596	*map++ = (r )
1424	| (g << 8)	1597	| (g << 8)
…		…
1431	}	1604	}
1432	OUTPUT:	1605	OUTPUT:
1433	RETVAL	1606	RETVAL
1434		1607
1435	void	1608	void
1436	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)
1437	CODE:	1610	CODE:
1438	{	1611	{
1439	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;
1440	int x, y, z;	1616	int x, y, z;
1441	int last_name;	1617	int last_name;
1442	mapface face;
1443		1618
1444	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1619	// thats current max. sorry.
1445	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1620	if (sw > 255) sw = 255;
		1621	if (sh > 255) sh = 255;
1446		1622
1447	/*	1623	// clear key, in case of extra padding
1448	int vx = self->vx = self->w >= sw	1624	memset (&skey, 0, sizeof (skey));
1449	? self->x + (self->w - sw) / 2
1450	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1451
1452	int vy = self->vy = self->h >= sh
1453	? self->y + (self->h - sh) / 2
1454	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1455	*/
1456		1625
1457	glColor4ub (255, 255, 255, 255);	1626	glColor4ub (255, 255, 255, 255);
1458		1627
1459	glEnable (GL_BLEND);	1628	glEnable (GL_BLEND);
1460	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1629	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1463		1632
1464	glBegin (GL_QUADS);	1633	glBegin (GL_QUADS);
1465		1634
1466	last_name = 0;	1635	last_name = 0;
1467		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
1468	for (z = 0; z < 3; z++)	1662	for (z = 0; z <= 2; z++)
		1663	{
		1664	memset (smooth_level, 0, sizeof (smooth_level));
		1665
1469	for (y = 0; y < sh; y++)	1666	for (y = 0; y < sh; y++)
1470	if (0 <= y + vy && y + vy < self->rows)	1667	if (0 <= y + my && y + my < self->rows)
1471	{	1668	{
1472	maprow *row = self->row + (y + vy);	1669	maprow *row = self->row + (y + my);
1473		1670
1474	for (x = 0; x < sw; x++)	1671	for (x = 0; x < sw; x++)
1475	if (row->c0 <= x + vx && x + vx < row->c1)	1672	if (row->c0 <= x + mx && x + mx < row->c1)
1476	{	1673	{
1477	mapcell *cell = row->col + (x + vx - row->c0);	1674	mapcell *cell = row->col + (x + mx - row->c0);
1478
1479	face = cell->face [z];	1675	tileid tile = cell->tile [z];
1480		1676
1481	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))
1482	{	1772	{
1483	maptex tex = self->tex [face];	1773	int level = (w << 5) | b;
		1774	HE *he;
1484		1775
1485	int px = (x + 1) * 32 - tex.w;	1776	hv_iterinit (smooth);
1486	int py = (y + 1) * 32 - tex.h;	1777	while ((he = hv_iternext (smooth)))
1487
1488	if (last_name != tex.name)
1489	{	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
1490	glEnd ();	1801	glEnd ();
1491	last_name = tex.name;
1492	glBindTexture (GL_TEXTURE_2D, last_name);	1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1493	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	}
1494	}	1826	}
1495
1496	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1497	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1498	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1499	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1500	}	1827	}
1501	}
1502	}	1828	}
		1829	}
		1830
		1831	hv_clear (smooth);
		1832	}
1503		1833
1504	glEnd ();	1834	glEnd ();
1505		1835
1506	glDisable (GL_TEXTURE_2D);	1836	glDisable (GL_TEXTURE_2D);
1507	glDisable (GL_BLEND);	1837	glDisable (GL_BLEND);
1508	}
1509		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
1510	void	1871	void
1511	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)
1512	CODE:	1873	CODE:
1513	{	1874	{
1514	static float color[16][3] = {	1875	static float color[16][3] = {
1515	{ 0.00, 0.00, 0.00 },	1876	{ 0.00F, 0.00F, 0.00F },
1516	{ 1.00, 1.00, 1.00 },	1877	{ 1.00F, 1.00F, 1.00F },
1517	{ 0.00, 0.00, 0.55 },	1878	{ 0.00F, 0.00F, 0.55F },
1518	{ 1.00, 0.00, 0.00 },	1879	{ 1.00F, 0.00F, 0.00F },
1519		1880
1520	{ 1.00, 0.54, 0.00 },	1881	{ 1.00F, 0.54F, 0.00F },
1521	{ 0.11, 0.56, 1.00 },	1882	{ 0.11F, 0.56F, 1.00F },
1522	{ 0.93, 0.46, 0.00 },	1883	{ 0.93F, 0.46F, 0.00F },
1523	{ 0.18, 0.54, 0.34 },	1884	{ 0.18F, 0.54F, 0.34F },
1524		1885
1525	{ 0.56, 0.73, 0.56 },	1886	{ 0.56F, 0.73F, 0.56F },
1526	{ 0.80, 0.80, 0.80 },	1887	{ 0.80F, 0.80F, 0.80F },
1527	{ 0.55, 0.41, 0.13 },	1888	{ 0.55F, 0.41F, 0.13F },
1528	{ 0.99, 0.77, 0.26 },	1889	{ 0.99F, 0.77F, 0.26F },
1529		1890
1530	{ 0.74, 0.65, 0.41 },	1891	{ 0.74F, 0.65F, 0.41F },
1531		1892
1532	{ 0.00, 1.00, 1.00 },	1893	{ 0.00F, 1.00F, 1.00F },
1533	{ 1.00, 0.00, 1.00 },	1894	{ 1.00F, 0.00F, 1.00F },
1534	{ 1.00, 1.00, 0.00 },	1895	{ 1.00F, 1.00F, 0.00F },
1535	};	1896	};
1536		1897
1537	int x, y;	1898	int x, y;
1538		1899
1539	glEnable (GL_TEXTURE_2D);	1900	glEnable (GL_TEXTURE_2D);
…		…
1566	glDisable (GL_BLEND);	1927	glDisable (GL_BLEND);
1567	glDisable (GL_TEXTURE_2D);	1928	glDisable (GL_TEXTURE_2D);
1568	}	1929	}
1569		1930
1570	void	1931	void
1571	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)
1572	PPCODE:	1933	PPCODE:
1573	{	1934	{
1574	int vx, vy;
1575	int x, y;	1935	int x, y;
1576	int sw4 = (sw + 3) & ~3;	1936	int sw4 = (sw + 3) & ~3;
1577	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1937	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1578	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1938	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1579		1939
1580	memset (darkness, 255, sw4 * sh);	1940	memset (darkness, 255, sw4 * sh);
1581	SvPOK_only (darkness_sv);	1941	SvPOK_only (darkness_sv);
1582	SvCUR_set (darkness_sv, sw4 * sh);	1942	SvCUR_set (darkness_sv, sw4 * sh);
1583		1943
1584	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1944	mx += self->x;
1585	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1945	my += self->y;
1586		1946
1587	for (y = 0; y < sh; y++)	1947	for (y = 0; y < sh; y++)
1588	if (0 <= y + vy && y + vy < self->rows)	1948	if (0 <= y + my && y + my < self->rows)
1589	{	1949	{
1590	maprow *row = self->row + (y + vy);	1950	maprow *row = self->row + (y + my);
1591		1951
1592	for (x = 0; x < sw; x++)	1952	for (x = 0; x < sw; x++)
1593	if (row->c0 <= x + vx && x + vx < row->c1)	1953	if (row->c0 <= x + mx && x + mx < row->c1)
1594	{	1954	{
1595	mapcell *cell = row->col + (x + vx - row->c0);	1955	mapcell *cell = row->col + (x + mx - row->c0);
1596		1956
1597	darkness[y * sw4 + x] = cell->darkness < 0	1957	darkness[y * sw4 + x] = cell->darkness
		1958	? 255 - (cell->darkness - 1)
1598	? 255 - FOW_DARKNESS	1959	: 255 - FOW_DARKNESS;
1599	: 255 - cell->darkness;
1600	}	1960	}
1601	}	1961	}
1602		1962
1603	EXTEND (SP, 3);	1963	EXTEND (SP, 3);
1604	PUSHs (sv_2mortal (newSViv (sw4)));	1964	PUSHs (sv_2mortal (newSViv (sw4)));
1605	PUSHs (sv_2mortal (newSViv (sh)));	1965	PUSHs (sv_2mortal (newSViv (sh)));
1606	PUSHs (darkness_sv);	1966	PUSHs (darkness_sv);
1607	}	1967	}
1608		1968
1609	SV *	1969	SV *
1610	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)
1611	CODE:	1971	CODE:
1612	{	1972	{
1613	int x, y, x1, y1;	1973	int x, y, x1, y1;
1614	SV *data_sv = newSV (w * h * 7 + 5);	1974	SV *data_sv = newSV (w * h * 7 + 5);
1615	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1975	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1640	if (row && row->c0 <= x && x < row->c1)	2000	if (row && row->c0 <= x && x < row->c1)
1641	{	2001	{
1642	mapcell *cell = row->col + (x - row->c0);	2002	mapcell *cell = row->col + (x - row->c0);
1643	uint8_t flags = 0;	2003	uint8_t flags = 0;
1644		2004
1645	if (cell->face [0]) flags |= 1;	2005	if (cell->tile [0]) flags |= 1;
1646	if (cell->face [1]) flags |= 2;	2006	if (cell->tile [1]) flags |= 2;
1647	if (cell->face [2]) flags |= 4;	2007	if (cell->tile [2]) flags |= 4;
1648		2008
1649	*data++ = flags;	2009	*data++ = flags;
1650		2010
1651	if (flags & 1)	2011	if (flags & 1)
1652	{	2012	{
		2013	tileid tile = cell->tile [0];
1653	*data++ = cell->face [0] >> 8;	2014	*data++ = tile >> 8;
1654	*data++ = cell->face [0];	2015	*data++ = tile;
1655	}	2016	}
1656		2017
1657	if (flags & 2)	2018	if (flags & 2)
1658	{	2019	{
		2020	tileid tile = cell->tile [1];
1659	*data++ = cell->face [1] >> 8;	2021	*data++ = tile >> 8;
1660	*data++ = cell->face [1];	2022	*data++ = tile;
1661	}	2023	}
1662		2024
1663	if (flags & 4)	2025	if (flags & 4)
1664	{	2026	{
		2027	tileid tile = cell->tile [2];
1665	*data++ = cell->face [2] >> 8;	2028	*data++ = tile >> 8;
1666	*data++ = cell->face [2];	2029	*data++ = tile;
1667	}	2030	}
1668	}	2031	}
1669	else	2032	else
1670	*data++ = 0;	2033	*data++ = 0;
1671	}	2034	}
…		…
1677	}	2040	}
1678	OUTPUT:	2041	OUTPUT:
1679	RETVAL	2042	RETVAL
1680		2043
1681	void	2044	void
1682	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)
1683	PPCODE:	2046	PPCODE:
1684	{	2047	{
1685	int x, y, z;	2048	int x, y, z;
1686	int w, h;	2049	int w, h;
1687	int x1, y1;	2050	int x1, y1;
…		…
1711	{	2074	{
1712	uint8_t flags = *data++;	2075	uint8_t flags = *data++;
1713		2076
1714	if (flags)	2077	if (flags)
1715	{	2078	{
1716	mapface face[3] = { 0, 0, 0 };
1717
1718	mapcell *cell = row_get_cell (row, x);	2079	mapcell *cell = row_get_cell (row, x);
		2080	tileid tile[3] = { 0, 0, 0 };
1719		2081
1720	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2082	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1721	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2083	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1722	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2084	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1723		2085
1724	if (cell->darkness <= 0)	2086	if (cell->darkness == 0)
1725	{	2087	{
1726	cell->darkness = -1;	2088	cell->darkness = 0;
1727		2089
1728	for (z = 0; z <= 2; z++)	2090	for (z = 0; z <= 2; z++)
1729	{	2091	{
1730	cell->face[z] = face[z];	2092	tileid t = tile [z];
1731		2093
1732	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2094	if (t >= self->texs || (t && !self->tex [t].name))
		2095	{
1733	XPUSHs (sv_2mortal (newSViv (face[z])));	2096	XPUSHs (sv_2mortal (newSViv (t)));
		2097	need_texid (self, t);
		2098	}
		2099
		2100	cell->tile [z] = t;
1734	}	2101	}
1735	}	2102	}
1736	}	2103	}
1737	}	2104	}
1738	}	2105	}
1739	}	2106	}
1740		2107
1741	MODULE = CFClient PACKAGE = CFClient::MixChunk	2108	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742		2109
1743	CFClient::MixChunk	2110	CFPlus::MixChunk
1744	new_from_file (SV *class, char *path)	2111	new_from_file (SV *class, char *path)
1745	CODE:	2112	CODE:
1746	RETVAL = Mix_LoadWAV (path);	2113	RETVAL = Mix_LoadWAV (path);
1747	OUTPUT:	2114	OUTPUT:
1748	RETVAL	2115	RETVAL
1749		2116
1750	void	2117	void
1751	DESTROY (CFClient::MixChunk self)	2118	DESTROY (CFPlus::MixChunk self)
1752	CODE:	2119	CODE:
1753	Mix_FreeChunk (self);	2120	Mix_FreeChunk (self);
1754		2121
1755	int	2122	int
1756	volume (CFClient::MixChunk self, int volume = -1)	2123	volume (CFPlus::MixChunk self, int volume = -1)
1757	CODE:	2124	CODE:
1758	RETVAL = Mix_VolumeChunk (self, volume);	2125	RETVAL = Mix_VolumeChunk (self, volume);
1759	OUTPUT:	2126	OUTPUT:
1760	RETVAL	2127	RETVAL
1761		2128
1762	int	2129	int
1763	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)
1764	CODE:	2131	CODE:
1765	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2132	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766	OUTPUT:	2133	OUTPUT:
1767	RETVAL	2134	RETVAL
1768		2135
1769	MODULE = CFClient PACKAGE = CFClient::MixMusic	2136	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770		2137
1771	int	2138	int
1772	volume (int volume = -1)	2139	volume (int volume = -1)
1773	CODE:	2140	CODE:
1774	RETVAL = Mix_VolumeMusic (volume);	2141	RETVAL = Mix_VolumeMusic (volume);
1775	OUTPUT:	2142	OUTPUT:
1776	RETVAL	2143	RETVAL
1777		2144
		2145	int
		2146	fade_out (int ms)
		2147	CODE:
		2148	RETVAL = Mix_FadeOutMusic (ms);
		2149	OUTPUT:
		2150	RETVAL
		2151
1778	CFClient::MixMusic	2152	CFPlus::MixMusic
1779	new_from_file (SV *class, char *path)	2153	new_from_file (SV *class, char *path)
1780	CODE:	2154	CODE:
1781	RETVAL = Mix_LoadMUS (path);	2155	RETVAL = Mix_LoadMUS (path);
1782	OUTPUT:	2156	OUTPUT:
1783	RETVAL	2157	RETVAL
1784		2158
1785	void	2159	void
1786	DESTROY (CFClient::MixMusic self)	2160	DESTROY (CFPlus::MixMusic self)
1787	CODE:	2161	CODE:
1788	Mix_FreeMusic (self);	2162	Mix_FreeMusic (self);
1789		2163
1790	int	2164	int
1791	play (CFClient::MixMusic self, int loops = -1)	2165	play (CFPlus::MixMusic self, int loops = -1)
1792	CODE:	2166	CODE:
1793	RETVAL = Mix_PlayMusic (self, loops);	2167	RETVAL = Mix_PlayMusic (self, loops);
1794	OUTPUT:	2168	OUTPUT:
1795	RETVAL	2169	RETVAL
1796		2170
1797	MODULE = CFClient PACKAGE = CFClient::OpenGL	2171	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798		2172
1799	BOOT:	2173	BOOT:
1800	{	2174	{
1801	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2175	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802	static const struct {	2176	static const struct {
1803	const char *name;	2177	const char *name;
1804	IV iv;	2178	IV iv;
1805	} *civ, const_iv[] = {	2179	} *civ, const_iv[] = {
1806	# define const_iv(name) { # name, (IV)name }	2180	# define const_iv(name) { # name, (IV)name }
…		…
1869	const_iv (GL_SEPARABLE_2D),	2243	const_iv (GL_SEPARABLE_2D),
1870	const_iv (GL_CONVOLUTION_2D),	2244	const_iv (GL_CONVOLUTION_2D),
1871	const_iv (GL_CONVOLUTION_BORDER_MODE),	2245	const_iv (GL_CONVOLUTION_BORDER_MODE),
1872	const_iv (GL_CONSTANT_BORDER),	2246	const_iv (GL_CONSTANT_BORDER),
1873	const_iv (GL_LINES),	2247	const_iv (GL_LINES),
		2248	const_iv (GL_LINE_STRIP),
1874	const_iv (GL_LINE_LOOP),	2249	const_iv (GL_LINE_LOOP),
1875	const_iv (GL_QUADS),	2250	const_iv (GL_QUADS),
1876	const_iv (GL_QUAD_STRIP),	2251	const_iv (GL_QUAD_STRIP),
1877	const_iv (GL_TRIANGLES),	2252	const_iv (GL_TRIANGLES),
1878	const_iv (GL_TRIANGLE_STRIP),	2253	const_iv (GL_TRIANGLE_STRIP),
…		…
1886	# undef const_iv	2261	# undef const_iv
1887	};	2262	};
1888		2263
1889	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; )
1890	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);
1891	}	2269	}
1892		2270
1893	char *	2271	char *
1894	gl_vendor ()	2272	gl_vendor ()
1895	CODE:	2273	CODE:
…		…
1988	r *= a;	2366	r *= a;
1989	g *= a;	2367	g *= a;
1990	b *= a;	2368	b *= a;
1991	}	2369	}
1992	// microsoft visual "c" rounds instead of truncating...	2370	// microsoft visual "c" rounds instead of truncating...
1993	glColor4ub (MIN ((int)(r * 256.f), 255),	2371	glColor4f (r, g, b, a);
1994	MIN ((int)(g * 256.f), 255),
1995	MIN ((int)(b * 256.f), 255),
1996	MIN ((int)(a * 256.f), 255));
1997		2372
1998	void glInterleavedArrays (int format, int stride, char *data)	2373	void glInterleavedArrays (int format, int stride, char *data)
1999		2374
2000	void glDrawElements (int mode, int count, int type, char *indices)	2375	void glDrawElements (int mode, int count, int type, char *indices)
2001		2376
…		…
2047		2422
2048	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)
2049		2424
2050	int glGenTexture ()	2425	int glGenTexture ()
2051	CODE:	2426	CODE:
2052	{	2427	RETVAL = gen_texture ();
2053	GLuint name;
2054	glGenTextures (1, &name);
2055	RETVAL = name;
2056	}
2057	OUTPUT:	2428	OUTPUT:
2058	RETVAL	2429	RETVAL
2059		2430
2060	void glDeleteTexture (int name)	2431	void glDeleteTexture (int name)
2061	CODE:	2432	CODE:
2062	{
2063	GLuint name_ = name;
2064	glDeleteTextures (1, &name_);	2433	del_texture (name);
2065	}	2434
2066
2067	int glGenList ()	2435	int glGenList ()
2068	CODE:	2436	CODE:
2069	RETVAL = glGenLists (1);	2437	RETVAL = glGenLists (1);
2070	OUTPUT:	2438	OUTPUT:
2071	RETVAL	2439	RETVAL
…		…
2078		2446
2079	void glEndList ()	2447	void glEndList ()
2080		2448
2081	void glCallList (int list)	2449	void glCallList (int list)
2082		2450
2083

Diff Legend

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