[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // 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
12	#include <math.h>	19	#include <math.h>
13	#include <string.h>	20	#include <string.h>
14	#include <stdio.h>	21	#include <stdio.h>
		22	#include <stdlib.h>
15		23
16	#include <SDL.h>	24	#include <SDL.h>
17	#include <SDL_endian.h>	25	#include <SDL_endian.h>
18	#include <SDL_image.h>	26	#include <SDL_image.h>
19	#include <SDL_mixer.h>	27	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	28	#include <SDL_opengl.h>
21		29
		30	#define PANGO_ENABLE_BACKEND
		31	#define G_DISABLE_CAST_CHECKS
		32
22	#include <glib/gmacros.h>	33	#include <glib/gmacros.h>
23		34
24	#include <pango/pango.h>	35	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		36
29	#ifndef _WIN32	37	#ifndef _WIN32
30	# include <sys/types.h>	38	# include <sys/types.h>
31	# include <sys/socket.h>	39	# include <sys/socket.h>
32	# include <netinet/in.h>	40	# include <netinet/in.h>
33	# include <netinet/tcp.h>	41	# include <netinet/tcp.h>
34	# include <inttypes.h>	42	# include <inttypes.h>
35	#else
36	typedef unsigned char uint8_t;
37	typedef unsigned short uint16_t;
38	typedef unsigned int uint32_t;
39	typedef signed char int8_t;
40	typedef signed short int16_t;
41	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45		46
46	#define FOW_DARKNESS 32	47	#define FOW_DARKNESS 32
47		48
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	#if 0
54	{ \	55	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	56	#else
56	static type fptr_; \	57	# define PARACHUTE 0
57	\	58	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		59
		60	static struct
		61	{
		62	#define GL_FUNC(ptr,name) ptr name;
		63	#include "glfunc.h"
		64	#undef GL_FUNC
		65	} gl;
		66
		67	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		68	{
		69	if (gl.BlendFuncSeparate)
		70	gl.BlendFuncSeparate (sa, da, saa, daa);
		71	else if (gl.BlendFuncSeparateEXT)
		72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		73	else
		74	glBlendFunc (sa, da);
		75	}
		76
		77	#include "texcache.c"
		78
		79	#include "pango-font.c"
		80	#include "pango-fontmap.c"
		81	#include "pango-render.c"
		82
68	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
70		85
71	typedef PangoFontDescription *CFClient__Font;	86	typedef PangoFontDescription *CFPlus__Font;
		87
		88	static int
		89	shape_attr_p (PangoLayoutRun *run)
		90	{
		91	GSList *attrs = run->item->analysis.extra_attrs;
		92
		93	while (attrs)
		94	{
		95	PangoAttribute *attr = attrs->data;
		96
		97	if (attr->klass->type == PANGO_ATTR_SHAPE)
		98	return 1;
		99
		100	attrs = attrs->next;
		101	}
		102
		103	return 0;
		104	}
72		105
73	typedef struct cf_layout {	106	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	107	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	108	float r, g, b, a; // default color for rgba mode
77	int base_height;	109	int base_height;
78	CFClient__Font font;	110	CFPlus__Font font;
79	} *CFClient__Layout;	111	} *CFPlus__Layout;
80		112
81	static CFClient__Font default_font;	113	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	114	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	115	static PangoFontMap *opengl_fontmap;
84		116
85	static void	117	static void
86	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
87	{	119	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	120	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	121	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	122	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	123	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	125	}
95		126
96	static void	127	static void
97	layout_update_font (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
98	{	129	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	130	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
101	*/	132	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	133	PangoFontDescription *font = self->font ? self->font : default_font;
106		137
107	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
108	}	139	}
109		140
110	static void	141	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	142	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	143	{
		144	PangoRectangle rect;
		145
		146	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
114		148
115	if (!w) w = 1;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!h) h = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		151
118	w = (w + 3) & ~3;	152	if (!rect.width) rect.width = 1;
		153	if (!rect.height) rect.height = 1;
		154
		155	*w = rect.width;
		156	*h = rect.height;
119	}	157	}
120		158
121	typedef uint16_t mapface;	159	typedef uint16_t mapface;
122		160
123	typedef struct {	161	typedef struct {
…		…
126	float s, t;	164	float s, t;
127	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
128	} maptex;	166	} maptex;
129		167
130	typedef struct {	168	typedef struct {
131	int16_t darkness;	169	uint32_t player;
132	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
133	} mapcell;	173	} mapcell;
134		174
135	typedef struct {	175	typedef struct {
136	int32_t c0, c1;	176	int32_t c0, c1;
137	mapcell *col;	177	mapcell *col;
…		…
146	int texs;	186	int texs;
147	maptex *tex;	187	maptex *tex;
148		188
149	int32_t rows;	189	int32_t rows;
150	maprow *row;	190	maprow *row;
151	} *CFClient__Map;	191	} *CFPlus__Map;
152		192
153	static char *	193	static char *
154	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
155	{	195	{
156	char *p;	196	char *p;
…		…
174		214
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	215	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	216	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		217
178	static maprow *	218	static maprow *
179	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
180	{	220	{
181	if (0 > y)	221	if (0 > y)
182	{	222	{
183	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
222		262
223	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
224	}	264	}
225		265
226	static mapcell *	266	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
228	{	268	{
229	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
230	}	270	}
231		271
232	static void	272	static void
233	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
234	{	274	{
235	int r;	275	int r;
236		276
237	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
246	self->row = 0;	286	self->row = 0;
247	self->rows = 0;	287	self->rows = 0;
248	}	288	}
249		289
250	static void	290	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	291	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	292	{
253	int x, y;	293	int x, y;
254	maprow *row;	294	maprow *row;
		295	mapcell *cell;
255		296
256	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	298	if (y >= 0)
258	{	299	{
259	if (y >= self->rows)	300	if (y >= self->rows)
…		…
265	if (x >= row->c0)	306	if (x >= row->c0)
266	{	307	{
267	if (x >= row->c1)	308	if (x >= row->c1)
268	break;	309	break;
269		310
270	row->col[x - row->c0].darkness = -1;	311	cell = row->col + x - row->c0;
		312
		313	cell->darkness = 0;
		314	cell->stat_hp = 0;
		315	cell->flags = 0;
		316	cell->player = 0;
271	}	317	}
272	}	318	}
273	}	319	}
274		320
275	static void	321	static void
…		…
296	ev.data2 = 0;	342	ev.data2 = 0;
297		343
298	SDL_PushEvent ((SDL_Event *)&ev);	344	SDL_PushEvent ((SDL_Event *)&ev);
299	}	345	}
300		346
		347	static unsigned int
		348	minpot (unsigned int n)
		349	{
		350	if (!n)
		351	return 0;
		352
		353	--n;
		354
		355	n \|= n >> 1;
		356	n \|= n >> 2;
		357	n \|= n >> 4;
		358	n \|= n >> 8;
		359	n \|= n >> 16;
		360
		361	return n + 1;
		362	}
		363
		364	/* SDL should provide this, really. */
		365	#define SDLK_MODIFIER_MIN 300
		366	#define SDLK_MODIFIER_MAX 314
		367
301	MODULE = CFClient PACKAGE = CFClient	368	MODULE = CFPlus PACKAGE = CFPlus
302		369
303	PROTOTYPES: ENABLE	370	PROTOTYPES: ENABLE
304		371
305	BOOT:	372	BOOT:
306	{	373	{
307	HV *stash = gv_stashpv ("CFClient", 1);	374	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	375	static const struct {
309	const char *name;	376	const char *name;
310	IV iv;	377	IV iv;
311	} *civ, const_iv[] = {	378	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	379	# define const_iv(name) { # name, (IV)name }
		380	const_iv (SDLK_MODIFIER_MIN),
		381	const_iv (SDLK_MODIFIER_MAX),
		382
313	const_iv (SDL_ACTIVEEVENT),	383	const_iv (SDL_ACTIVEEVENT),
314	const_iv (SDL_KEYDOWN),	384	const_iv (SDL_KEYDOWN),
315	const_iv (SDL_KEYUP),	385	const_iv (SDL_KEYUP),
316	const_iv (SDL_MOUSEMOTION),	386	const_iv (SDL_MOUSEMOTION),
317	const_iv (SDL_MOUSEBUTTONDOWN),	387	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
326	const_iv (SDL_EVENT_RESERVEDA),	396	const_iv (SDL_EVENT_RESERVEDA),
327	const_iv (SDL_EVENT_RESERVEDB),	397	const_iv (SDL_EVENT_RESERVEDB),
328	const_iv (SDL_VIDEORESIZE),	398	const_iv (SDL_VIDEORESIZE),
329	const_iv (SDL_VIDEOEXPOSE),	399	const_iv (SDL_VIDEOEXPOSE),
330	const_iv (SDL_USEREVENT),	400	const_iv (SDL_USEREVENT),
		401
		402	const_iv (SDL_APPINPUTFOCUS),
		403	const_iv (SDL_APPMOUSEFOCUS),
		404	const_iv (SDL_APPACTIVE),
		405
331	const_iv (SDLK_KP0),	406	const_iv (SDLK_KP0),
332	const_iv (SDLK_KP1),	407	const_iv (SDLK_KP1),
333	const_iv (SDLK_KP2),	408	const_iv (SDLK_KP2),
334	const_iv (SDLK_KP3),	409	const_iv (SDLK_KP3),
335	const_iv (SDLK_KP4),	410	const_iv (SDLK_KP4),
…		…
390	const_iv (SDLK_BREAK),	465	const_iv (SDLK_BREAK),
391	const_iv (SDLK_MENU),	466	const_iv (SDLK_MENU),
392	const_iv (SDLK_POWER),	467	const_iv (SDLK_POWER),
393	const_iv (SDLK_EURO),	468	const_iv (SDLK_EURO),
394	const_iv (SDLK_UNDO),	469	const_iv (SDLK_UNDO),
		470
395	const_iv (KMOD_NONE),	471	const_iv (KMOD_NONE),
		472	const_iv (KMOD_SHIFT),
396	const_iv (KMOD_LSHIFT),	473	const_iv (KMOD_LSHIFT),
397	const_iv (KMOD_RSHIFT),	474	const_iv (KMOD_RSHIFT),
		475	const_iv (KMOD_CTRL),
398	const_iv (KMOD_LCTRL),	476	const_iv (KMOD_LCTRL),
399	const_iv (KMOD_RCTRL),	477	const_iv (KMOD_RCTRL),
		478	const_iv (KMOD_ALT),
400	const_iv (KMOD_LALT),	479	const_iv (KMOD_LALT),
401	const_iv (KMOD_RALT),	480	const_iv (KMOD_RALT),
		481	const_iv (KMOD_META),
402	const_iv (KMOD_LMETA),	482	const_iv (KMOD_LMETA),
403	const_iv (KMOD_RMETA),	483	const_iv (KMOD_RMETA),
404	const_iv (KMOD_NUM),	484	const_iv (KMOD_NUM),
405	const_iv (KMOD_CAPS),	485	const_iv (KMOD_CAPS),
406	const_iv (KMOD_MODE),	486	const_iv (KMOD_MODE),
407	const_iv (KMOD_CTRL),
408	const_iv (KMOD_SHIFT),
409	const_iv (KMOD_ALT),
410	const_iv (KMOD_META)
411	# undef const_iv	487	# undef const_iv
412	};	488	};
413		489
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	490	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	491	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		492
		493	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		494	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416	}	495	}
		496
		497	int
		498	in_destruct ()
		499	CODE:
		500	RETVAL = PL_main_cv == Nullcv;
		501	OUTPUT:
		502	RETVAL
		503
		504	NV floor (NV x)
		505
		506	NV ceil (NV x)
417		507
418	void	508	void
419	pango_init ()	509	pango_init ()
420	CODE:	510	CODE:
421	{	511	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	512	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	513	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	514	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	515	}
430		516
431	int	517	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	518	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		519
434	void	520	void
435	SDL_Quit ()	521	SDL_Quit ()
436		522
437	void	523	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	530	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	531	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	532	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		533
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	534	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	535	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		536
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	537	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	538	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	539	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	540	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		541
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	542	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		543	#if SDL_VERSION_ATLEAST(1,2,10)
		544	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		545	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		546	#endif
457		547
458	SDL_EnableUNICODE (1);	548	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	549	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		550
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	551	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	569	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	570	CODE:
481	RETVAL = !!SDL_SetVideoMode (	571	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	572	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	573	);
		574	if (RETVAL)
		575	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	576	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		577	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		578	# include "glfunc.h"
		579	# undef GL_FUNC
		580	}
485	OUTPUT:	581	OUTPUT:
486	RETVAL	582	RETVAL
487		583
488	void	584	void
489	SDL_GL_SwapBuffers ()	585	SDL_GL_SwapBuffers ()
		586
		587	char *
		588	SDL_GetKeyName (int sym)
490		589
491	void	590	void
492	SDL_PollEvent ()	591	SDL_PollEvent ()
493	PPCODE:	592	PPCODE:
494	{	593	{
…		…
504	case SDL_KEYDOWN:	603	case SDL_KEYDOWN:
505	case SDL_KEYUP:	604	case SDL_KEYUP:
506	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
507	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	606	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
508	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	607	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		608	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
509	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	609	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
510	break;	610	break;
511		611
512	case SDL_ACTIVEEVENT:	612	case SDL_ACTIVEEVENT:
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	613	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	614	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	615	break;
516		616
517	case SDL_MOUSEMOTION:	617	case SDL_MOUSEMOTION:
		618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		619
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	620	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	621	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	622	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	623	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	624	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	625	break;
524		626
525	case SDL_MOUSEBUTTONDOWN:	627	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	628	case SDL_MOUSEBUTTONUP:
		629	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		630
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	631	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	632	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	633	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	634	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	635	break;
…		…
535	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	639	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	640	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537	break;	641	break;
538	}	642	}
539		643
540	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	644	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541	}	645	}
542	}	646	}
543		647
544	int	648	int
545	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	649	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
558	CODE:	662	CODE:
559	#ifndef _WIN32	663	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	664	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	665	#endif
562		666
563	char *	667	void
564	gl_version ()	668	win32_proxy_info ()
565	CODE:	669	PPCODE:
566	RETVAL = (char *)glGetString (GL_VERSION);	670	{
567	OUTPUT:	671	#ifdef _WIN32
568	RETVAL	672	char buffer[2048];
		673	DWORD buflen;
569		674
570	char *	675	EXTEND (SP, 3);
571	gl_extensions ()	676
572	CODE:	677	buflen = sizeof (buffer);
573	RETVAL = (char *)glGetString (GL_EXTENSIONS);	678	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
574	OUTPUT:	679	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
575	RETVAL	680	{
		681	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		682
		683	buflen = sizeof (buffer);
		684	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		685	{
		686	PUSHs (newSVpv (buffer, 0));
		687
		688	buflen = sizeof (buffer);
		689	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		690	PUSHs (newSVpv (buffer, 0));
		691	}
		692	}
		693	#endif
		694	}
576		695
577	void	696	void
578	add_font (char *file)	697	add_font (char *file)
579	CODE:	698	CODE:
580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	699	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
581	#ifdef _WIN32
582	// cairo... sigh... requires win2000
583	AddFontResourceEx (file, FR_PRIVATE, 0);
584	#endif
585		700
586	void	701	void
587	load_image_inline (SV *image_)	702	load_image_inline (SV *image_)
588	ALIAS:	703	ALIAS:
589	load_image_file = 1	704	load_image_file = 1
…		…
631		746
632	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	747	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
633		748
634	assert (surface2->pitch == surface2->w * 4);	749	assert (surface2->pitch == surface2->w * 4);
635		750
		751	SDL_LockSurface (surface2);
636	EXTEND (SP, 5);	752	EXTEND (SP, 6);
637	PUSHs (sv_2mortal (newSViv (surface2->w)));	753	PUSHs (sv_2mortal (newSViv (surface2->w)));
638	PUSHs (sv_2mortal (newSViv (surface2->h)));	754	PUSHs (sv_2mortal (newSViv (surface2->h)));
639	SDL_LockSurface (surface2);
640	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	755	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
641	SDL_UnlockSurface (surface2);
642	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	756	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
643	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	757	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
644	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	758	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		759	SDL_UnlockSurface (surface2);
645		760
646	SDL_FreeSurface (surface);	761	SDL_FreeSurface (surface);
647	SDL_FreeSurface (surface2);	762	SDL_FreeSurface (surface2);
648	}	763	}
649		764
…		…
685	CODE:	800	CODE:
686	fprintf (stderr, "FATAL: %s\n", message);	801	fprintf (stderr, "FATAL: %s\n", message);
687	#ifdef _WIN32	802	#ifdef _WIN32
688	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	803	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
689	#endif	804	#endif
690	exit (1);	805	_exit (1);
691		806
		807	void
		808	_exit (int retval = 0)
		809	CODE:
		810	#ifdef WIN32
		811	ExitThread (retval); // unclean, please beam me up
		812	#else
		813	_exit (retval);
		814	#endif
		815
692	MODULE = CFClient PACKAGE = CFClient::Font	816	MODULE = CFPlus PACKAGE = CFPlus::Font
693		817
694	CFClient::Font	818	CFPlus::Font
695	new_from_file (SV class, char path, int id = 0)	819	new_from_file (SV class, char path, int id = 0)
696	CODE:	820	CODE:
697	{	821	{
698	int count;	822	int count;
699	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	823	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
702	}	826	}
703	OUTPUT:	827	OUTPUT:
704	RETVAL	828	RETVAL
705		829
706	void	830	void
707	DESTROY (CFClient::Font self)	831	DESTROY (CFPlus::Font self)
708	CODE:	832	CODE:
709	pango_font_description_free (self);	833	pango_font_description_free (self);
710		834
711	void	835	void
712	make_default (CFClient::Font self)	836	make_default (CFPlus::Font self)
713	CODE:	837	CODE:
714	default_font = self;	838	default_font = self;
715		839
716	MODULE = CFClient PACKAGE = CFClient::Layout	840	MODULE = CFPlus PACKAGE = CFPlus::Layout
717		841
718	CFClient::Layout	842	void
719	new (SV *class, int rgba = 0)	843	reset_glyph_cache ()
720	CODE:	844	CODE:
721	#if _WIN32	845	tc_clear ();
722	rgba = 0;//D	846
723	#endif	847	CFPlus::Layout
		848	new (SV *class)
		849	CODE:
724	New (0, RETVAL, 1, struct cf_layout);	850	New (0, RETVAL, 1, struct cf_layout);
725		851
726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	852	RETVAL->pl = pango_layout_new (opengl_context);
727	RETVAL->rgba = rgba;
728	RETVAL->r = 1.;	853	RETVAL->r = 1.;
729	RETVAL->g = 1.;	854	RETVAL->g = 1.;
730	RETVAL->b = 1.;	855	RETVAL->b = 1.;
731	RETVAL->a = 1.;	856	RETVAL->a = 1.;
732	RETVAL->base_height = MIN_FONT_HEIGHT;	857	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
736	layout_update_font (RETVAL);	861	layout_update_font (RETVAL);
737	OUTPUT:	862	OUTPUT:
738	RETVAL	863	RETVAL
739		864
740	void	865	void
741	DESTROY (CFClient::Layout self)	866	DESTROY (CFPlus::Layout self)
742	CODE:	867	CODE:
743	g_object_unref (self->pl);	868	g_object_unref (self->pl);
744	Safefree (self);	869	Safefree (self);
745		870
746	int
747	is_rgba (CFClient::Layout self)
748	CODE:
749	RETVAL = self->rgba;
750	OUTPUT:
751	RETVAL
752
753	void	871	void
754	set_text (CFClient::Layout self, SV *text_)	872	set_text (CFPlus::Layout self, SV *text_)
755	CODE:	873	CODE:
756	{	874	{
757	STRLEN textlen;	875	STRLEN textlen;
758	char *text = SvPVutf8 (text_, textlen);	876	char *text = SvPVutf8 (text_, textlen);
759		877
760	pango_layout_set_text (self->pl, text, textlen);	878	pango_layout_set_text (self->pl, text, textlen);
761	}	879	}
762		880
763	void	881	void
764	set_markup (CFClient::Layout self, SV *text_)	882	set_markup (CFPlus::Layout self, SV *text_)
765	CODE:	883	CODE:
766	{	884	{
767	STRLEN textlen;	885	STRLEN textlen;
768	char *text = SvPVutf8 (text_, textlen);	886	char *text = SvPVutf8 (text_, textlen);
769		887
770	pango_layout_set_markup (self->pl, text, textlen);	888	pango_layout_set_markup (self->pl, text, textlen);
771	}	889	}
772		890
		891	void
		892	set_shapes (CFPlus::Layout self, ...)
		893	CODE:
		894	{
		895	PangoAttrList *attrs = 0;
		896	const char *text = pango_layout_get_text (self->pl);
		897	const char *pos = text;
		898	int arg = 4;
		899
		900	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		901	{
		902	PangoRectangle inkrect, rect;
		903	PangoAttribute *attr;
		904
		905	int x = SvIV (ST (arg - 3));
		906	int y = SvIV (ST (arg - 2));
		907	int w = SvIV (ST (arg - 1));
		908	int h = SvIV (ST (arg ));
		909
		910	inkrect.x = 0;
		911	inkrect.y = 0;
		912	inkrect.width = 0;
		913	inkrect.height = 0;
		914
		915	rect.x = x * PANGO_SCALE;
		916	rect.y = y * PANGO_SCALE;
		917	rect.width = w * PANGO_SCALE;
		918	rect.height = h * PANGO_SCALE;
		919
		920	if (!attrs)
		921	attrs = pango_layout_get_attributes (self->pl);
		922
		923	attr = pango_attr_shape_new (&inkrect, &rect);
		924	attr->start_index = pos - text;
		925	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		926	pango_attr_list_insert (attrs, attr);
		927
		928	arg += 4;
		929	pos += sizeof (OBJ_STR) - 1;
		930	}
		931
		932	if (attrs)
		933	pango_layout_set_attributes (self->pl, attrs);
		934	}
		935
		936	void
		937	get_shapes (CFPlus::Layout self)
		938	PPCODE:
		939	{
		940	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		941
		942	do
		943	{
		944	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		945
		946	if (run && shape_attr_p (run))
		947	{
		948	PangoRectangle extents;
		949	pango_layout_iter_get_run_extents (iter, 0, &extents);
		950
		951	EXTEND (SP, 2);
		952	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		953	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		954	}
		955	}
		956	while (pango_layout_iter_next_run (iter));
		957
		958	pango_layout_iter_free (iter);
		959	}
		960
		961	int
		962	has_wrapped (CFPlus::Layout self)
		963	CODE:
		964	{
		965	int lines = 1;
		966	const char *text = pango_layout_get_text (self->pl);
		967
		968	while (*text)
		969	lines += *text++ == '\n';
		970
		971	RETVAL = lines < pango_layout_get_line_count (self->pl);
		972	}
		973	OUTPUT:
		974	RETVAL
		975
773	SV *	976	SV *
774	get_text (CFClient::Layout self)	977	get_text (CFPlus::Layout self)
775	CODE:	978	CODE:
776	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	979	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777	SvUTF8_on (RETVAL);	980	sv_utf8_decode (RETVAL);
778	OUTPUT:	981	OUTPUT:
779	RETVAL	982	RETVAL
780		983
781	void	984	void
782	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	985	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
783	CODE:	986	CODE:
784	self->r = r;	987	self->r = r;
785	self->g = g;	988	self->g = g;
786	self->b = b;	989	self->b = b;
787	self->a = a;	990	self->a = a;
788		991
789	void	992	void
790	set_font (CFClient::Layout self, CFClient::Font font = 0)	993	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
791	CODE:	994	CODE:
792	if (self->font != font)	995	if (self->font != font)
793	{	996	{
794	self->font = font;	997	self->font = font;
795	layout_update_font (self);	998	layout_update_font (self);
796	}	999	}
797		1000
798	void	1001	void
799	set_height (CFClient::Layout self, int base_height)	1002	set_height (CFPlus::Layout self, int base_height)
800	CODE:	1003	CODE:
801	if (self->base_height != base_height)	1004	if (self->base_height != base_height)
802	{	1005	{
803	self->base_height = base_height;	1006	self->base_height = base_height;
804	layout_update_font (self);	1007	layout_update_font (self);
805	}	1008	}
806		1009
807	void	1010	void
808	set_width (CFClient::Layout self, int max_width = -1)	1011	set_width (CFPlus::Layout self, int max_width = -1)
809	CODE:	1012	CODE:
810	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1013	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
811		1014
812	void	1015	void
813	set_indent (CFClient::Layout self, int indent)	1016	set_indent (CFPlus::Layout self, int indent)
814	CODE:	1017	CODE:
815	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1018	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816		1019
817	void	1020	void
818	set_spacing (CFClient::Layout self, int spacing)	1021	set_spacing (CFPlus::Layout self, int spacing)
819	CODE:	1022	CODE:
820	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1023	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821		1024
822	void	1025	void
823	set_ellipsise (CFClient::Layout self, int ellipsise)	1026	set_ellipsise (CFPlus::Layout self, int ellipsise)
824	CODE:	1027	CODE:
825	pango_layout_set_ellipsize (self->pl,	1028	pango_layout_set_ellipsize (self->pl,
826	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1029	ellipsise == 1 ? PANGO_ELLIPSIZE_START
827	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1030	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1031	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
829	: PANGO_ELLIPSIZE_NONE	1032	: PANGO_ELLIPSIZE_NONE
830	);	1033	);
831		1034
832	void	1035	void
833	set_single_paragraph_mode (CFClient::Layout self, int spm)	1036	set_single_paragraph_mode (CFPlus::Layout self, int spm)
834	CODE:	1037	CODE:
835	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1038	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836		1039
837	void	1040	void
838	size (CFClient::Layout self)	1041	size (CFPlus::Layout self)
839	PPCODE:	1042	PPCODE:
840	{	1043	{
841	int w, h;	1044	int w, h;
842		1045
843	layout_get_pixel_size (self, &w, &h);	1046	layout_get_pixel_size (self, &w, &h);
…		…
846	PUSHs (sv_2mortal (newSViv (w)));	1049	PUSHs (sv_2mortal (newSViv (w)));
847	PUSHs (sv_2mortal (newSViv (h)));	1050	PUSHs (sv_2mortal (newSViv (h)));
848	}	1051	}
849		1052
850	int	1053	int
		1054	descent (CFPlus::Layout self)
		1055	CODE:
		1056	{
		1057	PangoRectangle rect;
		1058	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1059	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1060	RETVAL = PANGO_DESCENT (rect);
		1061	}
		1062	OUTPUT:
		1063	RETVAL
		1064
		1065	int
851	xy_to_index (CFClient::Layout self, int x, int y)	1066	xy_to_index (CFPlus::Layout self, int x, int y)
852	CODE:	1067	CODE:
853	{	1068	{
854	int index, trailing;	1069	int index, trailing;
855	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1070	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
856	RETVAL = index;	1071	RETVAL = index + trailing;
857	}	1072	}
858	OUTPUT:	1073	OUTPUT:
859	RETVAL	1074	RETVAL
860		1075
861	void	1076	void
862	cursor_pos (CFClient::Layout self, int index)	1077	cursor_pos (CFPlus::Layout self, int index)
863	PPCODE:	1078	PPCODE:
864	{	1079	{
865	PangoRectangle strong_pos;	1080	PangoRectangle strong_pos;
866	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1081	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
867		1082
…		…
870	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1085	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
871	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1086	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
872	}	1087	}
873		1088
874	void	1089	void
875	render (CFClient::Layout self)	1090	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
876	PPCODE:	1091	PPCODE:
877	{	1092	{
878	SV *retval;	1093	int line, x;
879	int w, h;
880		1094
881	layout_get_pixel_size (self, &w, &h);	1095	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1096	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
882		1097
883	if (self->rgba)
884	{
885	cairo_surface_t *surface;
886	cairo_t *cairo;
887
888	retval = newSV (w * h * 4);
889	SvPOK_only (retval);
890	SvCUR_set (retval, w * h * 4);
891
892	memset (SvPVX (retval), 0, w * h * 4);
893
894	surface = cairo_image_surface_create_for_data (
895	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
896	cairo = cairo_create (surface);
897	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
898
899	pango_cairo_show_layout (cairo, self->pl);
900
901	cairo_destroy (cairo);
902	cairo_surface_destroy (surface);
903
904	// what a mess, and its premultiplied, too :(
905	{
906	uint32_t p = (uint32_t )SvPVX (retval);
907	uint32_t e = p + w h;
908
909	while (p < e)
910	{
911	uint32_t rgba = *p;
912	rgba = (rgba >> 24) \| (rgba << 8);
913	#if 0
914	#ifdef _WIN32
915	{//D
916	uint8_t r = rgba >> 24;
917	uint8_t g = rgba >> 16;
918	uint8_t b = rgba >> 8;
919	uint8_t a = rgba >> 0;
920
921	rgba = (rgba & 0xffffff00) \| a;
922	}
923	#endif
924	#endif
925	rgba = SDL_SwapBE32 (rgba);
926	*p++ = rgba;
927	}
928	}
929
930	EXTEND (SP, 5);	1098	EXTEND (SP, 2);
931	PUSHs (sv_2mortal (newSViv (w)));	1099	PUSHs (sv_2mortal (newSViv (line - 1)));
		1100	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1101	}
		1102
		1103	void
		1104	line_x_to_index (CFPlus::Layout self, int line, int x)
		1105	PPCODE:
		1106	{
		1107	PangoLayoutLine *lp;
		1108	int index, trailing;
		1109
		1110	if (line < 0)
		1111	XSRETURN_EMPTY;
		1112
		1113	if (!(lp = pango_layout_get_line (self->pl, line)))
		1114	XSRETURN_EMPTY; /* do better */
		1115
		1116	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1117
		1118	EXTEND (SP, 2);
		1119	if (GIMME_V == G_SCALAR)
932	PUSHs (sv_2mortal (newSViv (h)));	1120	PUSHs (sv_2mortal (newSViv (index + trailing)));
933	PUSHs (sv_2mortal (retval));
934	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	}
937	else	1121	else
938	{	1122	{
939	FT_Bitmap bitmap;
940
941	retval = newSV (w * h);
942	SvPOK_only (retval);
943	SvCUR_set (retval, w * h);
944
945	bitmap.rows = h;
946	bitmap.width = w;
947	bitmap.pitch = w;
948	bitmap.buffer = (unsigned char*)SvPVX (retval);
949	bitmap.num_grays = 256;
950	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
951
952	memset (bitmap.buffer, 0, w * h);
953
954	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
955
956	EXTEND (SP, 5);
957	PUSHs (sv_2mortal (newSViv (w)));	1123	PUSHs (sv_2mortal (newSViv (index)));
958	PUSHs (sv_2mortal (newSViv (h)));	1124	PUSHs (sv_2mortal (newSViv (trailing)));
959	PUSHs (sv_2mortal (retval));
960	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	}	1125	}
963	}	1126	}
964		1127
		1128	void
		1129	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1130	PPCODE:
		1131	pango_opengl_render_layout_subpixel (
		1132	self->pl,
		1133	x * PANGO_SCALE, y * PANGO_SCALE,
		1134	self->r, self->g, self->b, self->a,
		1135	flags
		1136	);
		1137
965	MODULE = CFClient PACKAGE = CFClient::Texture	1138	MODULE = CFPlus PACKAGE = CFPlus::Texture
966		1139
967	void	1140	void
		1141	pad2pot (SV data_, SV w_, SV *h_)
		1142	CODE:
		1143	{
		1144	int ow = SvIV (w_);
		1145	int oh = SvIV (h_);
		1146
		1147	if (ow && oh)
		1148	{
		1149	int nw = minpot (ow);
		1150	int nh = minpot (oh);
		1151
		1152	if (nw != ow \|\| nh != oh)
		1153	{
		1154	if (SvOK (data_))
		1155	{
		1156	STRLEN datalen;
		1157	char *data = SvPVbyte (data_, datalen);
		1158	int bpp = datalen / (ow * oh);
		1159	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1160
		1161	SvPOK_only (result_);
		1162	SvCUR_set (result_, nw * nh * bpp);
		1163
		1164	memset (SvPVX (result_), 0, nw * nh * bpp);
		1165	while (oh--)
		1166	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1167
		1168	sv_setsv (data_, result_);
		1169	}
		1170
		1171	sv_setiv (w_, nw);
		1172	sv_setiv (h_, nh);
		1173	}
		1174	}
		1175	}
		1176
		1177	void
968	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1178	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
969	PROTOTYPE: $$$;$$	1179	PROTOTYPE: $$$;$$
970	ALIAS:	1180	ALIAS:
971	draw_quad_alpha = 1	1181	draw_quad_alpha = 1
972	draw_quad_alpha_premultiplied = 2	1182	draw_quad_alpha_premultiplied = 2
973	CODE:	1183	CODE:
974	{	1184	{
975	HV hv = (HV )SvRV (self);	1185	HV hv = (HV )SvRV (self);
976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1186	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1187	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1188	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980		1189
981	if (items < 5)	1190	if (items < 5)
982	{	1191	{
983	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1192	w = SvNV (*hv_fetch (hv, "w", 1, 1));
984	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1193	h = SvNV (*hv_fetch (hv, "h", 1, 1));
985	}	1194	}
986		1195
987	if (ix)	1196	if (ix)
988	{	1197	{
989	glEnable (GL_BLEND);	1198	glEnable (GL_BLEND);
		1199
		1200	if (ix == 2)
990	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1201	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1202	else
		1203	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1204	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1205
991	glEnable (GL_ALPHA_TEST);	1206	glEnable (GL_ALPHA_TEST);
992	glAlphaFunc (GL_GREATER, 0.01f);	1207	glAlphaFunc (GL_GREATER, 0.01f);
993	}	1208	}
994		1209
995	glBindTexture (GL_TEXTURE_2D, name);	1210	glBindTexture (GL_TEXTURE_2D, name);
996
997	if (wrap_mode)
998	{
999	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001	}
1002		1211
1003	glBegin (GL_QUADS);	1212	glBegin (GL_QUADS);
1004	glTexCoord2f (0, 0); glVertex2f (x , y );	1213	glTexCoord2f (0, 0); glVertex2f (x , y );
1005	glTexCoord2f (0, t); glVertex2f (x , y + h);	1214	glTexCoord2f (0, t); glVertex2f (x , y + h);
1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1215	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1012	glDisable (GL_ALPHA_TEST);	1221	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1222	glDisable (GL_BLEND);
1014	}	1223	}
1015	}	1224	}
1016		1225
1017	MODULE = CFClient PACKAGE = CFClient::Map	1226	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1227
1019	CFClient::Map	1228	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1229	new (SV *class)
1021	CODE:	1230	CODE:
1022	New (0, RETVAL, 1, struct map);	1231	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1232	RETVAL->x = 0;
1024	RETVAL->y = 0;	1233	RETVAL->y = 0;
1025	RETVAL->w = map_width;	1234	RETVAL->w = 0;
1026	RETVAL->h = map_height;	1235	RETVAL->h = 0;
1027	RETVAL->ox = 0;	1236	RETVAL->ox = 0;
1028	RETVAL->oy = 0;	1237	RETVAL->oy = 0;
1029	RETVAL->faces = 8192;	1238	RETVAL->faces = 8192;
1030	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1031	RETVAL->texs = 8192;	1240	RETVAL->texs = 8192;
…		…
1034	RETVAL->row = 0;	1243	RETVAL->row = 0;
1035	OUTPUT:	1244	OUTPUT:
1036	RETVAL	1245	RETVAL
1037		1246
1038	void	1247	void
1039	DESTROY (CFClient::Map self)	1248	DESTROY (CFPlus::Map self)
1040	CODE:	1249	CODE:
1041	{	1250	{
1042	map_clear (self);	1251	map_clear (self);
1043	Safefree (self->face);	1252	Safefree (self->face);
		1253	Safefree (self->tex);
1044	Safefree (self);	1254	Safefree (self);
1045	}	1255	}
1046		1256
1047	void	1257	void
		1258	resize (CFPlus::Map self, int map_width, int map_height)
		1259	CODE:
		1260	self->w = map_width;
		1261	self->h = map_height;
		1262
		1263	void
1048	clear (CFClient::Map self)	1264	clear (CFPlus::Map self)
1049	CODE:	1265	CODE:
1050	map_clear (self);	1266	map_clear (self);
1051		1267
1052	void	1268	void
1053	set_face (CFClient::Map self, int face, int texid)	1269	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1270	CODE:
1055	{	1271	{
1056	while (self->faces <= face)	1272	while (self->faces <= face)
1057	{	1273	{
1058	Append (mapface, self->face, self->faces, self->faces);	1274	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1277
1062	self->face [face] = texid;	1278	self->face [face] = texid;
1063	}	1279	}
1064		1280
1065	void	1281	void
1066	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1282	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1067	CODE:	1283	CODE:
1068	{	1284	{
1069	while (self->texs <= texid)	1285	while (self->texs <= texid)
1070	{	1286	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1287	Append (maptex, self->tex, self->texs, self->texs);
…		…
1083	tex->r = r;	1299	tex->r = r;
1084	tex->g = g;	1300	tex->g = g;
1085	tex->b = b;	1301	tex->b = b;
1086	tex->a = a;	1302	tex->a = a;
1087	}	1303	}
		1304
		1305	// somewhat hackish, but for textures that require it, it really
		1306	// improves the look, and most others don't suffer.
		1307	glBindTexture (GL_TEXTURE_2D, name);
		1308	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1309	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1310	// use uglier nearest interpolation because linear suffers
		1311	// from transparent color bleeding and ugly wrapping effects.
		1312	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088	}	1313	}
1089		1314
1090	int	1315	int
1091	ox (CFClient::Map self)	1316	ox (CFPlus::Map self)
1092	ALIAS:	1317	ALIAS:
1093	oy = 1	1318	oy = 1
		1319	x = 2
		1320	y = 3
		1321	w = 4
		1322	h = 5
1094	CODE:	1323	CODE:
1095	switch (ix)	1324	switch (ix)
1096	{	1325	{
1097	case 0: RETVAL = self->ox; break;	1326	case 0: RETVAL = self->ox; break;
1098	case 1: RETVAL = self->oy; break;	1327	case 1: RETVAL = self->oy; break;
		1328	case 2: RETVAL = self->x; break;
		1329	case 3: RETVAL = self->y; break;
		1330	case 4: RETVAL = self->w; break;
		1331	case 5: RETVAL = self->h; break;
1099	}	1332	}
1100	OUTPUT:	1333	OUTPUT:
1101	RETVAL	1334	RETVAL
1102		1335
1103	void	1336	void
1104	scroll (CFClient::Map self, int dx, int dy)	1337	scroll (CFPlus::Map self, int dx, int dy)
1105	CODE:	1338	CODE:
1106	{	1339	{
1107	if (dx > 0)	1340	if (dx > 0)
1108	map_blank (self, self->x, self->y, dx - 1, self->h);	1341	map_blank (self, self->x, self->y, dx, self->h);
1109	else if (dx < 0)	1342	else if (dx < 0)
1110	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1343	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1111		1344
1112	if (dy > 0)	1345	if (dy > 0)
1113	map_blank (self, self->x, self->y, self->w, dy - 1);	1346	map_blank (self, self->x, self->y, self->w, dy);
1114	else if (dy < 0)	1347	else if (dy < 0)
1115	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1348	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1116		1349
1117	self->ox += dx; self->x += dx;	1350	self->ox += dx; self->x += dx;
1118	self->oy += dy; self->y += dy;	1351	self->oy += dy; self->y += dy;
1119		1352
1120	while (self->y < 0)	1353	while (self->y < 0)
…		…
1125	self->y += MAP_EXTEND_Y;	1358	self->y += MAP_EXTEND_Y;
1126	}	1359	}
1127	}	1360	}
1128		1361
1129	void	1362	void
1130	map1a_update (CFClient::Map self, SV *data_)	1363	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1131	CODE:	1364	CODE:
1132	{	1365	{
1133	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1366	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1134	uint8_t data_end = (uint8_t )SvEND (data_);	1367	uint8_t data_end = (uint8_t )SvEND (data_);
1135	mapcell *cell;	1368	mapcell *cell;
1136	int x, y, flags;	1369	int x, y, flags;
1137		1370
1138	while (data < data_end)	1371	while (data < data_end - 1)
1139	{	1372	{
1140	flags = (data [0] << 8) + data [1]; data += 2;	1373	flags = (data [0] << 8) + data [1]; data += 2;
1141		1374
1142	x = ((flags >> 10) & 63) + self->x;	1375	x = self->x + ((flags >> 10) & 63);
1143	y = ((flags >> 4) & 63) + self->y;	1376	y = self->y + ((flags >> 4) & 63);
1144		1377
1145	cell = map_get_cell (self, x, y);	1378	cell = map_get_cell (self, x, y);
1146		1379
1147	if (flags & 15)	1380	if (flags & 15)
1148	{	1381	{
1149	if (cell->darkness < 0)	1382	if (!cell->darkness)
1150	{	1383	{
		1384	memset (cell, 0, sizeof (*cell));
1151	cell->darkness = 0;	1385	cell->darkness = 256;
1152	cell->face [0] = 0;
1153	cell->face [1] = 0;
1154	cell->face [2] = 0;
1155	}	1386	}
1156		1387
1157	cell->darkness = flags & 8 ? *data++ : 255;
1158
1159	//TODO: don't trust server data to be in-range(!)	1388	//TODO: don't trust server data to be in-range(!)
		1389
		1390	if (flags & 8)
		1391	{
		1392	if (extmap)
		1393	{
		1394	uint8_t ext, cmd;
		1395
		1396	do
		1397	{
		1398	ext = *data++;
		1399	cmd = ext & 0x3f;
		1400
		1401	if (cmd < 4)
		1402	cell->darkness = 255 - ext * 64 + 1;
		1403	else if (cmd == 5) // health
		1404	{
		1405	cell->stat_width = 1;
		1406	cell->stat_hp = *data++;
		1407	}
		1408	else if (cmd == 6) // monster width
		1409	cell->stat_width = *data++ + 1;
		1410	else if (cmd == 0x47) // monster width
		1411	{
		1412	if (*data == 4)
		1413	; // decode player tag
		1414
		1415	data += *data + 1;
		1416	}
		1417	else if (cmd == 8) // cell flags
		1418	cell->flags = *data++;
		1419	else if (ext & 0x40) // unknown, multibyte => skip
		1420	data += *data + 1;
		1421	else
		1422	data++;
		1423	}
		1424	while (ext & 0x80);
		1425	}
		1426	else
		1427	cell->darkness = *data++ + 1;
		1428	}
1160		1429
1161	if (flags & 4)	1430	if (flags & 4)
1162	{	1431	{
1163	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1432	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1164	}	1433	}
…		…
1172	{	1441	{
1173	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1442	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1174	}	1443	}
1175	}	1444	}
1176	else	1445	else
1177	cell->darkness = -1;	1446	cell->darkness = 0;
1178	}	1447	}
1179	}	1448	}
1180		1449
1181	SV *	1450	SV *
1182	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1451	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1183	CODE:	1452	CODE:
1184	{	1453	{
1185	int x1, x;	1454	int x1, x;
1186	int y1, y;	1455	int y1, y;
1187	int z;	1456	int z;
…		…
1237	}	1506	}
1238	OUTPUT:	1507	OUTPUT:
1239	RETVAL	1508	RETVAL
1240		1509
1241	void	1510	void
1242	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1511	draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1243	PPCODE:	1512	CODE:
1244	{	1513	{
1245	int vx, vy;
1246	int x, y, z;	1514	int x, y, z;
1247	int last_name;	1515	int last_name;
1248	mapface face;	1516	mapface face;
1249	int sw4 = (sw + 3) & ~3;
1250	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1251	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1252
1253	memset (darkness, 255, sw4 * sh);
1254	SvPOK_only (darkness_sv);
1255	SvCUR_set (darkness_sv, sw4 * sh);
1256
1257	vx = self->x + (self->w - sw) / 2 - shift_x;
1258	vy = self->y + (self->h - sh) / 2 - shift_y;
1259
1260	/*
1261	int vx = self->vx = self->w >= sw
1262	? self->x + (self->w - sw) / 2
1263	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1264
1265	int vy = self->vy = self->h >= sh
1266	? self->y + (self->h - sh) / 2
1267	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1268	*/
1269		1517
1270	glColor4ub (255, 255, 255, 255);	1518	glColor4ub (255, 255, 255, 255);
1271		1519
		1520	glEnable (GL_BLEND);
1272	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1273	glEnable (GL_BLEND);
1274	glEnable (GL_TEXTURE_2D);	1522	glEnable (GL_TEXTURE_2D);
1275	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1523	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1276		1524
1277	glBegin (GL_QUADS);	1525	glBegin (GL_QUADS);
1278		1526
1279	last_name = 0;	1527	last_name = 0;
1280		1528
		1529	mx += self->x;
		1530	my += self->y;
		1531
1281	for (z = 0; z < 3; z++)	1532	for (z = 0; z < 3; z++)
1282	for (y = 0; y < sh; y++)	1533	for (y = 0; y < sh; y++)
1283	if (0 <= y + vy && y + vy < self->rows)	1534	if (0 <= y + my && y + my < self->rows)
1284	{	1535	{
1285	maprow *row = self->row + (y + vy);	1536	maprow *row = self->row + (y + my);
1286		1537
1287	for (x = 0; x < sw; x++)	1538	for (x = 0; x < sw; x++)
1288	if (row->c0 <= x + vx && x + vx < row->c1)	1539	if (row->c0 <= x + mx && x + mx < row->c1)
1289	{	1540	{
1290	mapcell *cell = row->col + (x + vx - row->c0);	1541	mapcell *cell = row->col + (x + mx - row->c0);
1291
1292	darkness[y * sw4 + x] = cell->darkness < 0
1293	? 255 - FOW_DARKNESS
1294	: 255 - cell->darkness;
1295		1542
1296	face = cell->face [z];	1543	face = cell->face [z];
1297		1544
1298	if (face)	1545	if (face && face < self->texs)
1299	{	1546	{
1300	maptex tex = self->tex [face];	1547	maptex tex = self->tex [face];
1301
1302	int px = (x + 1) * 32 - tex.w;	1548	int px = (x + 1) * 32 - tex.w;
1303	int py = (y + 1) * 32 - tex.h;	1549	int py = (y + 1) * 32 - tex.h;
1304		1550
1305	if (last_name != tex.name)	1551	if (last_name != tex.name)
1306	{	1552	{
1307	glEnd ();	1553	glEnd ();
1308	last_name = tex.name;
1309	glBindTexture (GL_TEXTURE_2D, last_name);	1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1310	glBegin (GL_QUADS);	1555	glBegin (GL_QUADS);
1311	}	1556	}
1312		1557
1313	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1558	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1314	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1559	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1315	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1560	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1316	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1561	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1317	}	1562	}
		1563
		1564	if (cell->flags && z == 2)
		1565	{
		1566	if (cell->flags & 1)
		1567	{
		1568	maptex tex = self->tex [1];
		1569	int px = (x + 1) * 32 - tex.w + 2;
		1570	int py = (y + 1) * 32 - tex.h - 6;
		1571
		1572	glEnd ();
		1573	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1574	glBegin (GL_QUADS);
		1575
		1576	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1577	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1578	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1579	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1580	}
		1581	}
1318	}	1582	}
1319	}	1583	}
1320		1584
1321	glEnd ();	1585	glEnd ();
1322		1586
1323	glDisable (GL_TEXTURE_2D);	1587	glDisable (GL_TEXTURE_2D);
1324	glDisable (GL_BLEND);	1588	glDisable (GL_BLEND);
		1589
		1590	// top layer: overlays such as the health bar
		1591	for (y = 0; y < sh; y++)
		1592	if (0 <= y + my && y + my < self->rows)
		1593	{
		1594	maprow *row = self->row + (y + my);
		1595
		1596	for (x = 0; x < sw; x++)
		1597	if (row->c0 <= x + mx && x + mx < row->c1)
		1598	{
		1599	mapcell *cell = row->col + (x + mx - row->c0);
		1600
		1601	int px = x * 32;
		1602	int py = y * 32;
		1603
		1604	if (cell->stat_hp)
		1605	{
		1606	int width = cell->stat_width * 32;
		1607	int thick = sh / 28 + 1 + cell->stat_width;
		1608
		1609	glColor3ub (0, 0, 0);
		1610	glRectf (px + 1, py - thick - 2,
		1611	px + width - 1, py);
		1612
		1613	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1614	glRectf (px + 2,
		1615	py - thick - 1,
		1616	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1617	}
		1618	}
		1619	}
		1620	}
		1621
		1622	void
		1623	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1624	CODE:
		1625	{
		1626	static float color[16][3] = {
		1627	{ 0.00F, 0.00F, 0.00F },
		1628	{ 1.00F, 1.00F, 1.00F },
		1629	{ 0.00F, 0.00F, 0.55F },
		1630	{ 1.00F, 0.00F, 0.00F },
		1631
		1632	{ 1.00F, 0.54F, 0.00F },
		1633	{ 0.11F, 0.56F, 1.00F },
		1634	{ 0.93F, 0.46F, 0.00F },
		1635	{ 0.18F, 0.54F, 0.34F },
		1636
		1637	{ 0.56F, 0.73F, 0.56F },
		1638	{ 0.80F, 0.80F, 0.80F },
		1639	{ 0.55F, 0.41F, 0.13F },
		1640	{ 0.99F, 0.77F, 0.26F },
		1641
		1642	{ 0.74F, 0.65F, 0.41F },
		1643
		1644	{ 0.00F, 1.00F, 1.00F },
		1645	{ 1.00F, 0.00F, 1.00F },
		1646	{ 1.00F, 1.00F, 0.00F },
		1647	};
		1648
		1649	int x, y;
		1650
		1651	glEnable (GL_TEXTURE_2D);
		1652	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1653	glEnable (GL_BLEND);
		1654	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1655	glBegin (GL_QUADS);
		1656
		1657	for (y = 0; y < h; y++)
		1658	for (x = 0; x < w; x++)
		1659	{
		1660	unsigned char m = data [x + y * w];
		1661
		1662	if (m)
		1663	{
		1664	float *c = color [m & 15];
		1665
		1666	float tx1 = m & 0x40 ? 0.5 : 0.;
		1667	float tx2 = tx1 + 0.5;
		1668
		1669	glColor4f (c[0], c[1], c[2], 0.75);
		1670	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1671	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1672	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1673	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1674	}
		1675	}
		1676
		1677	glEnd ();
		1678	glDisable (GL_BLEND);
		1679	glDisable (GL_TEXTURE_2D);
		1680	}
		1681
		1682	void
		1683	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1684	PPCODE:
		1685	{
		1686	int x, y;
		1687	int sw4 = (sw + 3) & ~3;
		1688	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1689	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1690
		1691	memset (darkness, 255, sw4 * sh);
		1692	SvPOK_only (darkness_sv);
		1693	SvCUR_set (darkness_sv, sw4 * sh);
		1694
		1695	mx += self->x;
		1696	my += self->y;
		1697
		1698	for (y = 0; y < sh; y++)
		1699	if (0 <= y + my && y + my < self->rows)
		1700	{
		1701	maprow *row = self->row + (y + my);
		1702
		1703	for (x = 0; x < sw; x++)
		1704	if (row->c0 <= x + mx && x + mx < row->c1)
		1705	{
		1706	mapcell *cell = row->col + (x + mx - row->c0);
		1707
		1708	darkness[y * sw4 + x] = cell->darkness
		1709	? 255 - (cell->darkness - 1)
		1710	: 255 - FOW_DARKNESS;
		1711	}
		1712	}
1325		1713
1326	EXTEND (SP, 3);	1714	EXTEND (SP, 3);
1327	PUSHs (sv_2mortal (newSViv (sw4)));	1715	PUSHs (sv_2mortal (newSViv (sw4)));
1328	PUSHs (sv_2mortal (newSViv (sh)));	1716	PUSHs (sv_2mortal (newSViv (sh)));
1329	PUSHs (darkness_sv);	1717	PUSHs (darkness_sv);
1330	}	1718	}
1331		1719
1332	SV *	1720	SV *
1333	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1721	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1334	CODE:	1722	CODE:
1335	{	1723	{
1336	int x, y, x1, y1;	1724	int x, y, x1, y1;
1337	SV data_sv = newSV (w h * 7 + 5);	1725	SV data_sv = newSV (w h * 7 + 5);
1338	uint8_t data = (uint8_t )SvPVX (data_sv);	1726	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1400	}	1788	}
1401	OUTPUT:	1789	OUTPUT:
1402	RETVAL	1790	RETVAL
1403		1791
1404	void	1792	void
1405	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1793	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1406	PPCODE:	1794	PPCODE:
1407	{	1795	{
1408	int x, y, z;	1796	int x, y, z;
1409	int w, h;	1797	int w, h;
1410	int x1, y1;	1798	int x1, y1;
…		…
1442		1830
1443	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1831	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1444	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1832	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1445	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1833	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1446		1834
1447	if (cell->darkness <= 0)	1835	if (cell->darkness == 0)
1448	{	1836	{
1449	cell->darkness = -1;	1837	cell->darkness = 0;
1450		1838
1451	for (z = 0; z <= 2; z++)	1839	for (z = 0; z <= 2; z++)
1452	{	1840	{
1453	cell->face[z] = face[z];	1841	cell->face[z] = face[z];
1454		1842
…		…
1459	}	1847	}
1460	}	1848	}
1461	}	1849	}
1462	}	1850	}
1463		1851
1464	MODULE = CFClient PACKAGE = CFClient::MixChunk	1852	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1465		1853
1466	CFClient::MixChunk	1854	CFPlus::MixChunk
1467	new_from_file (SV class, char path)	1855	new_from_file (SV class, char path)
1468	CODE:	1856	CODE:
1469	RETVAL = Mix_LoadWAV (path);	1857	RETVAL = Mix_LoadWAV (path);
1470	OUTPUT:	1858	OUTPUT:
1471	RETVAL	1859	RETVAL
1472		1860
1473	void	1861	void
1474	DESTROY (CFClient::MixChunk self)	1862	DESTROY (CFPlus::MixChunk self)
1475	CODE:	1863	CODE:
1476	Mix_FreeChunk (self);	1864	Mix_FreeChunk (self);
1477		1865
1478	int	1866	int
1479	volume (CFClient::MixChunk self, int volume = -1)	1867	volume (CFPlus::MixChunk self, int volume = -1)
1480	CODE:	1868	CODE:
1481	RETVAL = Mix_VolumeChunk (self, volume);	1869	RETVAL = Mix_VolumeChunk (self, volume);
1482	OUTPUT:	1870	OUTPUT:
1483	RETVAL	1871	RETVAL
1484		1872
1485	int	1873	int
1486	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1874	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1487	CODE:	1875	CODE:
1488	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1876	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1489	OUTPUT:	1877	OUTPUT:
1490	RETVAL	1878	RETVAL
1491		1879
1492	MODULE = CFClient PACKAGE = CFClient::MixMusic	1880	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1493		1881
1494	int	1882	int
1495	volume (int volume = -1)	1883	volume (int volume = -1)
1496	CODE:	1884	CODE:
1497	RETVAL = Mix_VolumeMusic (volume);	1885	RETVAL = Mix_VolumeMusic (volume);
1498	OUTPUT:	1886	OUTPUT:
1499	RETVAL	1887	RETVAL
1500		1888
1501	CFClient::MixMusic	1889	CFPlus::MixMusic
1502	new_from_file (SV class, char path)	1890	new_from_file (SV class, char path)
1503	CODE:	1891	CODE:
1504	RETVAL = Mix_LoadMUS (path);	1892	RETVAL = Mix_LoadMUS (path);
1505	OUTPUT:	1893	OUTPUT:
1506	RETVAL	1894	RETVAL
1507		1895
1508	void	1896	void
1509	DESTROY (CFClient::MixMusic self)	1897	DESTROY (CFPlus::MixMusic self)
1510	CODE:	1898	CODE:
1511	Mix_FreeMusic (self);	1899	Mix_FreeMusic (self);
1512		1900
1513	int	1901	int
1514	play (CFClient::MixMusic self, int loops = -1)	1902	play (CFPlus::MixMusic self, int loops = -1)
1515	CODE:	1903	CODE:
1516	RETVAL = Mix_PlayMusic (self, loops);	1904	RETVAL = Mix_PlayMusic (self, loops);
1517	OUTPUT:	1905	OUTPUT:
1518	RETVAL	1906	RETVAL
1519		1907
1520	MODULE = CFClient PACKAGE = CFClient::OpenGL	1908	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1521		1909
1522	BOOT:	1910	BOOT:
1523	{	1911	{
1524	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1912	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1525	static const struct {	1913	static const struct {
1526	const char *name;	1914	const char *name;
1527	IV iv;	1915	IV iv;
1528	} *civ, const_iv[] = {	1916	} *civ, const_iv[] = {
1529	# define const_iv(name) { # name, (IV)name }	1917	# define const_iv(name) { # name, (IV)name }
…		…
1536	const_iv (GL_SCISSOR_TEST),	1924	const_iv (GL_SCISSOR_TEST),
1537	const_iv (GL_DEPTH_TEST),	1925	const_iv (GL_DEPTH_TEST),
1538	const_iv (GL_ALPHA_TEST),	1926	const_iv (GL_ALPHA_TEST),
1539	const_iv (GL_NORMALIZE),	1927	const_iv (GL_NORMALIZE),
1540	const_iv (GL_RESCALE_NORMAL),	1928	const_iv (GL_RESCALE_NORMAL),
		1929	const_iv (GL_FRONT),
		1930	const_iv (GL_BACK),
1541	const_iv (GL_AND),	1931	const_iv (GL_AND),
1542	const_iv (GL_ONE),	1932	const_iv (GL_ONE),
1543	const_iv (GL_ZERO),	1933	const_iv (GL_ZERO),
1544	const_iv (GL_SRC_ALPHA),	1934	const_iv (GL_SRC_ALPHA),
1545	const_iv (GL_SRC_ALPHA_SATURATE),	1935	const_iv (GL_DST_ALPHA),
1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1936	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547	const_iv (GL_ONE_MINUS_DST_ALPHA),	1937	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1938	const_iv (GL_SRC_ALPHA_SATURATE),
1548	const_iv (GL_RGB),	1939	const_iv (GL_RGB),
1549	const_iv (GL_RGBA),	1940	const_iv (GL_RGBA),
		1941	const_iv (GL_RGBA4),
		1942	const_iv (GL_RGBA8),
		1943	const_iv (GL_RGB5_A1),
1550	const_iv (GL_UNSIGNED_BYTE),	1944	const_iv (GL_UNSIGNED_BYTE),
1551	const_iv (GL_UNSIGNED_SHORT),	1945	const_iv (GL_UNSIGNED_SHORT),
1552	const_iv (GL_UNSIGNED_INT),	1946	const_iv (GL_UNSIGNED_INT),
1553	const_iv (GL_ALPHA),	1947	const_iv (GL_ALPHA),
1554	const_iv (GL_INTENSITY),	1948	const_iv (GL_INTENSITY),
…		…
1563	const_iv (GL_TEXTURE_MAG_FILTER),	1957	const_iv (GL_TEXTURE_MAG_FILTER),
1564	const_iv (GL_TEXTURE_MIN_FILTER),	1958	const_iv (GL_TEXTURE_MIN_FILTER),
1565	const_iv (GL_TEXTURE_ENV_MODE),	1959	const_iv (GL_TEXTURE_ENV_MODE),
1566	const_iv (GL_TEXTURE_WRAP_S),	1960	const_iv (GL_TEXTURE_WRAP_S),
1567	const_iv (GL_TEXTURE_WRAP_T),	1961	const_iv (GL_TEXTURE_WRAP_T),
		1962	const_iv (GL_REPEAT),
1568	const_iv (GL_CLAMP),	1963	const_iv (GL_CLAMP),
1569	const_iv (GL_REPEAT),	1964	const_iv (GL_CLAMP_TO_EDGE),
1570	const_iv (GL_NEAREST),	1965	const_iv (GL_NEAREST),
1571	const_iv (GL_LINEAR),	1966	const_iv (GL_LINEAR),
1572	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1967	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1968	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1969	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1585	const_iv (GL_SEPARABLE_2D),	1980	const_iv (GL_SEPARABLE_2D),
1586	const_iv (GL_CONVOLUTION_2D),	1981	const_iv (GL_CONVOLUTION_2D),
1587	const_iv (GL_CONVOLUTION_BORDER_MODE),	1982	const_iv (GL_CONVOLUTION_BORDER_MODE),
1588	const_iv (GL_CONSTANT_BORDER),	1983	const_iv (GL_CONSTANT_BORDER),
1589	const_iv (GL_LINES),	1984	const_iv (GL_LINES),
		1985	const_iv (GL_LINE_STRIP),
1590	const_iv (GL_LINE_LOOP),	1986	const_iv (GL_LINE_LOOP),
1591	const_iv (GL_QUADS),	1987	const_iv (GL_QUADS),
1592	const_iv (GL_QUAD_STRIP),	1988	const_iv (GL_QUAD_STRIP),
1593	const_iv (GL_TRIANGLES),	1989	const_iv (GL_TRIANGLES),
1594	const_iv (GL_TRIANGLE_STRIP),	1990	const_iv (GL_TRIANGLE_STRIP),
…		…
1604		2000
1605	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2001	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607	}	2003	}
1608		2004
		2005	char *
		2006	gl_vendor ()
		2007	CODE:
		2008	RETVAL = (char *)glGetString (GL_VENDOR);
		2009	OUTPUT:
		2010	RETVAL
		2011
		2012	char *
		2013	gl_version ()
		2014	CODE:
		2015	RETVAL = (char *)glGetString (GL_VERSION);
		2016	OUTPUT:
		2017	RETVAL
		2018
		2019	char *
		2020	gl_extensions ()
		2021	CODE:
		2022	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2023	OUTPUT:
		2024	RETVAL
		2025
1609	int glGetError ()	2026	int glGetError ()
		2027
		2028	void glFinish ()
1610		2029
1611	void glClear (int mask)	2030	void glClear (int mask)
1612		2031
1613	void glClearColor (float r, float g, float b, float a = 1.0)	2032	void glClearColor (float r, float g, float b, float a = 1.0)
1614	PROTOTYPE: @	2033	PROTOTYPE: @
…		…
1621		2040
1622	void glHint (int target, int mode)	2041	void glHint (int target, int mode)
1623		2042
1624	void glBlendFunc (int sfactor, int dfactor)	2043	void glBlendFunc (int sfactor, int dfactor)
1625		2044
		2045	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2046	CODE:
		2047	gl_BlendFuncSeparate (sa, da, saa, daa);
		2048
1626	void glDepthMask (int flag)	2049	void glDepthMask (int flag)
1627		2050
1628	void glLogicOp (int opcode)	2051	void glLogicOp (int opcode)
1629		2052
1630	void glColorMask (int red, int green, int blue, int alpha)	2053	void glColorMask (int red, int green, int blue, int alpha)
…		…
1635		2058
1636	void glPopMatrix ()	2059	void glPopMatrix ()
1637		2060
1638	void glLoadIdentity ()	2061	void glLoadIdentity ()
1639		2062
		2063	void glDrawBuffer (int buffer)
		2064
		2065	void glReadBuffer (int buffer)
		2066
1640	# near and far are due to microsofts buggy c compiler	2067	# near_ and far_ are due to microsofts buggy "c" compiler
		2068	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		2069
		2070	# near_ and far_ are due to microsofts buggy "c" compiler
1641	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2071	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1642		2072
1643	void glViewport (int x, int y, int width, int height)	2073	void glViewport (int x, int y, int width, int height)
1644		2074
1645	void glScissor (int x, int y, int width, int height)	2075	void glScissor (int x, int y, int width, int height)
…		…
1660		2090
1661	void glEnd ()	2091	void glEnd ()
1662		2092
1663	void glColor (float r, float g, float b, float a = 1.0)	2093	void glColor (float r, float g, float b, float a = 1.0)
1664	PROTOTYPE: @	2094	PROTOTYPE: @
		2095	ALIAS:
		2096	glColor_premultiply = 1
1665	CODE:	2097	CODE:
1666	glColor4ub (MIN ((int)(r * 255.f), 255),	2098	if (ix)
1667	MIN ((int)(g * 255.f), 255),	2099	{
1668	MIN ((int)(b * 255.f), 255),	2100	r *= a;
1669	MIN ((int)(a * 255.f), 255));	2101	g *= a;
		2102	b *= a;
		2103	}
		2104	// microsoft visual "c" rounds instead of truncating...
		2105	glColor4f (r, g, b, a);
1670		2106
1671	void glInterleavedArrays (int format, int stride, char *data)	2107	void glInterleavedArrays (int format, int stride, char *data)
1672		2108
1673	void glDrawElements (int mode, int count, int type, char *indices)	2109	void glDrawElements (int mode, int count, int type, char *indices)
1674		2110
1675	# 1.2 void glDrawRangeElements (int mode, int start, int end	2111	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2112
		2113	void glRasterPos (float x, float y, float z = 0.)
		2114	CODE:
		2115	glRasterPos3f (0, 0, z);
		2116	glBitmap (0, 0, 0, 0, x, y, 0);
1676		2117
1677	void glVertex (float x, float y, float z = 0.)	2118	void glVertex (float x, float y, float z = 0.)
1678	CODE:	2119	CODE:
1679	glVertex3f (x, y, z);	2120	glVertex3f (x, y, z);
1680		2121
…		…
1692		2133
1693	void glBindTexture (int target, int name)	2134	void glBindTexture (int target, int name)
1694		2135
1695	void glConvolutionParameter (int target, int pname, float params)	2136	void glConvolutionParameter (int target, int pname, float params)
1696	CODE:	2137	CODE:
1697	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2138	if (gl.ConvolutionParameterf)
		2139	gl.ConvolutionParameterf (target, pname, params);
1698		2140
1699	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2141	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1700	CODE:	2142	CODE:
1701	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2143	if (gl.ConvolutionFilter2D)
1702	(target, internalformat, width, height, format, type, data));	2144	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1703		2145
1704	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2146	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1705	CODE:	2147	CODE:
1706	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2148	if (gl.SeparableFilter2D)
1707	(target, internalformat, width, height, format, type, row, column));	2149	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1708		2150
1709	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2151	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1710		2152
1711	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2153	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1712		2154
1713	void glRasterPos (int x, int y)	2155	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1714	CODE:
1715	glRasterPos2i (x, y);
1716		2156
1717	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2157	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1718		2158
1719	int glGenTexture ()	2159	int glGenTexture ()
1720	CODE:	2160	CODE:
…		…
1747		2187
1748	void glEndList ()	2188	void glEndList ()
1749		2189
1750	void glCallList (int list)	2190	void glCallList (int list)
1751		2191
1752

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC vs. Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC