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.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 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)
6	#endif	8	#endif
7		9
8	#include "EXTERN.h"	10	#include "EXTERN.h"
9	#include "perl.h"	11	#include "perl.h"
10	#include "XSUB.h"	12	#include "XSUB.h"
11		13
		14	#ifdef _WIN32
		15	# undef pipe
		16	#endif
		17
12	#include <math.h>	18	#include <math.h>
13	#include <string.h>	19	#include <string.h>
14	#include <stdio.h>	20	#include <stdio.h>
		21	#include <stdlib.h>
15		22
16	#include <SDL.h>	23	#include <SDL.h>
17	#include <SDL_endian.h>	24	#include <SDL_endian.h>
18	#include <SDL_image.h>	25	#include <SDL_image.h>
19	#include <SDL_mixer.h>	26	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	27	#include <SDL_opengl.h>
21		28
		29	#define PANGO_ENABLE_BACKEND
		30	#define G_DISABLE_CAST_CHECKS
		31
22	#include <glib/gmacros.h>	32	#include <glib/gmacros.h>
23		33
24	#include <pango/pango.h>	34	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		35
29	#ifndef _WIN32	36	#ifndef _WIN32
30	# include <sys/types.h>	37	# include <sys/types.h>
31	# include <sys/socket.h>	38	# include <sys/socket.h>
32	# include <netinet/in.h>	39	# include <netinet/in.h>
…		…
39	typedef signed char int8_t;	46	typedef signed char int8_t;
40	typedef signed short int16_t;	47	typedef signed short int16_t;
41	typedef signed int int32_t;	48	typedef signed int int32_t;
42	#endif	49	#endif
43		50
44	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		52
46	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
47		54
48	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
50		57
51	#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
52		65
53	static struct	66	static struct
54	{	67	{
55	#define GL_FUNC(ptr,name) ptr name;	68	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	69	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	79	else
67	glBlendFunc (sa, da);	80	glBlendFunc (sa, da);
68	}	81	}
69		82
		83	#include "texcache.c"
		84
		85	#include "pango-font.c"
		86	#include "pango-fontmap.c"
		87	#include "pango-render.c"
		88
70	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
72		91
73	typedef PangoFontDescription *CFClient__Font;	92	typedef PangoFontDescription *CFPlus__Font;
		93
		94	static int
		95	shape_attr_p (PangoLayoutRun *run)
		96	{
		97	GSList *attrs = run->item->analysis.extra_attrs;
		98
		99	while (attrs)
		100	{
		101	PangoAttribute *attr = attrs->data;
		102
		103	if (attr->klass->type == PANGO_ATTR_SHAPE)
		104	return 1;
		105
		106	attrs = attrs->next;
		107	}
		108
		109	return 0;
		110	}
74		111
75	typedef struct cf_layout {	112	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	113	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	114	float r, g, b, a; // default color for rgba mode
79	int base_height;	115	int base_height;
80	CFClient__Font font;	116	CFPlus__Font font;
81	} *CFClient__Layout;	117	} *CFPlus__Layout;
82		118
83	static CFClient__Font default_font;	119	static CFPlus__Font default_font;
84	static PangoContext *ft2_context, *cairo_context;	120	static PangoContext *opengl_context;
85	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	121	static PangoFontMap *opengl_fontmap;
86		122
87	static void	123	static void
88	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
89	{	125	{
90	FcPatternAddBool (pattern, FC_HINTING, 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef FC_HINT_STYLE	127	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#endif	129	#endif
94	#ifdef _WIN32
95	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96	#else
97	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98	#endif
99	}	131	}
100		132
101	static void	133	static void
102	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
103	{	135	{
104	/* use a random scale factor to account for unknown descenders, 0.8 works	136	/* use a random scale factor to account for unknown descenders, 0.8 works
105	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
106	*/	138	*/
107	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
111		143
112	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
113	}	145	}
114		146
115	static void	147	static void
116	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	148	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
118	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
119		154
120	if (!*w) *w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121	if (!*h) *h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122		157
123	*w = (*w + 3) & ~3;	158	if (!rect.width) rect.width = 1;
		159	if (!rect.height) rect.height = 1;
		160
		161	*w = rect.width;
		162	*h = rect.height;
124	}	163	}
125		164
126	typedef uint16_t mapface;	165	typedef uint16_t mapface;
127		166
128	typedef struct {	167	typedef struct {
…		…
131	float s, t;	170	float s, t;
132	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
133	} maptex;	172	} maptex;
134		173
135	typedef struct {	174	typedef struct {
136	int16_t darkness;	175	uint32_t player;
137	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
138	} mapcell;	179	} mapcell;
139		180
140	typedef struct {	181	typedef struct {
141	int32_t c0, c1;	182	int32_t c0, c1;
142	mapcell *col;	183	mapcell *col;
…		…
151	int texs;	192	int texs;
152	maptex *tex;	193	maptex *tex;
153		194
154	int32_t rows;	195	int32_t rows;
155	maprow *row;	196	maprow *row;
156	} *CFClient__Map;	197	} *CFPlus__Map;
157		198
158	static char *	199	static char *
159	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
160	{	201	{
161	char *p;	202	char *p;
…		…
179		220
180	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
181	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	222	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182		223
183	static maprow *	224	static maprow *
184	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
185	{	226	{
186	if (0 > y)	227	if (0 > y)
187	{	228	{
188	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
189	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
227		268
228	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
229	}	270	}
230		271
231	static mapcell *	272	static mapcell *
232	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
233	{	274	{
234	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
235	}	276	}
236		277
237	static void	278	static void
238	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
239	{	280	{
240	int r;	281	int r;
241		282
242	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
243	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
251	self->row = 0;	292	self->row = 0;
252	self->rows = 0;	293	self->rows = 0;
253	}	294	}
254		295
255	static void	296	static void
256	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	297	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
257	{	298	{
258	int x, y;	299	int x, y;
259	maprow *row;	300	maprow *row;
		301	mapcell *cell;
260		302
261	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
262	if (y >= 0)	304	if (y >= 0)
263	{	305	{
264	if (y >= self->rows)	306	if (y >= self->rows)
…		…
270	if (x >= row->c0)	312	if (x >= row->c0)
271	{	313	{
272	if (x >= row->c1)	314	if (x >= row->c1)
273	break;	315	break;
274		316
275	row->col[x - row->c0].darkness = -1;	317	cell = row->col + x - row->c0;
		318
		319	cell->darkness = 0;
		320	cell->stat_hp = 0;
		321	cell->flags = 0;
		322	cell->player = 0;
276	}	323	}
277	}	324	}
278	}	325	}
279		326
280	static void	327	static void
…		…
301	ev.data2 = 0;	348	ev.data2 = 0;
302		349
303	SDL_PushEvent ((SDL_Event *)&ev);	350	SDL_PushEvent ((SDL_Event *)&ev);
304	}	351	}
305		352
		353	static unsigned int
		354	minpot (unsigned int n)
		355	{
		356	if (!n)
		357	return 0;
		358
		359	--n;
		360
		361	n |= n >> 1;
		362	n |= n >> 2;
		363	n |= n >> 4;
		364	n |= n >> 8;
		365	n |= n >> 16;
		366
		367	return n + 1;
		368	}
		369
306	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
307		371
308	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
309		373
310	BOOT:	374	BOOT:
311	{	375	{
312	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
313	static const struct {	377	static const struct {
314	const char *name;	378	const char *name;
315	IV iv;	379	IV iv;
316	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
317	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
418		482
419	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	483	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
420	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
421	}	485	}
422		486
		487	int
		488	in_destruct ()
		489	CODE:
		490	RETVAL = PL_main_cv == Nullcv;
		491	OUTPUT:
		492	RETVAL
		493
		494	NV floor (NV x)
		495
		496	NV ceil (NV x)
		497
423	void	498	void
424	pango_init ()	499	pango_init ()
425	CODE:	500	CODE:
426	// delayed, so it can pick up new fonts added by AddFontResourceEx
427	{	501	{
428	{
429	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
430	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	503	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
431	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
432	}
433	{
434	cairo_font_options_t *fopt = cairo_font_options_create ();
435	cairo_fontmap = pango_cairo_font_map_get_default ();
436	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
437	#ifdef _WIN32
438	// cairo looks like shit eaten twice on windows
439	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
440	#else
441	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
442	#endif
443	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
444	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
445	pango_cairo_context_set_font_options (cairo_context, fopt);
446	cairo_font_options_destroy (fopt);
447	}
448	}	505	}
449		506
450	int	507	int
451	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452		509
453	void	510	void
454	SDL_Quit ()	511	SDL_Quit ()
455		512
456	void	513	void
…		…
463	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466		523
467	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469		526
470	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474		531
475	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	532	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		533	#if SDL_VERSION_ATLEAST(1,2,10)
		534	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		535	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		536	#endif
476		537
477	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
478	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479		540
480	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
567	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569	break;	630	break;
570	}	631	}
571		632
572	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573	}	634	}
574	}	635	}
575		636
576	int	637	int
577	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	638	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
591	#ifndef _WIN32	652	#ifndef _WIN32
592	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
593	#endif	654	#endif
594		655
595	void	656	void
		657	win32_proxy_info ()
		658	PPCODE:
		659	{
		660	#ifdef _WIN32
		661	INTERNET_PROXY_INFO proxyinfo;
		662	char buffer[2048];
		663	DWORD buflen;
		664
		665	EXTEND (SP, 3);
		666
		667	buflen = sizeof (buffer);
		668	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		669	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		670	{
		671	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		672
		673	buflen = sizeof (buffer);
		674	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		675	{
		676	PUSHs (newSVpv (buffer, 0));
		677
		678	buflen = sizeof (buffer);
		679	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		680	PUSHs (newSVpv (buffer, 0));
		681	}
		682	}
		683	#endif
		684	}
		685
		686	void
596	add_font (char *file)	687	add_font (char *file)
597	CODE:	688	CODE:
598	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	689	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599	#ifdef _WIN32
600	// cairo... sigh... requires win2000
601	AddFontResourceEx (file, FR_PRIVATE, 0);
602	#endif
603		690
604	void	691	void
605	load_image_inline (SV *image_)	692	load_image_inline (SV *image_)
606	ALIAS:	693	ALIAS:
607	load_image_file = 1	694	load_image_file = 1
…		…
649		736
650	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	737	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651		738
652	assert (surface2->pitch == surface2->w * 4);	739	assert (surface2->pitch == surface2->w * 4);
653		740
		741	SDL_LockSurface (surface2);
654	EXTEND (SP, 5);	742	EXTEND (SP, 6);
655	PUSHs (sv_2mortal (newSViv (surface2->w)));	743	PUSHs (sv_2mortal (newSViv (surface2->w)));
656	PUSHs (sv_2mortal (newSViv (surface2->h)));	744	PUSHs (sv_2mortal (newSViv (surface2->h)));
657	SDL_LockSurface (surface2);
658	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	745	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
659	SDL_UnlockSurface (surface2);
660	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	746	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
661	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	747	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	748	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		749	SDL_UnlockSurface (surface2);
663		750
664	SDL_FreeSurface (surface);	751	SDL_FreeSurface (surface);
665	SDL_FreeSurface (surface2);	752	SDL_FreeSurface (surface2);
666	}	753	}
667		754
…		…
703	CODE:	790	CODE:
704	fprintf (stderr, "FATAL: %s\n", message);	791	fprintf (stderr, "FATAL: %s\n", message);
705	#ifdef _WIN32	792	#ifdef _WIN32
706	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	793	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707	#endif	794	#endif
708	exit (1);	795	_exit (1);
709		796
		797	void
		798	_exit (int retval = 0)
		799	CODE:
		800	_exit (retval);
		801
710	MODULE = CFClient PACKAGE = CFClient::Font	802	MODULE = CFPlus PACKAGE = CFPlus::Font
711		803
712	CFClient::Font	804	CFPlus::Font
713	new_from_file (SV *class, char *path, int id = 0)	805	new_from_file (SV *class, char *path, int id = 0)
714	CODE:	806	CODE:
715	{	807	{
716	int count;	808	int count;
717	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	809	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
720	}	812	}
721	OUTPUT:	813	OUTPUT:
722	RETVAL	814	RETVAL
723		815
724	void	816	void
725	DESTROY (CFClient::Font self)	817	DESTROY (CFPlus::Font self)
726	CODE:	818	CODE:
727	pango_font_description_free (self);	819	pango_font_description_free (self);
728		820
729	void	821	void
730	make_default (CFClient::Font self)	822	make_default (CFPlus::Font self)
731	CODE:	823	CODE:
732	default_font = self;	824	default_font = self;
733		825
734	MODULE = CFClient PACKAGE = CFClient::Layout	826	MODULE = CFPlus PACKAGE = CFPlus::Layout
735		827
736	CFClient::Layout	828	void
737	new (SV *class, int rgba = 0)	829	reset_glyph_cache ()
		830	CODE:
		831	tc_clear ();
		832
		833	CFPlus::Layout
		834	new (SV *class)
738	CODE:	835	CODE:
739	New (0, RETVAL, 1, struct cf_layout);	836	New (0, RETVAL, 1, struct cf_layout);
740		837
741	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	838	RETVAL->pl = pango_layout_new (opengl_context);
742	RETVAL->rgba = rgba;
743	RETVAL->r = 1.;	839	RETVAL->r = 1.;
744	RETVAL->g = 1.;	840	RETVAL->g = 1.;
745	RETVAL->b = 1.;	841	RETVAL->b = 1.;
746	RETVAL->a = 1.;	842	RETVAL->a = 1.;
747	RETVAL->base_height = MIN_FONT_HEIGHT;	843	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
751	layout_update_font (RETVAL);	847	layout_update_font (RETVAL);
752	OUTPUT:	848	OUTPUT:
753	RETVAL	849	RETVAL
754		850
755	void	851	void
756	DESTROY (CFClient::Layout self)	852	DESTROY (CFPlus::Layout self)
757	CODE:	853	CODE:
758	g_object_unref (self->pl);	854	g_object_unref (self->pl);
759	Safefree (self);	855	Safefree (self);
760		856
761	int
762	is_rgba (CFClient::Layout self)
763	CODE:
764	RETVAL = self->rgba;
765	OUTPUT:
766	RETVAL
767
768	void	857	void
769	set_text (CFClient::Layout self, SV *text_)	858	set_text (CFPlus::Layout self, SV *text_)
770	CODE:	859	CODE:
771	{	860	{
772	STRLEN textlen;	861	STRLEN textlen;
773	char *text = SvPVutf8 (text_, textlen);	862	char *text = SvPVutf8 (text_, textlen);
774		863
775	pango_layout_set_text (self->pl, text, textlen);	864	pango_layout_set_text (self->pl, text, textlen);
776	}	865	}
777		866
778	void	867	void
779	set_markup (CFClient::Layout self, SV *text_)	868	set_markup (CFPlus::Layout self, SV *text_)
780	CODE:	869	CODE:
781	{	870	{
782	STRLEN textlen;	871	STRLEN textlen;
783	char *text = SvPVutf8 (text_, textlen);	872	char *text = SvPVutf8 (text_, textlen);
784		873
785	pango_layout_set_markup (self->pl, text, textlen);	874	pango_layout_set_markup (self->pl, text, textlen);
786	}	875	}
787		876
		877	void
		878	set_shapes (CFPlus::Layout self, ...)
		879	CODE:
		880	{
		881	PangoAttrList *attrs = 0;
		882	const char *text = pango_layout_get_text (self->pl);
		883	const char *pos = text;
		884	int arg = 4;
		885
		886	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		887	{
		888	PangoRectangle inkrect, rect;
		889	PangoAttribute *attr;
		890
		891	int x = SvIV (ST (arg - 3));
		892	int y = SvIV (ST (arg - 2));
		893	int w = SvIV (ST (arg - 1));
		894	int h = SvIV (ST (arg ));
		895
		896	inkrect.x = 0;
		897	inkrect.y = 0;
		898	inkrect.width = 0;
		899	inkrect.height = 0;
		900
		901	rect.x = x * PANGO_SCALE;
		902	rect.y = y * PANGO_SCALE;
		903	rect.width = w * PANGO_SCALE;
		904	rect.height = h * PANGO_SCALE;
		905
		906	if (!attrs)
		907	attrs = pango_layout_get_attributes (self->pl);
		908
		909	attr = pango_attr_shape_new (&inkrect, &rect);
		910	attr->start_index = pos - text;
		911	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		912	pango_attr_list_insert (attrs, attr);
		913
		914	arg += 4;
		915	pos += sizeof (OBJ_STR) - 1;
		916	}
		917
		918	if (attrs)
		919	pango_layout_set_attributes (self->pl, attrs);
		920	}
		921
		922	void
		923	get_shapes (CFPlus::Layout self)
		924	PPCODE:
		925	{
		926	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		927
		928	do
		929	{
		930	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		931
		932	if (run && shape_attr_p (run))
		933	{
		934	PangoRectangle extents;
		935	pango_layout_iter_get_run_extents (iter, 0, &extents);
		936
		937	EXTEND (SP, 2);
		938	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		939	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		940	}
		941	}
		942	while (pango_layout_iter_next_run (iter));
		943
		944	pango_layout_iter_free (iter);
		945	}
		946
		947	int
		948	has_wrapped (CFPlus::Layout self)
		949	CODE:
		950	{
		951	int lines = 1;
		952	const char *text = pango_layout_get_text (self->pl);
		953
		954	while (*text)
		955	lines += *text++ == '\n';
		956
		957	RETVAL = lines < pango_layout_get_line_count (self->pl);
		958	}
		959	OUTPUT:
		960	RETVAL
		961
788	SV *	962	SV *
789	get_text (CFClient::Layout self)	963	get_text (CFPlus::Layout self)
790	CODE:	964	CODE:
791	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	965	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792	sv_utf8_decode (RETVAL);	966	sv_utf8_decode (RETVAL);
793	OUTPUT:	967	OUTPUT:
794	RETVAL	968	RETVAL
795		969
796	void	970	void
797	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	971	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
798	CODE:	972	CODE:
799	self->r = r;	973	self->r = r;
800	self->g = g;	974	self->g = g;
801	self->b = b;	975	self->b = b;
802	self->a = a;	976	self->a = a;
803		977
804	void	978	void
805	set_font (CFClient::Layout self, CFClient::Font font = 0)	979	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806	CODE:	980	CODE:
807	if (self->font != font)	981	if (self->font != font)
808	{	982	{
809	self->font = font;	983	self->font = font;
810	layout_update_font (self);	984	layout_update_font (self);
811	}	985	}
812		986
813	void	987	void
814	set_height (CFClient::Layout self, int base_height)	988	set_height (CFPlus::Layout self, int base_height)
815	CODE:	989	CODE:
816	if (self->base_height != base_height)	990	if (self->base_height != base_height)
817	{	991	{
818	self->base_height = base_height;	992	self->base_height = base_height;
819	layout_update_font (self);	993	layout_update_font (self);
820	}	994	}
821		995
822	void	996	void
823	set_width (CFClient::Layout self, int max_width = -1)	997	set_width (CFPlus::Layout self, int max_width = -1)
824	CODE:	998	CODE:
825	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	999	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
826		1000
827	void	1001	void
828	set_indent (CFClient::Layout self, int indent)	1002	set_indent (CFPlus::Layout self, int indent)
829	CODE:	1003	CODE:
830	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1004	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831		1005
832	void	1006	void
833	set_spacing (CFClient::Layout self, int spacing)	1007	set_spacing (CFPlus::Layout self, int spacing)
834	CODE:	1008	CODE:
835	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1009	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836		1010
837	void	1011	void
838	set_ellipsise (CFClient::Layout self, int ellipsise)	1012	set_ellipsise (CFPlus::Layout self, int ellipsise)
839	CODE:	1013	CODE:
840	pango_layout_set_ellipsize (self->pl,	1014	pango_layout_set_ellipsize (self->pl,
841	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1015	ellipsise == 1 ? PANGO_ELLIPSIZE_START
842	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1016	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1017	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
844	: PANGO_ELLIPSIZE_NONE	1018	: PANGO_ELLIPSIZE_NONE
845	);	1019	);
846		1020
847	void	1021	void
848	set_single_paragraph_mode (CFClient::Layout self, int spm)	1022	set_single_paragraph_mode (CFPlus::Layout self, int spm)
849	CODE:	1023	CODE:
850	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1024	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851		1025
852	void	1026	void
853	size (CFClient::Layout self)	1027	size (CFPlus::Layout self)
854	PPCODE:	1028	PPCODE:
855	{	1029	{
856	int w, h;	1030	int w, h;
857		1031
858	layout_get_pixel_size (self, &w, &h);	1032	layout_get_pixel_size (self, &w, &h);
…		…
861	PUSHs (sv_2mortal (newSViv (w)));	1035	PUSHs (sv_2mortal (newSViv (w)));
862	PUSHs (sv_2mortal (newSViv (h)));	1036	PUSHs (sv_2mortal (newSViv (h)));
863	}	1037	}
864		1038
865	int	1039	int
		1040	descent (CFPlus::Layout self)
		1041	CODE:
		1042	{
		1043	PangoRectangle rect;
		1044	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1045	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1046	RETVAL = PANGO_DESCENT (rect);
		1047	}
		1048	OUTPUT:
		1049	RETVAL
		1050
		1051	int
866	xy_to_index (CFClient::Layout self, int x, int y)	1052	xy_to_index (CFPlus::Layout self, int x, int y)
867	CODE:	1053	CODE:
868	{	1054	{
869	int index, trailing;	1055	int index, trailing;
870	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1056	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
871	RETVAL = index;	1057	RETVAL = index;
872	}	1058	}
873	OUTPUT:	1059	OUTPUT:
874	RETVAL	1060	RETVAL
875		1061
876	void	1062	void
877	cursor_pos (CFClient::Layout self, int index)	1063	cursor_pos (CFPlus::Layout self, int index)
878	PPCODE:	1064	PPCODE:
879	{	1065	{
880	PangoRectangle strong_pos;	1066	PangoRectangle strong_pos;
881	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1067	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882		1068
…		…
885	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887	}	1073	}
888		1074
889	void	1075	void
890	render (CFClient::Layout self)	1076	render (CFPlus::Layout self, float x, float y, int flags = 0)
891	PPCODE:	1077	PPCODE:
892	{	1078	pango_opengl_render_layout_subpixel (
893	SV *retval;	1079	self->pl,
894	int w, h;	1080	x * PANGO_SCALE, y * PANGO_SCALE,
		1081	self->r, self->g, self->b, self->a,
		1082	flags
		1083	);
895		1084
896	layout_get_pixel_size (self, &w, &h);	1085	MODULE = CFPlus PACKAGE = CFPlus::Texture
897		1086
898	if (self->rgba)	1087	void
		1088	pad2pot (SV *data_, SV *w_, SV *h_)
		1089	CODE:
		1090	{
		1091	int ow = SvIV (w_);
		1092	int oh = SvIV (h_);
		1093
		1094	if (ow && oh)
899	{	1095	{
900	cairo_surface_t *surface;	1096	int nw = minpot (ow);
901	cairo_t *cairo;	1097	int nh = minpot (oh);
902		1098
903	retval = newSV (w * h * 4);	1099	if (nw != ow || nh != oh)
904	SvPOK_only (retval);
905	SvCUR_set (retval, w * h * 4);
906
907	memset (SvPVX (retval), 0, w * h * 4);
908
909	surface = cairo_image_surface_create_for_data (
910	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
911	cairo = cairo_create (surface);
912	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
913
914	pango_cairo_show_layout (cairo, self->pl);
915
916	cairo_destroy (cairo);
917	cairo_surface_destroy (surface);
918
919	// what a mess, and its premultiplied, too :(
920	{	1100	{
921	uint32_t *p = (uint32_t *)SvPVX (retval);	1101	if (SvOK (data_))
922	uint32_t *e = p + w * h;
923
924	while (p < e)
925	{	1102	{
926	uint32_t rgba = *p;	1103	STRLEN datalen;
927	rgba = (rgba >> 24) | (rgba << 8);	1104	char *data = SvPVbyte (data_, datalen);
928	#if 0	1105	int bpp = datalen / (ow * oh);
929	#ifdef _WIN32	1106	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
930	{//D
931	uint8_t r = rgba >> 24;
932	uint8_t g = rgba >> 16;
933	uint8_t b = rgba >> 8;
934	uint8_t a = rgba >> 0;
935		1107
936	rgba = (rgba & 0xffffff00) | a;	1108	SvPOK_only (result_);
		1109	SvCUR_set (result_, nw * nh * bpp);
		1110
		1111	memset (SvPVX (result_), 0, nw * nh * bpp);
		1112	while (oh--)
		1113	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1114
		1115	sv_setsv (data_, result_);
937	}	1116	}
938	#endif	1117
939	#endif	1118	sv_setiv (w_, nw);
940	rgba = SDL_SwapBE32 (rgba);	1119	sv_setiv (h_, nh);
941	*p++ = rgba;
942	}	1120	}
943	}
944
945	EXTEND (SP, 5);
946	PUSHs (sv_2mortal (newSViv (w)));
947	PUSHs (sv_2mortal (newSViv (h)));
948	PUSHs (sv_2mortal (retval));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951	}	1121	}
952	else
953	{
954	FT_Bitmap bitmap;
955
956	retval = newSV (w * h);
957	SvPOK_only (retval);
958	SvCUR_set (retval, w * h);
959
960	bitmap.rows = h;
961	bitmap.width = w;
962	bitmap.pitch = w;
963	bitmap.buffer = (unsigned char*)SvPVX (retval);
964	bitmap.num_grays = 256;
965	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
966
967	memset (bitmap.buffer, 0, w * h);
968
969	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
970
971	EXTEND (SP, 5);
972	PUSHs (sv_2mortal (newSViv (w)));
973	PUSHs (sv_2mortal (newSViv (h)));
974	PUSHs (sv_2mortal (retval));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977	}
978	}	1122	}
979		1123
980	MODULE = CFClient PACKAGE = CFClient::Texture
981
982	void	1124	void
983	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1125	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984	PROTOTYPE: $$$;$$	1126	PROTOTYPE: $$$;$$
985	ALIAS:	1127	ALIAS:
986	draw_quad_alpha = 1	1128	draw_quad_alpha = 1
987	draw_quad_alpha_premultiplied = 2	1129	draw_quad_alpha_premultiplied = 2
988	CODE:	1130	CODE:
…		…
1026	glDisable (GL_ALPHA_TEST);	1168	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1169	glDisable (GL_BLEND);
1028	}	1170	}
1029	}	1171	}
1030		1172
1031	MODULE = CFClient PACKAGE = CFClient::Map	1173	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1174
1033	CFClient::Map	1175	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1176	new (SV *class, int map_width, int map_height)
1035	CODE:	1177	CODE:
1036	New (0, RETVAL, 1, struct map);	1178	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1179	RETVAL->x = 0;
1038	RETVAL->y = 0;	1180	RETVAL->y = 0;
…		…
1048	RETVAL->row = 0;	1190	RETVAL->row = 0;
1049	OUTPUT:	1191	OUTPUT:
1050	RETVAL	1192	RETVAL
1051		1193
1052	void	1194	void
1053	DESTROY (CFClient::Map self)	1195	DESTROY (CFPlus::Map self)
1054	CODE:	1196	CODE:
1055	{	1197	{
1056	map_clear (self);	1198	map_clear (self);
1057	Safefree (self->face);	1199	Safefree (self->face);
		1200	Safefree (self->tex);
1058	Safefree (self);	1201	Safefree (self);
1059	}	1202	}
1060		1203
1061	void	1204	void
1062	clear (CFClient::Map self)	1205	clear (CFPlus::Map self)
1063	CODE:	1206	CODE:
1064	map_clear (self);	1207	map_clear (self);
1065		1208
1066	void	1209	void
1067	set_face (CFClient::Map self, int face, int texid)	1210	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1211	CODE:
1069	{	1212	{
1070	while (self->faces <= face)	1213	while (self->faces <= face)
1071	{	1214	{
1072	Append (mapface, self->face, self->faces, self->faces);	1215	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1218
1076	self->face [face] = texid;	1219	self->face [face] = texid;
1077	}	1220	}
1078		1221
1079	void	1222	void
1080	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)	1223	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)
1081	CODE:	1224	CODE:
1082	{	1225	{
1083	while (self->texs <= texid)	1226	while (self->texs <= texid)
1084	{	1227	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1228	Append (maptex, self->tex, self->texs, self->texs);
…		…
1109	// from transparent color bleeding and ugly wrapping effects.	1252	// from transparent color bleeding and ugly wrapping effects.
1110	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1253	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111	}	1254	}
1112		1255
1113	int	1256	int
1114	ox (CFClient::Map self)	1257	ox (CFPlus::Map self)
1115	ALIAS:	1258	ALIAS:
1116	oy = 1	1259	oy = 1
1117	x = 2	1260	x = 2
1118	y = 3	1261	y = 3
1119	w = 4	1262	w = 4
…		…
1130	}	1273	}
1131	OUTPUT:	1274	OUTPUT:
1132	RETVAL	1275	RETVAL
1133		1276
1134	void	1277	void
1135	scroll (CFClient::Map self, int dx, int dy)	1278	scroll (CFPlus::Map self, int dx, int dy)
1136	CODE:	1279	CODE:
1137	{	1280	{
1138	if (dx > 0)	1281	if (dx > 0)
1139	map_blank (self, self->x, self->y, dx - 1, self->h);	1282	map_blank (self, self->x, self->y, dx, self->h);
1140	else if (dx < 0)	1283	else if (dx < 0)
1141	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1284	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1142		1285
1143	if (dy > 0)	1286	if (dy > 0)
1144	map_blank (self, self->x, self->y, self->w, dy - 1);	1287	map_blank (self, self->x, self->y, self->w, dy);
1145	else if (dy < 0)	1288	else if (dy < 0)
1146	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1289	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1147		1290
1148	self->ox += dx; self->x += dx;	1291	self->ox += dx; self->x += dx;
1149	self->oy += dy; self->y += dy;	1292	self->oy += dy; self->y += dy;
1150		1293
1151	while (self->y < 0)	1294	while (self->y < 0)
…		…
1156	self->y += MAP_EXTEND_Y;	1299	self->y += MAP_EXTEND_Y;
1157	}	1300	}
1158	}	1301	}
1159		1302
1160	void	1303	void
1161	map1a_update (CFClient::Map self, SV *data_)	1304	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162	CODE:	1305	CODE:
1163	{	1306	{
1164	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1307	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165	uint8_t *data_end = (uint8_t *)SvEND (data_);	1308	uint8_t *data_end = (uint8_t *)SvEND (data_);
1166	mapcell *cell;	1309	mapcell *cell;
1167	int x, y, flags;	1310	int x, y, flags;
1168		1311
1169	while (data < data_end)	1312	while (data < data_end - 1)
1170	{	1313	{
1171	flags = (data [0] << 8) + data [1]; data += 2;	1314	flags = (data [0] << 8) + data [1]; data += 2;
1172		1315
1173	x = ((flags >> 10) & 63) + self->x;	1316	x = self->x + ((flags >> 10) & 63);
1174	y = ((flags >> 4) & 63) + self->y;	1317	y = self->y + ((flags >> 4) & 63);
1175		1318
1176	cell = map_get_cell (self, x, y);	1319	cell = map_get_cell (self, x, y);
1177		1320
1178	if (flags & 15)	1321	if (flags & 15)
1179	{	1322	{
1180	if (cell->darkness < 0)	1323	if (!cell->darkness)
1181	{	1324	{
		1325	memset (cell, 0, sizeof (*cell));
1182	cell->darkness = 0;	1326	cell->darkness = 256;
1183	cell->face [0] = 0;
1184	cell->face [1] = 0;
1185	cell->face [2] = 0;
1186	}	1327	}
1187		1328
1188	cell->darkness = flags & 8 ? *data++ : 255;
1189
1190	//TODO: don't trust server data to be in-range(!)	1329	//TODO: don't trust server data to be in-range(!)
		1330
		1331	if (flags & 8)
		1332	{
		1333	if (extmap)
		1334	{
		1335	uint8_t ext, cmd;
		1336
		1337	do
		1338	{
		1339	ext = *data++;
		1340	cmd = ext & 0x3f;
		1341
		1342	if (cmd < 4)
		1343	cell->darkness = 255 - ext * 64 + 1;
		1344	else if (cmd == 5) // health
		1345	{
		1346	cell->stat_width = 1;
		1347	cell->stat_hp = *data++;
		1348	}
		1349	else if (cmd == 6) // monster width
		1350	cell->stat_width = *data++ + 1;
		1351	else if (cmd == 0x47) // monster width
		1352	{
		1353	if (*data == 4)
		1354	; // decode player tag
		1355
		1356	data += *data + 1;
		1357	}
		1358	else if (cmd == 8) // cell flags
		1359	cell->flags = *data++;
		1360	else if (ext & 0x40) // unknown, multibyte => skip
		1361	data += *data + 1;
		1362	else
		1363	data++;
		1364	}
		1365	while (ext & 0x80);
		1366	}
		1367	else
		1368	cell->darkness = *data++ + 1;
		1369	}
1191		1370
1192	if (flags & 4)	1371	if (flags & 4)
1193	{	1372	{
1194	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1373	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1195	}	1374	}
…		…
1203	{	1382	{
1204	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1383	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1205	}	1384	}
1206	}	1385	}
1207	else	1386	else
1208	cell->darkness = -1;	1387	cell->darkness = 0;
1209	}	1388	}
1210	}	1389	}
1211		1390
1212	SV *	1391	SV *
1213	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1392	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214	CODE:	1393	CODE:
1215	{	1394	{
1216	int x1, x;	1395	int x1, x;
1217	int y1, y;	1396	int y1, y;
1218	int z;	1397	int z;
…		…
1268	}	1447	}
1269	OUTPUT:	1448	OUTPUT:
1270	RETVAL	1449	RETVAL
1271		1450
1272	void	1451	void
1273	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1452	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1274	PPCODE:	1453	CODE:
1275	{	1454	{
1276	int vx, vy;	1455	int vx, vy;
1277	int x, y, z;	1456	int x, y, z;
1278	int last_name;	1457	int last_name;
1279	mapface face;	1458	mapface face;
1280	int sw4 = (sw + 3) & ~3;
1281	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283		1459
1284	memset (darkness, 255, sw4 * sh);
1285	SvPOK_only (darkness_sv);
1286	SvCUR_set (darkness_sv, sw4 * sh);
1287
1288	vx = self->x + (self->w - sw) / 2 - shift_x;	1460	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1289	vy = self->y + (self->h - sh) / 2 - shift_y;	1461	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1290		1462
1291	/*	1463	/*
1292	int vx = self->vx = self->w >= sw	1464	int vx = self->vx = self->w >= sw
1293	? self->x + (self->w - sw) / 2	1465	? self->x + (self->w - sw) / 2
1294	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1466	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1298	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1470	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299	*/	1471	*/
1300		1472
1301	glColor4ub (255, 255, 255, 255);	1473	glColor4ub (255, 255, 255, 255);
1302		1474
		1475	glEnable (GL_BLEND);
1303	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304	glEnable (GL_BLEND);
1305	glEnable (GL_TEXTURE_2D);	1477	glEnable (GL_TEXTURE_2D);
1306	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1478	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307		1479
1308	glBegin (GL_QUADS);	1480	glBegin (GL_QUADS);
1309		1481
…		…
1318	for (x = 0; x < sw; x++)	1490	for (x = 0; x < sw; x++)
1319	if (row->c0 <= x + vx && x + vx < row->c1)	1491	if (row->c0 <= x + vx && x + vx < row->c1)
1320	{	1492	{
1321	mapcell *cell = row->col + (x + vx - row->c0);	1493	mapcell *cell = row->col + (x + vx - row->c0);
1322		1494
1323	darkness[y * sw4 + x] = cell->darkness < 0
1324	? 255 - FOW_DARKNESS
1325	: 255 - cell->darkness;
1326
1327	face = cell->face [z];	1495	face = cell->face [z];
1328		1496
1329	if (face)	1497	if (face && face < self->texs)
1330	{	1498	{
1331	maptex tex = self->tex [face];	1499	maptex tex = self->tex [face];
1332
1333	int px = (x + 1) * 32 - tex.w;	1500	int px = (x + 1) * 32 - tex.w;
1334	int py = (y + 1) * 32 - tex.h;	1501	int py = (y + 1) * 32 - tex.h;
1335		1502
1336	if (last_name != tex.name)	1503	if (last_name != tex.name)
1337	{	1504	{
1338	glEnd ();	1505	glEnd ();
1339	last_name = tex.name;
1340	glBindTexture (GL_TEXTURE_2D, last_name);	1506	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1341	glBegin (GL_QUADS);	1507	glBegin (GL_QUADS);
1342	}	1508	}
1343		1509
1344	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1510	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1345	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1511	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1346	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1512	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1347	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1513	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1348	}	1514	}
		1515
		1516	if (cell->flags && z == 2)
		1517	{
		1518	if (cell->flags & 1)
		1519	{
		1520	maptex tex = self->tex [1];
		1521	int px = (x + 1) * 32 - tex.w + 2;
		1522	int py = (y + 1) * 32 - tex.h - 6;
		1523
		1524	glEnd ();
		1525	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1526	glBegin (GL_QUADS);
		1527
		1528	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1529	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1530	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1531	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1532	}
		1533	}
1349	}	1534	}
1350	}	1535	}
1351		1536
1352	glEnd ();	1537	glEnd ();
1353		1538
1354	glDisable (GL_TEXTURE_2D);	1539	glDisable (GL_TEXTURE_2D);
1355	glDisable (GL_BLEND);	1540	glDisable (GL_BLEND);
		1541
		1542	// top layer: overlays such as the health bar
		1543	for (y = 0; y < sh; y++)
		1544	if (0 <= y + vy && y + vy < self->rows)
		1545	{
		1546	maprow *row = self->row + (y + vy);
		1547
		1548	for (x = 0; x < sw; x++)
		1549	if (row->c0 <= x + vx && x + vx < row->c1)
		1550	{
		1551	mapcell *cell = row->col + (x + vx - row->c0);
		1552
		1553	int px = x * 32;
		1554	int py = y * 32;
		1555
		1556	if (cell->stat_hp)
		1557	{
		1558	int width = cell->stat_width * 32;
		1559	int thick = sh / 28 + 1 + cell->stat_width;
		1560
		1561	glColor3ub (0, 0, 0);
		1562	glRectf (px + 1, py - thick - 2,
		1563	px + width - 1, py);
		1564
		1565	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1566	glRectf (px + 2,
		1567	py - thick - 1,
		1568	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1569	}
		1570	}
		1571	}
		1572	}
		1573
		1574	void
		1575	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1576	CODE:
		1577	{
		1578	static float color[16][3] = {
		1579	{ 0.00F, 0.00F, 0.00F },
		1580	{ 1.00F, 1.00F, 1.00F },
		1581	{ 0.00F, 0.00F, 0.55F },
		1582	{ 1.00F, 0.00F, 0.00F },
		1583
		1584	{ 1.00F, 0.54F, 0.00F },
		1585	{ 0.11F, 0.56F, 1.00F },
		1586	{ 0.93F, 0.46F, 0.00F },
		1587	{ 0.18F, 0.54F, 0.34F },
		1588
		1589	{ 0.56F, 0.73F, 0.56F },
		1590	{ 0.80F, 0.80F, 0.80F },
		1591	{ 0.55F, 0.41F, 0.13F },
		1592	{ 0.99F, 0.77F, 0.26F },
		1593
		1594	{ 0.74F, 0.65F, 0.41F },
		1595
		1596	{ 0.00F, 1.00F, 1.00F },
		1597	{ 1.00F, 0.00F, 1.00F },
		1598	{ 1.00F, 1.00F, 0.00F },
		1599	};
		1600
		1601	int x, y;
		1602
		1603	glEnable (GL_TEXTURE_2D);
		1604	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1605	glEnable (GL_BLEND);
		1606	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1607	glBegin (GL_QUADS);
		1608
		1609	for (y = 0; y < h; y++)
		1610	for (x = 0; x < w; x++)
		1611	{
		1612	unsigned char m = data [x + y * w];
		1613
		1614	if (m)
		1615	{
		1616	float *c = color [m & 15];
		1617
		1618	float tx1 = m & 0x40 ? 0.5 : 0.;
		1619	float tx2 = tx1 + 0.5;
		1620
		1621	glColor4f (c[0], c[1], c[2], 0.75);
		1622	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1623	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1624	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1625	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1626	}
		1627	}
		1628
		1629	glEnd ();
		1630	glDisable (GL_BLEND);
		1631	glDisable (GL_TEXTURE_2D);
		1632	}
		1633
		1634	void
		1635	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1636	PPCODE:
		1637	{
		1638	int vx, vy;
		1639	int x, y;
		1640	int sw4 = (sw + 3) & ~3;
		1641	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1642	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1643
		1644	memset (darkness, 255, sw4 * sh);
		1645	SvPOK_only (darkness_sv);
		1646	SvCUR_set (darkness_sv, sw4 * sh);
		1647
		1648	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1649	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1650
		1651	for (y = 0; y < sh; y++)
		1652	if (0 <= y + vy && y + vy < self->rows)
		1653	{
		1654	maprow *row = self->row + (y + vy);
		1655
		1656	for (x = 0; x < sw; x++)
		1657	if (row->c0 <= x + vx && x + vx < row->c1)
		1658	{
		1659	mapcell *cell = row->col + (x + vx - row->c0);
		1660
		1661	darkness[y * sw4 + x] = cell->darkness
		1662	? 255 - (cell->darkness - 1)
		1663	: 255 - FOW_DARKNESS;
		1664	}
		1665	}
1356		1666
1357	EXTEND (SP, 3);	1667	EXTEND (SP, 3);
1358	PUSHs (sv_2mortal (newSViv (sw4)));	1668	PUSHs (sv_2mortal (newSViv (sw4)));
1359	PUSHs (sv_2mortal (newSViv (sh)));	1669	PUSHs (sv_2mortal (newSViv (sh)));
1360	PUSHs (darkness_sv);	1670	PUSHs (darkness_sv);
1361	}	1671	}
1362		1672
1363	SV *	1673	SV *
1364	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1674	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1365	CODE:	1675	CODE:
1366	{	1676	{
1367	int x, y, x1, y1;	1677	int x, y, x1, y1;
1368	SV *data_sv = newSV (w * h * 7 + 5);	1678	SV *data_sv = newSV (w * h * 7 + 5);
1369	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1679	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1431	}	1741	}
1432	OUTPUT:	1742	OUTPUT:
1433	RETVAL	1743	RETVAL
1434		1744
1435	void	1745	void
1436	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1746	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437	PPCODE:	1747	PPCODE:
1438	{	1748	{
1439	int x, y, z;	1749	int x, y, z;
1440	int w, h;	1750	int w, h;
1441	int x1, y1;	1751	int x1, y1;
…		…
1473		1783
1474	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1784	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1475	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1785	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1476	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1786	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1477		1787
1478	if (cell->darkness <= 0)	1788	if (cell->darkness == 0)
1479	{	1789	{
1480	cell->darkness = -1;	1790	cell->darkness = 0;
1481		1791
1482	for (z = 0; z <= 2; z++)	1792	for (z = 0; z <= 2; z++)
1483	{	1793	{
1484	cell->face[z] = face[z];	1794	cell->face[z] = face[z];
1485		1795
…		…
1490	}	1800	}
1491	}	1801	}
1492	}	1802	}
1493	}	1803	}
1494		1804
1495	MODULE = CFClient PACKAGE = CFClient::MixChunk	1805	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496		1806
1497	CFClient::MixChunk	1807	CFPlus::MixChunk
1498	new_from_file (SV *class, char *path)	1808	new_from_file (SV *class, char *path)
1499	CODE:	1809	CODE:
1500	RETVAL = Mix_LoadWAV (path);	1810	RETVAL = Mix_LoadWAV (path);
1501	OUTPUT:	1811	OUTPUT:
1502	RETVAL	1812	RETVAL
1503		1813
1504	void	1814	void
1505	DESTROY (CFClient::MixChunk self)	1815	DESTROY (CFPlus::MixChunk self)
1506	CODE:	1816	CODE:
1507	Mix_FreeChunk (self);	1817	Mix_FreeChunk (self);
1508		1818
1509	int	1819	int
1510	volume (CFClient::MixChunk self, int volume = -1)	1820	volume (CFPlus::MixChunk self, int volume = -1)
1511	CODE:	1821	CODE:
1512	RETVAL = Mix_VolumeChunk (self, volume);	1822	RETVAL = Mix_VolumeChunk (self, volume);
1513	OUTPUT:	1823	OUTPUT:
1514	RETVAL	1824	RETVAL
1515		1825
1516	int	1826	int
1517	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1827	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1518	CODE:	1828	CODE:
1519	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1829	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520	OUTPUT:	1830	OUTPUT:
1521	RETVAL	1831	RETVAL
1522		1832
1523	MODULE = CFClient PACKAGE = CFClient::MixMusic	1833	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524		1834
1525	int	1835	int
1526	volume (int volume = -1)	1836	volume (int volume = -1)
1527	CODE:	1837	CODE:
1528	RETVAL = Mix_VolumeMusic (volume);	1838	RETVAL = Mix_VolumeMusic (volume);
1529	OUTPUT:	1839	OUTPUT:
1530	RETVAL	1840	RETVAL
1531		1841
1532	CFClient::MixMusic	1842	CFPlus::MixMusic
1533	new_from_file (SV *class, char *path)	1843	new_from_file (SV *class, char *path)
1534	CODE:	1844	CODE:
1535	RETVAL = Mix_LoadMUS (path);	1845	RETVAL = Mix_LoadMUS (path);
1536	OUTPUT:	1846	OUTPUT:
1537	RETVAL	1847	RETVAL
1538		1848
1539	void	1849	void
1540	DESTROY (CFClient::MixMusic self)	1850	DESTROY (CFPlus::MixMusic self)
1541	CODE:	1851	CODE:
1542	Mix_FreeMusic (self);	1852	Mix_FreeMusic (self);
1543		1853
1544	int	1854	int
1545	play (CFClient::MixMusic self, int loops = -1)	1855	play (CFPlus::MixMusic self, int loops = -1)
1546	CODE:	1856	CODE:
1547	RETVAL = Mix_PlayMusic (self, loops);	1857	RETVAL = Mix_PlayMusic (self, loops);
1548	OUTPUT:	1858	OUTPUT:
1549	RETVAL	1859	RETVAL
1550		1860
1551	MODULE = CFClient PACKAGE = CFClient::OpenGL	1861	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552		1862
1553	BOOT:	1863	BOOT:
1554	{	1864	{
1555	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1865	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556	static const struct {	1866	static const struct {
1557	const char *name;	1867	const char *name;
1558	IV iv;	1868	IV iv;
1559	} *civ, const_iv[] = {	1869	} *civ, const_iv[] = {
1560	# define const_iv(name) { # name, (IV)name }	1870	# define const_iv(name) { # name, (IV)name }
…		…
1567	const_iv (GL_SCISSOR_TEST),	1877	const_iv (GL_SCISSOR_TEST),
1568	const_iv (GL_DEPTH_TEST),	1878	const_iv (GL_DEPTH_TEST),
1569	const_iv (GL_ALPHA_TEST),	1879	const_iv (GL_ALPHA_TEST),
1570	const_iv (GL_NORMALIZE),	1880	const_iv (GL_NORMALIZE),
1571	const_iv (GL_RESCALE_NORMAL),	1881	const_iv (GL_RESCALE_NORMAL),
		1882	const_iv (GL_FRONT),
		1883	const_iv (GL_BACK),
1572	const_iv (GL_AND),	1884	const_iv (GL_AND),
1573	const_iv (GL_ONE),	1885	const_iv (GL_ONE),
1574	const_iv (GL_ZERO),	1886	const_iv (GL_ZERO),
1575	const_iv (GL_SRC_ALPHA),	1887	const_iv (GL_SRC_ALPHA),
1576	const_iv (GL_DST_ALPHA),	1888	const_iv (GL_DST_ALPHA),
1577	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1889	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578	const_iv (GL_ONE_MINUS_DST_ALPHA),	1890	const_iv (GL_ONE_MINUS_DST_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1891	const_iv (GL_SRC_ALPHA_SATURATE),
1580	const_iv (GL_RGB),	1892	const_iv (GL_RGB),
1581	const_iv (GL_RGBA),	1893	const_iv (GL_RGBA),
		1894	const_iv (GL_RGBA4),
		1895	const_iv (GL_RGBA8),
		1896	const_iv (GL_RGB5_A1),
1582	const_iv (GL_UNSIGNED_BYTE),	1897	const_iv (GL_UNSIGNED_BYTE),
1583	const_iv (GL_UNSIGNED_SHORT),	1898	const_iv (GL_UNSIGNED_SHORT),
1584	const_iv (GL_UNSIGNED_INT),	1899	const_iv (GL_UNSIGNED_INT),
1585	const_iv (GL_ALPHA),	1900	const_iv (GL_ALPHA),
1586	const_iv (GL_INTENSITY),	1901	const_iv (GL_INTENSITY),
…		…
1618	const_iv (GL_SEPARABLE_2D),	1933	const_iv (GL_SEPARABLE_2D),
1619	const_iv (GL_CONVOLUTION_2D),	1934	const_iv (GL_CONVOLUTION_2D),
1620	const_iv (GL_CONVOLUTION_BORDER_MODE),	1935	const_iv (GL_CONVOLUTION_BORDER_MODE),
1621	const_iv (GL_CONSTANT_BORDER),	1936	const_iv (GL_CONSTANT_BORDER),
1622	const_iv (GL_LINES),	1937	const_iv (GL_LINES),
		1938	const_iv (GL_LINE_STRIP),
1623	const_iv (GL_LINE_LOOP),	1939	const_iv (GL_LINE_LOOP),
1624	const_iv (GL_QUADS),	1940	const_iv (GL_QUADS),
1625	const_iv (GL_QUAD_STRIP),	1941	const_iv (GL_QUAD_STRIP),
1626	const_iv (GL_TRIANGLES),	1942	const_iv (GL_TRIANGLES),
1627	const_iv (GL_TRIANGLE_STRIP),	1943	const_iv (GL_TRIANGLE_STRIP),
…		…
1660	OUTPUT:	1976	OUTPUT:
1661	RETVAL	1977	RETVAL
1662		1978
1663	int glGetError ()	1979	int glGetError ()
1664		1980
		1981	void glFinish ()
		1982
1665	void glClear (int mask)	1983	void glClear (int mask)
1666		1984
1667	void glClearColor (float r, float g, float b, float a = 1.0)	1985	void glClearColor (float r, float g, float b, float a = 1.0)
1668	PROTOTYPE: @	1986	PROTOTYPE: @
1669		1987
…		…
1692	void glPushMatrix ()	2010	void glPushMatrix ()
1693		2011
1694	void glPopMatrix ()	2012	void glPopMatrix ()
1695		2013
1696	void glLoadIdentity ()	2014	void glLoadIdentity ()
		2015
		2016	void glDrawBuffer (int buffer)
		2017
		2018	void glReadBuffer (int buffer)
1697		2019
1698	# near_ and far_ are due to microsofts buggy "c" compiler	2020	# near_ and far_ are due to microsofts buggy "c" compiler
1699	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2021	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700		2022
1701	# near_ and far_ are due to microsofts buggy "c" compiler	2023	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1731	r *= a;	2053	r *= a;
1732	g *= a;	2054	g *= a;
1733	b *= a;	2055	b *= a;
1734	}	2056	}
1735	// microsoft visual "c" rounds instead of truncating...	2057	// microsoft visual "c" rounds instead of truncating...
1736	glColor4ub (MIN ((int)(r * 256.f), 255),	2058	glColor4f (r, g, b, a);
1737	MIN ((int)(g * 256.f), 255),
1738	MIN ((int)(b * 256.f), 255),
1739	MIN ((int)(a * 256.f), 255));
1740		2059
1741	void glInterleavedArrays (int format, int stride, char *data)	2060	void glInterleavedArrays (int format, int stride, char *data)
1742		2061
1743	void glDrawElements (int mode, int count, int type, char *indices)	2062	void glDrawElements (int mode, int count, int type, char *indices)
1744		2063
…		…
1821		2140
1822	void glEndList ()	2141	void glEndList ()
1823		2142
1824	void glCallList (int list)	2143	void glCallList (int list)
1825		2144
1826

Diff Legend

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