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.196 by root, Sun Jul 15 21:02:20 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);
584	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	692	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
585	break;	693	break;
586		694
587	case SDL_MOUSEMOTION:	695	case SDL_MOUSEMOTION:
		696	{
		697	int state = ev.motion.state;
		698	int x = ev.motion.x;
		699	int y = ev.motion.y;
		700	int xrel = ev.motion.xrel;
		701	int yrel = ev.motion.yrel;
		702
		703	/* do simplistic event compression */
		704	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		705	&& state == ev.motion.state)
		706	{
		707	xrel += ev.motion.xrel;
		708	yrel += ev.motion.yrel;
		709	x = ev.motion.x;
		710	y = ev.motion.y;
		711	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		712	}
		713
588	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	714	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
590	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	715	hv_store (hv, "state", 5, newSViv (state), 0);
591	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	716	hv_store (hv, "x", 1, newSViv (x), 0);
592	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	717	hv_store (hv, "y", 1, newSViv (y), 0);
593	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	718	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
594	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	719	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		720	}
595	break;	721	break;
596		722
597	case SDL_MOUSEBUTTONDOWN:	723	case SDL_MOUSEBUTTONDOWN:
598	case SDL_MOUSEBUTTONUP:	724	case SDL_MOUSEBUTTONUP:
599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	725	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	735	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	736	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	737	break;
612	}	738	}
613		739
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	740	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	741	}
616	}	742	}
617		743
618	int	744	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	745	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
628	Mix_AllocateChannels (int numchans = -1)	754	Mix_AllocateChannels (int numchans = -1)
629		755
630	void	756	void
631	lowdelay (int fd, int val = 1)	757	lowdelay (int fd, int val = 1)
632	CODE:	758	CODE:
		759	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		760
		761	void
		762	win32_proxy_info ()
		763	PPCODE:
		764	{
633	#ifndef _WIN32	765	#ifdef _WIN32
634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	766	char buffer[2048];
		767	DWORD buflen;
		768
		769	EXTEND (SP, 3);
		770
		771	buflen = sizeof (buffer);
		772	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		773	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		774	{
		775	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		776
		777	buflen = sizeof (buffer);
		778	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		779	{
		780	PUSHs (newSVpv (buffer, 0));
		781
		782	buflen = sizeof (buffer);
		783	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		784	PUSHs (newSVpv (buffer, 0));
		785	}
		786	}
635	#endif	787	#endif
		788	}
636		789
637	void	790	void
638	add_font (char *file)	791	add_font (char *file)
639	CODE:	792	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	793	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		794
646	void	795	void
647	load_image_inline (SV *image_)	796	load_image_inline (SV *image_)
648	ALIAS:	797	ALIAS:
649	load_image_file = 1	798	load_image_file = 1
…		…
691		840
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	841	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		842
694	assert (surface2->pitch == surface2->w * 4);	843	assert (surface2->pitch == surface2->w * 4);
695		844
		845	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	846	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	847	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	848	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	849	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)));	850	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	851	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	852	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		853	SDL_UnlockSurface (surface2);
705		854
706	SDL_FreeSurface (surface);	855	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	856	SDL_FreeSurface (surface2);
708	}	857	}
709		858
…		…
748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	897	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749	#endif	898	#endif
750	_exit (1);	899	_exit (1);
751		900
752	void	901	void
753	_exit (int retval)	902	_exit (int retval = 0)
754	CODE:	903	CODE:
		904	#ifdef WIN32
		905	ExitThread (retval); // unclean, please beam me up
		906	#else
755	_exit (retval);	907	_exit (retval);
		908	#endif
756		909
		910	void
		911	debug ()
		912	CODE:
		913	{
		914	#if DEBUG
		915	VALGRIND_DO_LEAK_CHECK;
		916	#endif
		917	}
		918
757	MODULE = CFClient PACKAGE = CFClient::Font	919	MODULE = CFPlus PACKAGE = CFPlus::Font
758		920
759	CFClient::Font	921	CFPlus::Font
760	new_from_file (SV *class, char *path, int id = 0)	922	new_from_file (SV *class, char *path, int id = 0)
761	CODE:	923	CODE:
762	{	924	{
763	int count;	925	int count;
764	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	926	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
767	}	929	}
768	OUTPUT:	930	OUTPUT:
769	RETVAL	931	RETVAL
770		932
771	void	933	void
772	DESTROY (CFClient::Font self)	934	DESTROY (CFPlus::Font self)
773	CODE:	935	CODE:
774	pango_font_description_free (self);	936	pango_font_description_free (self);
775		937
776	void	938	void
777	make_default (CFClient::Font self)	939	make_default (CFPlus::Font self)
778	CODE:	940	CODE:
779	default_font = self;	941	default_font = self;
780		942
781	MODULE = CFClient PACKAGE = CFClient::Layout	943	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		944
783	CFClient::Layout	945	void
784	new (SV *class, int rgba = 0)	946	reset_glyph_cache ()
		947	CODE:
		948	tc_clear ();
		949
		950	CFPlus::Layout
		951	new (SV *class)
785	CODE:	952	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	953	New (0, RETVAL, 1, struct cf_layout);
787		954
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	955	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	956	RETVAL->r = 1.;
791	RETVAL->g = 1.;	957	RETVAL->g = 1.;
792	RETVAL->b = 1.;	958	RETVAL->b = 1.;
793	RETVAL->a = 1.;	959	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	960	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	964	layout_update_font (RETVAL);
799	OUTPUT:	965	OUTPUT:
800	RETVAL	966	RETVAL
801		967
802	void	968	void
803	DESTROY (CFClient::Layout self)	969	DESTROY (CFPlus::Layout self)
804	CODE:	970	CODE:
805	g_object_unref (self->pl);	971	g_object_unref (self->pl);
806	Safefree (self);	972	Safefree (self);
807		973
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	974	void
816	set_text (CFClient::Layout self, SV *text_)	975	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	976	CODE:
818	{	977	{
819	STRLEN textlen;	978	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	979	char *text = SvPVutf8 (text_, textlen);
821		980
822	pango_layout_set_text (self->pl, text, textlen);	981	pango_layout_set_text (self->pl, text, textlen);
823	}	982	}
824		983
825	void	984	void
826	set_markup (CFClient::Layout self, SV *text_)	985	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	986	CODE:
828	{	987	{
829	STRLEN textlen;	988	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	989	char *text = SvPVutf8 (text_, textlen);
831		990
832	pango_layout_set_markup (self->pl, text, textlen);	991	pango_layout_set_markup (self->pl, text, textlen);
833	}	992	}
834		993
835	void	994	void
836	set_shapes (CFClient::Layout self, ...)	995	set_shapes (CFPlus::Layout self, ...)
837	CODE:	996	CODE:
838	{	997	{
839	PangoAttrList *attrs = 0;	998	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	999	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	1000	const char *pos = text;
842	int arg = 2;	1001	int arg = 4;
843		1002
844	while (arg < items && (pos = strstr (pos, OBJ_STR)))	1003	while (arg < items && (pos = strstr (pos, OBJ_STR)))
845	{	1004	{
846	PangoRectangle rect;	1005	PangoRectangle inkrect, rect;
847	PangoAttribute *attr;	1006	PangoAttribute *attr;
848		1007
		1008	int x = SvIV (ST (arg - 3));
		1009	int y = SvIV (ST (arg - 2));
849	int w = SvIV (ST (arg - 1));	1010	int w = SvIV (ST (arg - 1));
850	int h = SvIV (ST (arg));	1011	int h = SvIV (ST (arg ));
851		1012
852	arg += 2;
853
854	rect.x = 0;	1013	inkrect.x = 0;
		1014	inkrect.y = 0;
		1015	inkrect.width = 0;
		1016	inkrect.height = 0;
		1017
		1018	rect.x = x * PANGO_SCALE;
855	rect.y = -h * PANGO_SCALE;	1019	rect.y = y * PANGO_SCALE;
856	rect.width = w * PANGO_SCALE;	1020	rect.width = w * PANGO_SCALE;
857	rect.height = h * PANGO_SCALE;	1021	rect.height = h * PANGO_SCALE;
858		1022
859	if (!attrs)	1023	if (!attrs)
860	attrs = pango_layout_get_attributes (self->pl);	1024	attrs = pango_layout_get_attributes (self->pl);
861		1025
862	attr = pango_attr_shape_new (&rect, &rect);	1026	attr = pango_attr_shape_new (&inkrect, &rect);
863	attr->start_index = pos - text;	1027	attr->start_index = pos - text;
864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;	1028	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865	pango_attr_list_insert (attrs, attr);	1029	pango_attr_list_insert (attrs, attr);
866		1030
		1031	arg += 4;
867	pos += sizeof (OBJ_STR) - 1;	1032	pos += sizeof (OBJ_STR) - 1;
868	}	1033	}
869		1034
870	if (attrs)	1035	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	1036	pango_layout_set_attributes (self->pl, attrs);
872	}	1037	}
873		1038
874	void	1039	void
875	get_shapes (CFClient::Layout self)	1040	get_shapes (CFPlus::Layout self)
876	PPCODE:	1041	PPCODE:
877	{	1042	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1043	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		1044
880	do	1045	do
…		…
884	if (run && shape_attr_p (run))	1049	if (run && shape_attr_p (run))
885	{	1050	{
886	PangoRectangle extents;	1051	PangoRectangle extents;
887	pango_layout_iter_get_run_extents (iter, 0, &extents);	1052	pango_layout_iter_get_run_extents (iter, 0, &extents);
888		1053
		1054	EXTEND (SP, 2);
889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	1055	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	1056	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891	}	1057	}
892	}	1058	}
893	while (pango_layout_iter_next_run (iter));	1059	while (pango_layout_iter_next_run (iter));
894		1060
895	pango_layout_iter_free (iter);	1061	pango_layout_iter_free (iter);
896	}	1062	}
897		1063
898	int	1064	int
899	has_wrapped (CFClient::Layout self)	1065	has_wrapped (CFPlus::Layout self)
900	CODE:	1066	CODE:
901	{	1067	{
902	int lines = 1;	1068	int lines = 1;
903	const char *text = pango_layout_get_text (self->pl);	1069	const char *text = pango_layout_get_text (self->pl);
904		1070
…		…
909	}	1075	}
910	OUTPUT:	1076	OUTPUT:
911	RETVAL	1077	RETVAL
912		1078
913	SV *	1079	SV *
914	get_text (CFClient::Layout self)	1080	get_text (CFPlus::Layout self)
915	CODE:	1081	CODE:
916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1082	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917	sv_utf8_decode (RETVAL);	1083	sv_utf8_decode (RETVAL);
918	OUTPUT:	1084	OUTPUT:
919	RETVAL	1085	RETVAL
920		1086
921	void	1087	void
922	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1088	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
923	CODE:	1089	CODE:
924	self->r = r;	1090	self->r = r;
925	self->g = g;	1091	self->g = g;
926	self->b = b;	1092	self->b = b;
927	self->a = a;	1093	self->a = a;
928		1094
929	void	1095	void
930	set_font (CFClient::Layout self, CFClient::Font font = 0)	1096	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931	CODE:	1097	CODE:
932	if (self->font != font)	1098	if (self->font != font)
933	{	1099	{
934	self->font = font;	1100	self->font = font;
935	layout_update_font (self);	1101	layout_update_font (self);
936	}	1102	}
937		1103
938	void	1104	void
939	set_height (CFClient::Layout self, int base_height)	1105	set_height (CFPlus::Layout self, int base_height)
940	CODE:	1106	CODE:
941	if (self->base_height != base_height)	1107	if (self->base_height != base_height)
942	{	1108	{
943	self->base_height = base_height;	1109	self->base_height = base_height;
944	layout_update_font (self);	1110	layout_update_font (self);
945	}	1111	}
946		1112
947	void	1113	void
948	set_width (CFClient::Layout self, int max_width = -1)	1114	set_width (CFPlus::Layout self, int max_width = -1)
949	CODE:	1115	CODE:
950	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1116	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
951		1117
952	void	1118	void
953	set_indent (CFClient::Layout self, int indent)	1119	set_indent (CFPlus::Layout self, int indent)
954	CODE:	1120	CODE:
955	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1121	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956		1122
957	void	1123	void
958	set_spacing (CFClient::Layout self, int spacing)	1124	set_spacing (CFPlus::Layout self, int spacing)
959	CODE:	1125	CODE:
960	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1126	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961		1127
962	void	1128	void
963	set_ellipsise (CFClient::Layout self, int ellipsise)	1129	set_ellipsise (CFPlus::Layout self, int ellipsise)
964	CODE:	1130	CODE:
965	pango_layout_set_ellipsize (self->pl,	1131	pango_layout_set_ellipsize (self->pl,
966	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1132	ellipsise == 1 ? PANGO_ELLIPSIZE_START
967	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1133	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1134	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
969	: PANGO_ELLIPSIZE_NONE	1135	: PANGO_ELLIPSIZE_NONE
970	);	1136	);
971		1137
972	void	1138	void
973	set_single_paragraph_mode (CFClient::Layout self, int spm)	1139	set_single_paragraph_mode (CFPlus::Layout self, int spm)
974	CODE:	1140	CODE:
975	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1141	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976		1142
977	void	1143	void
978	size (CFClient::Layout self)	1144	size (CFPlus::Layout self)
979	PPCODE:	1145	PPCODE:
980	{	1146	{
981	int w, h;	1147	int w, h;
982		1148
983	layout_get_pixel_size (self, &w, &h);	1149	layout_get_pixel_size (self, &w, &h);
…		…
986	PUSHs (sv_2mortal (newSViv (w)));	1152	PUSHs (sv_2mortal (newSViv (w)));
987	PUSHs (sv_2mortal (newSViv (h)));	1153	PUSHs (sv_2mortal (newSViv (h)));
988	}	1154	}
989		1155
990	int	1156	int
		1157	descent (CFPlus::Layout self)
		1158	CODE:
		1159	{
		1160	PangoRectangle rect;
		1161	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1162	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1163	RETVAL = PANGO_DESCENT (rect);
		1164	}
		1165	OUTPUT:
		1166	RETVAL
		1167
		1168	int
991	xy_to_index (CFClient::Layout self, int x, int y)	1169	xy_to_index (CFPlus::Layout self, int x, int y)
992	CODE:	1170	CODE:
993	{	1171	{
994	int index, trailing;	1172	int index, trailing;
995	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1173	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996	RETVAL = index;	1174	RETVAL = index + trailing;
997	}	1175	}
998	OUTPUT:	1176	OUTPUT:
999	RETVAL	1177	RETVAL
1000		1178
1001	void	1179	void
1002	cursor_pos (CFClient::Layout self, int index)	1180	cursor_pos (CFPlus::Layout self, int index)
1003	PPCODE:	1181	PPCODE:
1004	{	1182	{
1005	PangoRectangle strong_pos;	1183	PangoRectangle strong_pos;
1006	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1184	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007		1185
…		…
1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1188	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1189	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012	}	1190	}
1013		1191
1014	void	1192	void
1015	render (CFClient::Layout self)	1193	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1016	PPCODE:	1194	PPCODE:
1017	{	1195	{
1018	SV *retval;	1196	int line, x;
1019	int w, h;
1020		1197
1021	layout_get_pixel_size (self, &w, &h);	1198	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1199	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1022		1200
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);	1201	EXTEND (SP, 2);
1071	PUSHs (sv_2mortal (newSViv (w)));	1202	PUSHs (sv_2mortal (newSViv (line - 1)));
		1203	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1204	}
		1205
		1206	void
		1207	line_x_to_index (CFPlus::Layout self, int line, int x)
		1208	PPCODE:
		1209	{
		1210	PangoLayoutLine *lp;
		1211	int index, trailing;
		1212
		1213	if (line < 0)
		1214	XSRETURN_EMPTY;
		1215
		1216	if (!(lp = pango_layout_get_line (self->pl, line)))
		1217	XSRETURN_EMPTY; /* do better */
		1218
		1219	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1220
		1221	EXTEND (SP, 2);
		1222	if (GIMME_V == G_SCALAR)
1072	PUSHs (sv_2mortal (newSViv (h)));	1223	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	1224	else
1078	{	1225	{
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)));	1226	PUSHs (sv_2mortal (newSViv (index)));
1098	PUSHs (sv_2mortal (newSViv (h)));	1227	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	}	1228	}
1103	}	1229	}
1104		1230
		1231	void
		1232	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1233	PPCODE:
		1234	pango_opengl_render_layout_subpixel (
		1235	self->pl,
		1236	x * PANGO_SCALE, y * PANGO_SCALE,
		1237	self->r, self->g, self->b, self->a,
		1238	flags
		1239	);
		1240
1105	MODULE = CFClient PACKAGE = CFClient::Texture	1241	MODULE = CFPlus PACKAGE = CFPlus::Texture
1106		1242
1107	void	1243	void
1108	pad2pot (SV *data_, SV *w_, SV *h_)	1244	pad2pot (SV *data_, SV *w_, SV *h_)
1109	CODE:	1245	CODE:
1110	{	1246	{
…		…
1188	glDisable (GL_ALPHA_TEST);	1324	glDisable (GL_ALPHA_TEST);
1189	glDisable (GL_BLEND);	1325	glDisable (GL_BLEND);
1190	}	1326	}
1191	}	1327	}
1192		1328
1193	MODULE = CFClient PACKAGE = CFClient::Map	1329	MODULE = CFPlus PACKAGE = CFPlus::Map
1194		1330
1195	CFClient::Map	1331	CFPlus::Map
1196	new (SV *class, int map_width, int map_height)	1332	new (SV *class)
1197	CODE:	1333	CODE:
1198	New (0, RETVAL, 1, struct map);	1334	New (0, RETVAL, 1, struct map);
1199	RETVAL->x = 0;	1335	RETVAL->x = 0;
1200	RETVAL->y = 0;	1336	RETVAL->y = 0;
1201	RETVAL->w = map_width;	1337	RETVAL->w = 0;
1202	RETVAL->h = map_height;	1338	RETVAL->h = 0;
1203	RETVAL->ox = 0;	1339	RETVAL->ox = 0;
1204	RETVAL->oy = 0;	1340	RETVAL->oy = 0;
1205	RETVAL->faces = 8192;	1341	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1206	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1342	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;	1343	RETVAL->rows = 0;
1210	RETVAL->row = 0;	1344	RETVAL->row = 0;
1211	OUTPUT:	1345	OUTPUT:
1212	RETVAL	1346	RETVAL
1213		1347
1214	void	1348	void
1215	DESTROY (CFClient::Map self)	1349	DESTROY (CFPlus::Map self)
1216	CODE:	1350	CODE:
1217	{	1351	{
1218	map_clear (self);	1352	map_clear (self);
1219	Safefree (self->face);	1353	Safefree (self->face2tile);
1220	Safefree (self->tex);	1354	Safefree (self->tex);
1221	Safefree (self);	1355	Safefree (self);
1222	}	1356	}
1223		1357
1224	void	1358	void
		1359	resize (CFPlus::Map self, int map_width, int map_height)
		1360	CODE:
		1361	self->w = map_width;
		1362	self->h = map_height;
		1363
		1364	void
1225	clear (CFClient::Map self)	1365	clear (CFPlus::Map self)
1226	CODE:	1366	CODE:
1227	map_clear (self);	1367	map_clear (self);
1228		1368
1229	void	1369	void
1230	set_face (CFClient::Map self, int face, int texid)	1370	set_tileid (CFPlus::Map self, int face, int tile)
1231	CODE:	1371	CODE:
1232	{	1372	{
1233	while (self->faces <= face)	1373	need_facenum (self, face); self->face2tile [face] = tile;
1234	{	1374	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	}	1375	}
1241		1376
1242	void	1377	void
		1378	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1379	CODE:
		1380	{
		1381	tileid texid;
		1382	maptex *tex;
		1383
		1384	if (face < 0 || face >= self->faces)
		1385	return;
		1386
		1387	if (smooth < 0 || smooth >= self->faces)
		1388	return;
		1389
		1390	texid = self->face2tile [face];
		1391
		1392	if (!texid)
		1393	return;
		1394
		1395	tex = self->tex + texid;
		1396	tex->smoothtile = self->face2tile [smooth];
		1397	tex->smoothlevel = level;
		1398	}
		1399
		1400	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)	1401	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:	1402	CODE:
1245	{	1403	{
1246	while (self->texs <= texid)	1404	need_texid (self, texid);
1247	{
1248	Append (maptex, self->tex, self->texs, self->texs);
1249	self->texs *= 2;
1250	}
1251		1405
1252	{	1406	{
1253	maptex *tex = self->tex + texid;	1407	maptex *tex = self->tex + texid;
1254		1408
1255	tex->name = name;	1409	tex->name = name;
…		…
1272	// from transparent color bleeding and ugly wrapping effects.	1426	// from transparent color bleeding and ugly wrapping effects.
1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1427	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274	}	1428	}
1275		1429
1276	int	1430	int
1277	ox (CFClient::Map self)	1431	ox (CFPlus::Map self)
1278	ALIAS:	1432	ALIAS:
1279	oy = 1	1433	oy = 1
1280	x = 2	1434	x = 2
1281	y = 3	1435	y = 3
1282	w = 4	1436	w = 4
…		…
1293	}	1447	}
1294	OUTPUT:	1448	OUTPUT:
1295	RETVAL	1449	RETVAL
1296		1450
1297	void	1451	void
1298	scroll (CFClient::Map self, int dx, int dy)	1452	scroll (CFPlus::Map self, int dx, int dy)
1299	CODE:	1453	CODE:
1300	{	1454	{
1301	if (dx > 0)	1455	if (dx > 0)
1302	map_blank (self, self->x, self->y, dx - 1, self->h);	1456	map_blank (self, self->x, self->y, dx, self->h);
1303	else if (dx < 0)	1457	else if (dx < 0)
1304	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1458	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1305		1459
1306	if (dy > 0)	1460	if (dy > 0)
1307	map_blank (self, self->x, self->y, self->w, dy - 1);	1461	map_blank (self, self->x, self->y, self->w, dy);
1308	else if (dy < 0)	1462	else if (dy < 0)
1309	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1463	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1310		1464
1311	self->ox += dx; self->x += dx;	1465	self->ox += dx; self->x += dx;
1312	self->oy += dy; self->y += dy;	1466	self->oy += dy; self->y += dy;
1313		1467
1314	while (self->y < 0)	1468	while (self->y < 0)
…		…
1319	self->y += MAP_EXTEND_Y;	1473	self->y += MAP_EXTEND_Y;
1320	}	1474	}
1321	}	1475	}
1322		1476
1323	void	1477	void
1324	map1a_update (CFClient::Map self, SV *data_)	1478	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325	CODE:	1479	CODE:
1326	{	1480	{
1327	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1481	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1328	uint8_t *data_end = (uint8_t *)SvEND (data_);	1482	uint8_t *data_end = (uint8_t *)SvEND (data_);
1329	mapcell *cell;	1483	mapcell *cell;
1330	int x, y, flags;	1484	int x, y, flags;
1331		1485
1332	while (data < data_end)	1486	while (data < data_end - 1)
1333	{	1487	{
1334	flags = (data [0] << 8) + data [1]; data += 2;	1488	flags = (data [0] << 8) + data [1]; data += 2;
1335		1489
1336	x = self->x + ((flags >> 10) & 63);	1490	x = self->x + ((flags >> 10) & 63);
1337	y = self->y + ((flags >> 4) & 63);	1491	y = self->y + ((flags >> 4) & 63);
1338		1492
1339	cell = map_get_cell (self, x, y);	1493	cell = map_get_cell (self, x, y);
1340		1494
1341	if (flags & 15)	1495	if (flags & 15)
1342	{	1496	{
1343	if (cell->darkness < 0)	1497	if (!cell->darkness)
1344	{	1498	{
		1499	memset (cell, 0, sizeof (*cell));
1345	cell->darkness = 0;	1500	cell->darkness = 256;
1346	cell->face [0] = 0;
1347	cell->face [1] = 0;
1348	cell->face [2] = 0;
1349	}	1501	}
1350		1502
1351	cell->darkness = flags & 8 ? *data++ : 255;
1352
1353	//TODO: don't trust server data to be in-range(!)	1503	//TODO: don't trust server data to be in-range(!)
		1504
		1505	if (flags & 8)
		1506	{
		1507	if (extmap)
		1508	{
		1509	uint8_t ext, cmd;
		1510
		1511	do
		1512	{
		1513	ext = *data++;
		1514	cmd = ext & 0x3f;
		1515
		1516	if (cmd < 4)
		1517	cell->darkness = 255 - ext * 64 + 1;
		1518	else if (cmd == 5) // health
		1519	{
		1520	cell->stat_width = 1;
		1521	cell->stat_hp = *data++;
		1522	}
		1523	else if (cmd == 6) // monster width
		1524	cell->stat_width = *data++ + 1;
		1525	else if (cmd == 0x47)
		1526	{
		1527	if (*data == 4)
		1528	; // decode player count
		1529
		1530	data += *data + 1;
		1531	}
		1532	else if (cmd == 8) // cell flags
		1533	cell->flags = *data++;
		1534	else if (ext & 0x40) // unknown, multibyte => skip
		1535	data += *data + 1;
		1536	else
		1537	data++;
		1538	}
		1539	while (ext & 0x80);
		1540	}
		1541	else
		1542	cell->darkness = *data++ + 1;
		1543	}
1354		1544
1355	if (flags & 4)	1545	if (flags & 4)
1356	{	1546	{
1357	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1547	faceid face = (data [0] << 8) + data [1]; data += 2;
		1548	need_facenum (self, face);
		1549	cell->tile [0] = self->face2tile [face];
1358	}	1550	}
1359		1551
1360	if (flags & 2)	1552	if (flags & 2)
1361	{	1553	{
1362	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1554	faceid face = (data [0] << 8) + data [1]; data += 2;
		1555	need_facenum (self, face);
		1556	cell->tile [1] = self->face2tile [face];
1363	}	1557	}
1364		1558
1365	if (flags & 1)	1559	if (flags & 1)
1366	{	1560	{
1367	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1561	faceid face = (data [0] << 8) + data [1]; data += 2;
		1562	need_facenum (self, face);
		1563	cell->tile [2] = self->face2tile [face];
1368	}	1564	}
1369	}	1565	}
1370	else	1566	else
1371	cell->darkness = -1;	1567	cell->darkness = 0;
1372	}	1568	}
1373	}	1569	}
1374		1570
1375	SV *	1571	SV *
1376	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1572	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377	CODE:	1573	CODE:
1378	{	1574	{
1379	int x1, x;	1575	int x1, x;
1380	int y1, y;	1576	int y1, y;
1381	int z;	1577	int z;
…		…
1402	{	1598	{
1403	mapcell *cell = row->col + (x - row->c0);	1599	mapcell *cell = row->col + (x - row->c0);
1404		1600
1405	for (z = 0; z <= 0; z++)	1601	for (z = 0; z <= 0; z++)
1406	{	1602	{
1407	mapface face = cell->face [z];
1408
1409	if (face)
1410	{
1411	maptex tex = self->tex [face];	1603	maptex tex = self->tex [cell->tile [z]];
1412	int a0 = 255 - tex.a;	1604	int a0 = 255 - tex.a;
1413	int a1 = tex.a;	1605	int a1 = tex.a;
1414		1606
1415	r = (r * a0 + tex.r * a1) / 255;	1607	r = (r * a0 + tex.r * a1) / 255;
1416	g = (g * a0 + tex.g * a1) / 255;	1608	g = (g * a0 + tex.g * a1) / 255;
1417	b = (b * a0 + tex.b * a1) / 255;	1609	b = (b * a0 + tex.b * a1) / 255;
1418	a = (a * a0 + tex.a * a1) / 255;	1610	a = (a * a0 + tex.a * a1) / 255;
1419	}
1420	}	1611	}
1421	}	1612	}
1422		1613
1423	*map++ = (r )	1614	*map++ = (r )
1424	| (g << 8)	1615	| (g << 8)
…		…
1431	}	1622	}
1432	OUTPUT:	1623	OUTPUT:
1433	RETVAL	1624	RETVAL
1434		1625
1435	void	1626	void
1436	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1627	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1437	CODE:	1628	CODE:
1438	{	1629	{
1439	int vx, vy;	1630	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1631	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1632	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1633	smooth_key skey;
1440	int x, y, z;	1634	int x, y, z;
1441	int last_name;	1635	int last_name;
1442	mapface face;
1443		1636
1444	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1637	// thats current max. sorry.
1445	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1638	if (sw > 255) sw = 255;
		1639	if (sh > 255) sh = 255;
1446		1640
1447	/*	1641	// clear key, in case of extra padding
1448	int vx = self->vx = self->w >= sw	1642	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		1643
1457	glColor4ub (255, 255, 255, 255);	1644	glColor4ub (255, 255, 255, 255);
1458		1645
1459	glEnable (GL_BLEND);	1646	glEnable (GL_BLEND);
1460	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1647	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1463		1650
1464	glBegin (GL_QUADS);	1651	glBegin (GL_QUADS);
1465		1652
1466	last_name = 0;	1653	last_name = 0;
1467		1654
		1655	mx += self->x;
		1656	my += self->y;
		1657
		1658	// first pass: determine smooth_max
		1659	// rather ugly, if you ask me
		1660	// could also be stored inside mapcell and updated on change
		1661	memset (smooth_max, 0, sizeof (smooth_max));
		1662
		1663	for (y = 0; y < sh; y++)
		1664	if (0 <= y + my && y + my < self->rows)
		1665	{
		1666	maprow *row = self->row + (y + my);
		1667
		1668	for (x = 0; x < sw; x++)
		1669	if (row->c0 <= x + mx && x + mx < row->c1)
		1670	{
		1671	mapcell *cell = row->col + (x + mx - row->c0);
		1672
		1673	smooth_max[x + 1][y + 1] =
		1674	MAX (self->tex [cell->tile [0]].smoothlevel,
		1675	MAX (self->tex [cell->tile [1]].smoothlevel,
		1676	self->tex [cell->tile [2]].smoothlevel));
		1677	}
		1678	}
		1679
1468	for (z = 0; z < 3; z++)	1680	for (z = 0; z <= 2; z++)
		1681	{
		1682	memset (smooth_level, 0, sizeof (smooth_level));
		1683
1469	for (y = 0; y < sh; y++)	1684	for (y = 0; y < sh; y++)
1470	if (0 <= y + vy && y + vy < self->rows)	1685	if (0 <= y + my && y + my < self->rows)
1471	{	1686	{
1472	maprow *row = self->row + (y + vy);	1687	maprow *row = self->row + (y + my);
1473		1688
1474	for (x = 0; x < sw; x++)	1689	for (x = 0; x < sw; x++)
1475	if (row->c0 <= x + vx && x + vx < row->c1)	1690	if (row->c0 <= x + mx && x + mx < row->c1)
1476	{	1691	{
1477	mapcell *cell = row->col + (x + vx - row->c0);	1692	mapcell *cell = row->col + (x + mx - row->c0);
1478
1479	face = cell->face [z];	1693	tileid tile = cell->tile [z];
1480		1694
1481	if (face)	1695	if (tile)
		1696	{
		1697	maptex tex = self->tex [tile];
		1698	int px = (x + 1) * T - tex.w;
		1699	int py = (y + 1) * T - tex.h;
		1700
		1701	// suppressing texture state switches here
		1702	// is only moderately effective, but worth the extra effort
		1703	if (last_name != tex.name)
		1704	{
		1705	if (!tex.name)
		1706	tex = self->tex [2]; /* missing, replace by noface */
		1707
		1708	glEnd ();
		1709	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1710	glBegin (GL_QUADS);
		1711	}
		1712
		1713	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1714	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1715	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1716	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1717
		1718	if (cell->flags && z == 2)
		1719	{
		1720	if (cell->flags & 1)
		1721	{
		1722	maptex tex = self->tex [1];
		1723	int px = x * T + T * 2 / 32;
		1724	int py = y * T - T * 6 / 32;
		1725
		1726	glEnd ();
		1727	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1728	glBegin (GL_QUADS);
		1729
		1730	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1731	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1732	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1733	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1734	}
		1735	}
		1736
		1737	// update smooth hash
		1738	if (tex.smoothtile)
		1739	{
		1740	skey.tile = tex.smoothtile;
		1741	skey.level = tex.smoothlevel;
		1742
		1743	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1744
		1745	// add bits to current tile and all neighbours. skey.x|y is
		1746	// shifted +1|+1 so we always stay positive.
		1747
		1748	// bits is ___n cccc CCCC bbbb
		1749	// n do not draw borders&corners
		1750	// c draw these corners, but...
		1751	// C ... not these
		1752	// b draw these borders
		1753
		1754	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1755	// ┃· ·· ·┃ ━━
		1756
		1757	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1758	// ·· ·· ·┏ ┓·
		1759
		1760	// full tile
		1761	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1762
		1763	// borders
		1764	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1765	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1766	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1767	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1768
		1769	// corners
		1770	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1771	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1772	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1773	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1774	}
		1775	}
		1776	}
		1777	}
		1778
		1779	// go through all smoothlevels, lowest to highest, then draw.
		1780	// this is basically counting sort
		1781	{
		1782	int w, b;
		1783
		1784	for (w = 0; w < 256 / 32; ++w)
		1785	{
		1786	uint32_t smask = smooth_level [w];
		1787	if (smask)
		1788	for (b = 0; b < 32; ++b)
		1789	if (smask & (((uint32_t)1) << b))
1482	{	1790	{
1483	maptex tex = self->tex [face];	1791	int level = (w << 5) | b;
		1792	HE *he;
1484		1793
1485	int px = (x + 1) * 32 - tex.w;	1794	hv_iterinit (smooth);
1486	int py = (y + 1) * 32 - tex.h;	1795	while ((he = hv_iternext (smooth)))
1487
1488	if (last_name != tex.name)
1489	{	1796	{
		1797	smooth_key *skey = (smooth_key *)HeKEY (he);
		1798	IV bits = SvIVX (HeVAL (he));
		1799
		1800	if (!(bits & 0x1000)
		1801	&& skey->level == level
		1802	&& level > smooth_max [skey->x][skey->y])
		1803	{
		1804	maptex tex = self->tex [skey->tile];
		1805	int px = (((int)skey->x) - 1) * T;
		1806	int py = (((int)skey->y) - 1) * T;
		1807	int border = bits & 15;
		1808	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1809	float dx = tex.s * .0625f; // 16 images/row
		1810	float dy = tex.t * .5f ; // 2 images/column
		1811
		1812	// this time naively avoiding texture state changes
		1813	// save gobs of state changes.
		1814	if (last_name != tex.name)
		1815	{
		1816	if (!tex.name)
		1817	continue; // smoothing not yet available
		1818
1490	glEnd ();	1819	glEnd ();
1491	last_name = tex.name;
1492	glBindTexture (GL_TEXTURE_2D, last_name);	1820	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1493	glBegin (GL_QUADS);	1821	glBegin (GL_QUADS);
		1822	}
		1823
		1824	if (border)
		1825	{
		1826	float ox = border * dx;
		1827
		1828	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1829	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1830	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1831	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1832	}
		1833
		1834	if (corner)
		1835	{
		1836	float ox = corner * dx;
		1837
		1838	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1839	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1840	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1841	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1842	}
		1843	}
1494	}	1844	}
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	}	1845	}
1501	}
1502	}	1846	}
		1847	}
		1848
		1849	hv_clear (smooth);
		1850	}
1503		1851
1504	glEnd ();	1852	glEnd ();
1505		1853
1506	glDisable (GL_TEXTURE_2D);	1854	glDisable (GL_TEXTURE_2D);
1507	glDisable (GL_BLEND);	1855	glDisable (GL_BLEND);
1508	}
1509		1856
		1857	// top layer: overlays such as the health bar
		1858	for (y = 0; y < sh; y++)
		1859	if (0 <= y + my && y + my < self->rows)
		1860	{
		1861	maprow *row = self->row + (y + my);
		1862
		1863	for (x = 0; x < sw; x++)
		1864	if (row->c0 <= x + mx && x + mx < row->c1)
		1865	{
		1866	mapcell *cell = row->col + (x + mx - row->c0);
		1867
		1868	int px = x * T;
		1869	int py = y * T;
		1870
		1871	if (cell->stat_hp)
		1872	{
		1873	int width = cell->stat_width * T;
		1874	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1875
		1876	glColor3ub (0, 0, 0);
		1877	glRectf (px + 1, py - thick - 2,
		1878	px + width - 1, py);
		1879
		1880	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1881	glRectf (px + 2,
		1882	py - thick - 1,
		1883	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1884	}
		1885	}
		1886	}
		1887	}
		1888
1510	void	1889	void
1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1890	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512	CODE:	1891	CODE:
1513	{	1892	{
1514	static float color[16][3] = {	1893	static float color[16][3] = {
1515	{ 0.00, 0.00, 0.00 },	1894	{ 0.00F, 0.00F, 0.00F },
1516	{ 1.00, 1.00, 1.00 },	1895	{ 1.00F, 1.00F, 1.00F },
1517	{ 0.00, 0.00, 0.55 },	1896	{ 0.00F, 0.00F, 0.55F },
1518	{ 1.00, 0.00, 0.00 },	1897	{ 1.00F, 0.00F, 0.00F },
1519		1898
1520	{ 1.00, 0.54, 0.00 },	1899	{ 1.00F, 0.54F, 0.00F },
1521	{ 0.11, 0.56, 1.00 },	1900	{ 0.11F, 0.56F, 1.00F },
1522	{ 0.93, 0.46, 0.00 },	1901	{ 0.93F, 0.46F, 0.00F },
1523	{ 0.18, 0.54, 0.34 },	1902	{ 0.18F, 0.54F, 0.34F },
1524		1903
1525	{ 0.56, 0.73, 0.56 },	1904	{ 0.56F, 0.73F, 0.56F },
1526	{ 0.80, 0.80, 0.80 },	1905	{ 0.80F, 0.80F, 0.80F },
1527	{ 0.55, 0.41, 0.13 },	1906	{ 0.55F, 0.41F, 0.13F },
1528	{ 0.99, 0.77, 0.26 },	1907	{ 0.99F, 0.77F, 0.26F },
1529		1908
1530	{ 0.74, 0.65, 0.41 },	1909	{ 0.74F, 0.65F, 0.41F },
1531		1910
1532	{ 0.00, 1.00, 1.00 },	1911	{ 0.00F, 1.00F, 1.00F },
1533	{ 1.00, 0.00, 1.00 },	1912	{ 1.00F, 0.00F, 1.00F },
1534	{ 1.00, 1.00, 0.00 },	1913	{ 1.00F, 1.00F, 0.00F },
1535	};	1914	};
1536		1915
1537	int x, y;	1916	int x, y;
1538		1917
1539	glEnable (GL_TEXTURE_2D);	1918	glEnable (GL_TEXTURE_2D);
…		…
1566	glDisable (GL_BLEND);	1945	glDisable (GL_BLEND);
1567	glDisable (GL_TEXTURE_2D);	1946	glDisable (GL_TEXTURE_2D);
1568	}	1947	}
1569		1948
1570	void	1949	void
1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1950	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1572	PPCODE:	1951	PPCODE:
1573	{	1952	{
1574	int vx, vy;
1575	int x, y;	1953	int x, y;
1576	int sw4 = (sw + 3) & ~3;	1954	int sw4 = (sw + 3) & ~3;
1577	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1955	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1578	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1956	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1579		1957
1580	memset (darkness, 255, sw4 * sh);	1958	memset (darkness, 255, sw4 * sh);
1581	SvPOK_only (darkness_sv);	1959	SvPOK_only (darkness_sv);
1582	SvCUR_set (darkness_sv, sw4 * sh);	1960	SvCUR_set (darkness_sv, sw4 * sh);
1583		1961
1584	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1962	mx += self->x;
1585	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1963	my += self->y;
1586		1964
1587	for (y = 0; y < sh; y++)	1965	for (y = 0; y < sh; y++)
1588	if (0 <= y + vy && y + vy < self->rows)	1966	if (0 <= y + my && y + my < self->rows)
1589	{	1967	{
1590	maprow *row = self->row + (y + vy);	1968	maprow *row = self->row + (y + my);
1591		1969
1592	for (x = 0; x < sw; x++)	1970	for (x = 0; x < sw; x++)
1593	if (row->c0 <= x + vx && x + vx < row->c1)	1971	if (row->c0 <= x + mx && x + mx < row->c1)
1594	{	1972	{
1595	mapcell *cell = row->col + (x + vx - row->c0);	1973	mapcell *cell = row->col + (x + mx - row->c0);
1596		1974
1597	darkness[y * sw4 + x] = cell->darkness < 0	1975	darkness[y * sw4 + x] = cell->darkness
		1976	? 255 - (cell->darkness - 1)
1598	? 255 - FOW_DARKNESS	1977	: 255 - FOW_DARKNESS;
1599	: 255 - cell->darkness;
1600	}	1978	}
1601	}	1979	}
1602		1980
1603	EXTEND (SP, 3);	1981	EXTEND (SP, 3);
1604	PUSHs (sv_2mortal (newSViv (sw4)));	1982	PUSHs (sv_2mortal (newSViv (sw4)));
1605	PUSHs (sv_2mortal (newSViv (sh)));	1983	PUSHs (sv_2mortal (newSViv (sh)));
1606	PUSHs (darkness_sv);	1984	PUSHs (darkness_sv);
1607	}	1985	}
1608		1986
1609	SV *	1987	SV *
1610	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1988	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611	CODE:	1989	CODE:
1612	{	1990	{
1613	int x, y, x1, y1;	1991	int x, y, x1, y1;
1614	SV *data_sv = newSV (w * h * 7 + 5);	1992	SV *data_sv = newSV (w * h * 7 + 5);
1615	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1993	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1640	if (row && row->c0 <= x && x < row->c1)	2018	if (row && row->c0 <= x && x < row->c1)
1641	{	2019	{
1642	mapcell *cell = row->col + (x - row->c0);	2020	mapcell *cell = row->col + (x - row->c0);
1643	uint8_t flags = 0;	2021	uint8_t flags = 0;
1644		2022
1645	if (cell->face [0]) flags |= 1;	2023	if (cell->tile [0]) flags |= 1;
1646	if (cell->face [1]) flags |= 2;	2024	if (cell->tile [1]) flags |= 2;
1647	if (cell->face [2]) flags |= 4;	2025	if (cell->tile [2]) flags |= 4;
1648		2026
1649	*data++ = flags;	2027	*data++ = flags;
1650		2028
1651	if (flags & 1)	2029	if (flags & 1)
1652	{	2030	{
		2031	tileid tile = cell->tile [0];
1653	*data++ = cell->face [0] >> 8;	2032	*data++ = tile >> 8;
1654	*data++ = cell->face [0];	2033	*data++ = tile;
1655	}	2034	}
1656		2035
1657	if (flags & 2)	2036	if (flags & 2)
1658	{	2037	{
		2038	tileid tile = cell->tile [1];
1659	*data++ = cell->face [1] >> 8;	2039	*data++ = tile >> 8;
1660	*data++ = cell->face [1];	2040	*data++ = tile;
1661	}	2041	}
1662		2042
1663	if (flags & 4)	2043	if (flags & 4)
1664	{	2044	{
		2045	tileid tile = cell->tile [2];
1665	*data++ = cell->face [2] >> 8;	2046	*data++ = tile >> 8;
1666	*data++ = cell->face [2];	2047	*data++ = tile;
1667	}	2048	}
1668	}	2049	}
1669	else	2050	else
1670	*data++ = 0;	2051	*data++ = 0;
1671	}	2052	}
…		…
1677	}	2058	}
1678	OUTPUT:	2059	OUTPUT:
1679	RETVAL	2060	RETVAL
1680		2061
1681	void	2062	void
1682	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2063	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683	PPCODE:	2064	PPCODE:
1684	{	2065	{
1685	int x, y, z;	2066	int x, y, z;
1686	int w, h;	2067	int w, h;
1687	int x1, y1;	2068	int x1, y1;
…		…
1711	{	2092	{
1712	uint8_t flags = *data++;	2093	uint8_t flags = *data++;
1713		2094
1714	if (flags)	2095	if (flags)
1715	{	2096	{
1716	mapface face[3] = { 0, 0, 0 };
1717
1718	mapcell *cell = row_get_cell (row, x);	2097	mapcell *cell = row_get_cell (row, x);
		2098	tileid tile[3] = { 0, 0, 0 };
1719		2099
1720	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2100	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1721	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2101	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1722	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2102	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1723		2103
1724	if (cell->darkness <= 0)	2104	if (cell->darkness == 0)
1725	{	2105	{
1726	cell->darkness = -1;	2106	cell->darkness = 0;
1727		2107
1728	for (z = 0; z <= 2; z++)	2108	for (z = 0; z <= 2; z++)
1729	{	2109	{
1730	cell->face[z] = face[z];	2110	tileid t = tile [z];
1731		2111
1732	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2112	if (t >= self->texs || (t && !self->tex [t].name))
		2113	{
1733	XPUSHs (sv_2mortal (newSViv (face[z])));	2114	XPUSHs (sv_2mortal (newSViv (t)));
		2115	need_texid (self, t);
		2116	}
		2117
		2118	cell->tile [z] = t;
1734	}	2119	}
1735	}	2120	}
1736	}	2121	}
1737	}	2122	}
1738	}	2123	}
1739	}	2124	}
1740		2125
1741	MODULE = CFClient PACKAGE = CFClient::MixChunk	2126	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742		2127
1743	CFClient::MixChunk	2128	CFPlus::MixChunk
1744	new_from_file (SV *class, char *path)	2129	new_from_file (SV *class, char *path)
1745	CODE:	2130	CODE:
1746	RETVAL = Mix_LoadWAV (path);	2131	RETVAL = Mix_LoadWAV (path);
1747	OUTPUT:	2132	OUTPUT:
1748	RETVAL	2133	RETVAL
1749		2134
1750	void	2135	void
1751	DESTROY (CFClient::MixChunk self)	2136	DESTROY (CFPlus::MixChunk self)
1752	CODE:	2137	CODE:
1753	Mix_FreeChunk (self);	2138	Mix_FreeChunk (self);
1754		2139
1755	int	2140	int
1756	volume (CFClient::MixChunk self, int volume = -1)	2141	volume (CFPlus::MixChunk self, int volume = -1)
1757	CODE:	2142	CODE:
1758	RETVAL = Mix_VolumeChunk (self, volume);	2143	RETVAL = Mix_VolumeChunk (self, volume);
1759	OUTPUT:	2144	OUTPUT:
1760	RETVAL	2145	RETVAL
1761		2146
1762	int	2147	int
1763	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2148	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764	CODE:	2149	CODE:
1765	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2150	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766	OUTPUT:	2151	OUTPUT:
1767	RETVAL	2152	RETVAL
1768		2153
1769	MODULE = CFClient PACKAGE = CFClient::MixMusic	2154	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770		2155
1771	int	2156	int
1772	volume (int volume = -1)	2157	volume (int volume = -1)
1773	CODE:	2158	CODE:
1774	RETVAL = Mix_VolumeMusic (volume);	2159	RETVAL = Mix_VolumeMusic (volume);
1775	OUTPUT:	2160	OUTPUT:
1776	RETVAL	2161	RETVAL
1777		2162
		2163	int
		2164	fade_out (int ms)
		2165	CODE:
		2166	RETVAL = Mix_FadeOutMusic (ms);
		2167	OUTPUT:
		2168	RETVAL
		2169
1778	CFClient::MixMusic	2170	CFPlus::MixMusic
1779	new_from_file (SV *class, char *path)	2171	new_from_file (SV *class, char *path)
1780	CODE:	2172	CODE:
1781	RETVAL = Mix_LoadMUS (path);	2173	RETVAL = Mix_LoadMUS (path);
1782	OUTPUT:	2174	OUTPUT:
1783	RETVAL	2175	RETVAL
1784		2176
1785	void	2177	void
1786	DESTROY (CFClient::MixMusic self)	2178	DESTROY (CFPlus::MixMusic self)
1787	CODE:	2179	CODE:
1788	Mix_FreeMusic (self);	2180	Mix_FreeMusic (self);
1789		2181
1790	int	2182	int
1791	play (CFClient::MixMusic self, int loops = -1)	2183	play (CFPlus::MixMusic self, int loops = -1)
1792	CODE:	2184	CODE:
1793	RETVAL = Mix_PlayMusic (self, loops);	2185	RETVAL = Mix_PlayMusic (self, loops);
1794	OUTPUT:	2186	OUTPUT:
1795	RETVAL	2187	RETVAL
1796		2188
		2189	int
		2190	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2191	CODE:
		2192	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2193	OUTPUT:
		2194	RETVAL
		2195
1797	MODULE = CFClient PACKAGE = CFClient::OpenGL	2196	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798		2197
1799	BOOT:	2198	BOOT:
1800	{	2199	{
1801	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2200	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802	static const struct {	2201	static const struct {
1803	const char *name;	2202	const char *name;
1804	IV iv;	2203	IV iv;
1805	} *civ, const_iv[] = {	2204	} *civ, const_iv[] = {
1806	# define const_iv(name) { # name, (IV)name }	2205	# define const_iv(name) { # name, (IV)name }
…		…
1869	const_iv (GL_SEPARABLE_2D),	2268	const_iv (GL_SEPARABLE_2D),
1870	const_iv (GL_CONVOLUTION_2D),	2269	const_iv (GL_CONVOLUTION_2D),
1871	const_iv (GL_CONVOLUTION_BORDER_MODE),	2270	const_iv (GL_CONVOLUTION_BORDER_MODE),
1872	const_iv (GL_CONSTANT_BORDER),	2271	const_iv (GL_CONSTANT_BORDER),
1873	const_iv (GL_LINES),	2272	const_iv (GL_LINES),
		2273	const_iv (GL_LINE_STRIP),
1874	const_iv (GL_LINE_LOOP),	2274	const_iv (GL_LINE_LOOP),
1875	const_iv (GL_QUADS),	2275	const_iv (GL_QUADS),
1876	const_iv (GL_QUAD_STRIP),	2276	const_iv (GL_QUAD_STRIP),
1877	const_iv (GL_TRIANGLES),	2277	const_iv (GL_TRIANGLES),
1878	const_iv (GL_TRIANGLE_STRIP),	2278	const_iv (GL_TRIANGLE_STRIP),
…		…
1886	# undef const_iv	2286	# undef const_iv
1887	};	2287	};
1888		2288
1889	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2289	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1890	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2290	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2291
		2292	texture_av = newAV ();
		2293	AvREAL_off (texture_av);
1891	}	2294	}
1892		2295
1893	char *	2296	char *
1894	gl_vendor ()	2297	gl_vendor ()
1895	CODE:	2298	CODE:
…		…
1988	r *= a;	2391	r *= a;
1989	g *= a;	2392	g *= a;
1990	b *= a;	2393	b *= a;
1991	}	2394	}
1992	// microsoft visual "c" rounds instead of truncating...	2395	// microsoft visual "c" rounds instead of truncating...
1993	glColor4ub (MIN ((int)(r * 256.f), 255),	2396	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		2397
1998	void glInterleavedArrays (int format, int stride, char *data)	2398	void glInterleavedArrays (int format, int stride, char *data)
1999		2399
2000	void glDrawElements (int mode, int count, int type, char *indices)	2400	void glDrawElements (int mode, int count, int type, char *indices)
2001		2401
…		…
2047		2447
2048	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2448	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2049		2449
2050	int glGenTexture ()	2450	int glGenTexture ()
2051	CODE:	2451	CODE:
2052	{	2452	RETVAL = gen_texture ();
2053	GLuint name;
2054	glGenTextures (1, &name);
2055	RETVAL = name;
2056	}
2057	OUTPUT:	2453	OUTPUT:
2058	RETVAL	2454	RETVAL
2059		2455
2060	void glDeleteTexture (int name)	2456	void glDeleteTexture (int name)
2061	CODE:	2457	CODE:
2062	{
2063	GLuint name_ = name;
2064	glDeleteTextures (1, &name_);	2458	del_texture (name);
2065	}	2459
2066
2067	int glGenList ()	2460	int glGenList ()
2068	CODE:	2461	CODE:
2069	RETVAL = glGenLists (1);	2462	RETVAL = glGenLists (1);
2070	OUTPUT:	2463	OUTPUT:
2071	RETVAL	2464	RETVAL
…		…
2078		2471
2079	void glEndList ()	2472	void glEndList ()
2080		2473
2081	void glCallList (int list)	2474	void glCallList (int list)
2082		2475
2083

Diff Legend

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