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.192 by root, Fri Apr 27 21:27:51 2007 UTC

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

Diff Legend

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