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.106 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.166 by root, Fri Dec 8 15:07:08 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
		53
		54	#if 0
		55	# define PARACHUTE SDL_INIT_NOPARACHUTE
		56	#else
		57	# define PARACHUTE 0
		58	#endif
52		59
53	static struct	60	static struct
54	{	61	{
55	#define GL_FUNC(ptr,name) ptr name;	62	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	63	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	73	else
67	glBlendFunc (sa, da);	74	glBlendFunc (sa, da);
68	}	75	}
69		76
		77	#include "texcache.c"
		78
		79	#include "pango-font.c"
		80	#include "pango-fontmap.c"
		81	#include "pango-render.c"
		82
70	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
72		85
73	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	}
74		105
75	typedef struct cf_layout {	106	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	107	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	108	float r, g, b, a; // default color for rgba mode
79	int base_height;	109	int base_height;
80	CFClient__Font font;	110	CFPlus__Font font;
81	} *CFClient__Layout;	111	} *CFPlus__Layout;
82		112
83	static CFClient__Font default_font;	113	static CFPlus__Font default_font;
84	static PangoContext *ft2_context, *cairo_context;	114	static PangoContext *opengl_context;
85	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	115	static PangoFontMap *opengl_fontmap;
86		116
87	static void	117	static void
88	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
89	{	119	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	120	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef _WIN32	121	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	122	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#else	123	#endif
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif
96	}	125	}
97		126
98	static void	127	static void
99	layout_update_font (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
100	{	129	{
101	/* 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
102	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
103	*/	132	*/
104	PangoFontDescription *font = self->font ? self->font : default_font;	133	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
108		137
109	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
110	}	139	}
111		140
112	static void	141	static void
113	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	142	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
114	{	143	{
		144	PangoRectangle rect;
		145
		146	// get_pixel_* wrongly rounds down
115	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
116		148
117	if (!*w) *w = 1;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118	if (!*h) *h = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119		151
120	*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;
121	}	157	}
122		158
123	typedef uint16_t mapface;	159	typedef uint16_t mapface;
124		160
125	typedef struct {	161	typedef struct {
…		…
128	float s, t;	164	float s, t;
129	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
130	} maptex;	166	} maptex;
131		167
132	typedef struct {	168	typedef struct {
133	int16_t darkness;	169	uint32_t player;
134	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
135	} mapcell;	173	} mapcell;
136		174
137	typedef struct {	175	typedef struct {
138	int32_t c0, c1;	176	int32_t c0, c1;
139	mapcell *col;	177	mapcell *col;
…		…
148	int texs;	186	int texs;
149	maptex *tex;	187	maptex *tex;
150		188
151	int32_t rows;	189	int32_t rows;
152	maprow *row;	190	maprow *row;
153	} *CFClient__Map;	191	} *CFPlus__Map;
154		192
155	static char *	193	static char *
156	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
157	{	195	{
158	char *p;	196	char *p;
…		…
176		214
177	#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))
178	#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))
179		217
180	static maprow *	218	static maprow *
181	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
182	{	220	{
183	if (0 > y)	221	if (0 > y)
184	{	222	{
185	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
186	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
224		262
225	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
226	}	264	}
227		265
228	static mapcell *	266	static mapcell *
229	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
230	{	268	{
231	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
232	}	270	}
233		271
234	static void	272	static void
235	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
236	{	274	{
237	int r;	275	int r;
238		276
239	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
240	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
248	self->row = 0;	286	self->row = 0;
249	self->rows = 0;	287	self->rows = 0;
250	}	288	}
251		289
252	static void	290	static void
253	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)
254	{	292	{
255	int x, y;	293	int x, y;
256	maprow *row;	294	maprow *row;
		295	mapcell *cell;
257		296
258	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
259	if (y >= 0)	298	if (y >= 0)
260	{	299	{
261	if (y >= self->rows)	300	if (y >= self->rows)
…		…
267	if (x >= row->c0)	306	if (x >= row->c0)
268	{	307	{
269	if (x >= row->c1)	308	if (x >= row->c1)
270	break;	309	break;
271		310
272	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;
273	}	317	}
274	}	318	}
275	}	319	}
276		320
277	static void	321	static void
…		…
298	ev.data2 = 0;	342	ev.data2 = 0;
299		343
300	SDL_PushEvent ((SDL_Event *)&ev);	344	SDL_PushEvent ((SDL_Event *)&ev);
301	}	345	}
302		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
303	MODULE = CFClient PACKAGE = CFClient	364	MODULE = CFPlus PACKAGE = CFPlus
304		365
305	PROTOTYPES: ENABLE	366	PROTOTYPES: ENABLE
306		367
307	BOOT:	368	BOOT:
308	{	369	{
309	HV *stash = gv_stashpv ("CFClient", 1);	370	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	371	static const struct {
311	const char *name;	372	const char *name;
312	IV iv;	373	IV iv;
313	} *civ, const_iv[] = {	374	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	375	# define const_iv(name) { # name, (IV)name }
…		…
415		476
416	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	477	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	479	}
419		480
		481	int
		482	in_destruct ()
		483	CODE:
		484	RETVAL = PL_main_cv == Nullcv;
		485	OUTPUT:
		486	RETVAL
		487
		488	NV floor (NV x)
		489
		490	NV ceil (NV x)
		491
420	void	492	void
421	pango_init ()	493	pango_init ()
422	CODE:	494	CODE:
423	// delayed, so it can pick up new fonts added by AddFontResourceEx
424	{	495	{
425	{
426	ft2_fontmap = pango_ft2_font_map_new ();	496	opengl_fontmap = pango_opengl_font_map_new ();
427	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	497	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
428	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	498	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
429	}
430	{
431	cairo_font_options_t *fopt = cairo_font_options_create ();
432	cairo_fontmap = pango_cairo_font_map_get_default ();
433	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
434	#ifdef _WIN32
435	// cairo looks like shit eaten twice on windows
436	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
437	#else
438	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
439	#endif
440	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
441	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
442	pango_cairo_context_set_font_options (cairo_context, fopt);
443	cairo_font_options_destroy (fopt);
444	}
445	}	499	}
446		500
447	int	501	int
448	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	502	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
449		503
450	void	504	void
451	SDL_Quit ()	505	SDL_Quit ()
452		506
453	void	507	void
…		…
460	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	514	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
461	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	515	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
462	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	516	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
463		517
464	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	518	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	519	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
466		520
467	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
468	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
469	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
470	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
471		525
472	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	526	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		527	#if SDL_VERSION_ATLEAST(1,2,10)
		528	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		529	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		530	#endif
473		531
474	SDL_EnableUNICODE (1);	532	SDL_EnableUNICODE (1);
475	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	533	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
476		534
477	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	535	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
564	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	622	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
565	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	623	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
566	break;	624	break;
567	}	625	}
568		626
569	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	627	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
570	}	628	}
571	}	629	}
572		630
573	int	631	int
574	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	632	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
588	#ifndef _WIN32	646	#ifndef _WIN32
589	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
590	#endif	648	#endif
591		649
592	void	650	void
		651	win32_proxy_info ()
		652	PPCODE:
		653	{
		654	#ifdef _WIN32
		655	char buffer[2048];
		656	DWORD buflen;
		657
		658	EXTEND (SP, 3);
		659
		660	buflen = sizeof (buffer);
		661	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		662	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		663	{
		664	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		665
		666	buflen = sizeof (buffer);
		667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		668	{
		669	PUSHs (newSVpv (buffer, 0));
		670
		671	buflen = sizeof (buffer);
		672	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		673	PUSHs (newSVpv (buffer, 0));
		674	}
		675	}
		676	#endif
		677	}
		678
		679	void
593	add_font (char *file)	680	add_font (char *file)
594	CODE:	681	CODE:
595	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	682	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
596	#ifdef _WIN32
597	// cairo... sigh... requires win2000
598	AddFontResourceEx (file, FR_PRIVATE, 0);
599	#endif
600		683
601	void	684	void
602	load_image_inline (SV *image_)	685	load_image_inline (SV *image_)
603	ALIAS:	686	ALIAS:
604	load_image_file = 1	687	load_image_file = 1
…		…
646		729
647	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	730	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
648		731
649	assert (surface2->pitch == surface2->w * 4);	732	assert (surface2->pitch == surface2->w * 4);
650		733
		734	SDL_LockSurface (surface2);
651	EXTEND (SP, 5);	735	EXTEND (SP, 6);
652	PUSHs (sv_2mortal (newSViv (surface2->w)));	736	PUSHs (sv_2mortal (newSViv (surface2->w)));
653	PUSHs (sv_2mortal (newSViv (surface2->h)));	737	PUSHs (sv_2mortal (newSViv (surface2->h)));
654	SDL_LockSurface (surface2);
655	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	738	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
656	SDL_UnlockSurface (surface2);
657	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	739	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
658	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	740	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
659	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	741	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		742	SDL_UnlockSurface (surface2);
660		743
661	SDL_FreeSurface (surface);	744	SDL_FreeSurface (surface);
662	SDL_FreeSurface (surface2);	745	SDL_FreeSurface (surface2);
663	}	746	}
664		747
…		…
700	CODE:	783	CODE:
701	fprintf (stderr, "FATAL: %s\n", message);	784	fprintf (stderr, "FATAL: %s\n", message);
702	#ifdef _WIN32	785	#ifdef _WIN32
703	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	786	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
704	#endif	787	#endif
705	exit (1);	788	_exit (1);
706		789
		790	void
		791	_exit (int retval = 0)
		792	CODE:
		793	#ifdef WIN32
		794	ExitThread (retval); // unclean, please beam me up
		795	#else
		796	_exit (retval);
		797	#endif
		798
707	MODULE = CFClient PACKAGE = CFClient::Font	799	MODULE = CFPlus PACKAGE = CFPlus::Font
708		800
709	CFClient::Font	801	CFPlus::Font
710	new_from_file (SV *class, char *path, int id = 0)	802	new_from_file (SV *class, char *path, int id = 0)
711	CODE:	803	CODE:
712	{	804	{
713	int count;	805	int count;
714	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	806	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
717	}	809	}
718	OUTPUT:	810	OUTPUT:
719	RETVAL	811	RETVAL
720		812
721	void	813	void
722	DESTROY (CFClient::Font self)	814	DESTROY (CFPlus::Font self)
723	CODE:	815	CODE:
724	pango_font_description_free (self);	816	pango_font_description_free (self);
725		817
726	void	818	void
727	make_default (CFClient::Font self)	819	make_default (CFPlus::Font self)
728	CODE:	820	CODE:
729	default_font = self;	821	default_font = self;
730		822
731	MODULE = CFClient PACKAGE = CFClient::Layout	823	MODULE = CFPlus PACKAGE = CFPlus::Layout
732		824
733	CFClient::Layout	825	void
734	new (SV *class, int rgba = 0)	826	reset_glyph_cache ()
		827	CODE:
		828	tc_clear ();
		829
		830	CFPlus::Layout
		831	new (SV *class)
735	CODE:	832	CODE:
736	New (0, RETVAL, 1, struct cf_layout);	833	New (0, RETVAL, 1, struct cf_layout);
737		834
738	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	835	RETVAL->pl = pango_layout_new (opengl_context);
739	RETVAL->rgba = rgba;
740	RETVAL->r = 1.;	836	RETVAL->r = 1.;
741	RETVAL->g = 1.;	837	RETVAL->g = 1.;
742	RETVAL->b = 1.;	838	RETVAL->b = 1.;
743	RETVAL->a = 1.;	839	RETVAL->a = 1.;
744	RETVAL->base_height = MIN_FONT_HEIGHT;	840	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
748	layout_update_font (RETVAL);	844	layout_update_font (RETVAL);
749	OUTPUT:	845	OUTPUT:
750	RETVAL	846	RETVAL
751		847
752	void	848	void
753	DESTROY (CFClient::Layout self)	849	DESTROY (CFPlus::Layout self)
754	CODE:	850	CODE:
755	g_object_unref (self->pl);	851	g_object_unref (self->pl);
756	Safefree (self);	852	Safefree (self);
757		853
758	int
759	is_rgba (CFClient::Layout self)
760	CODE:
761	RETVAL = self->rgba;
762	OUTPUT:
763	RETVAL
764
765	void	854	void
766	set_text (CFClient::Layout self, SV *text_)	855	set_text (CFPlus::Layout self, SV *text_)
767	CODE:	856	CODE:
768	{	857	{
769	STRLEN textlen;	858	STRLEN textlen;
770	char *text = SvPVutf8 (text_, textlen);	859	char *text = SvPVutf8 (text_, textlen);
771		860
772	pango_layout_set_text (self->pl, text, textlen);	861	pango_layout_set_text (self->pl, text, textlen);
773	}	862	}
774		863
775	void	864	void
776	set_markup (CFClient::Layout self, SV *text_)	865	set_markup (CFPlus::Layout self, SV *text_)
777	CODE:	866	CODE:
778	{	867	{
779	STRLEN textlen;	868	STRLEN textlen;
780	char *text = SvPVutf8 (text_, textlen);	869	char *text = SvPVutf8 (text_, textlen);
781		870
782	pango_layout_set_markup (self->pl, text, textlen);	871	pango_layout_set_markup (self->pl, text, textlen);
783	}	872	}
784		873
		874	void
		875	set_shapes (CFPlus::Layout self, ...)
		876	CODE:
		877	{
		878	PangoAttrList *attrs = 0;
		879	const char *text = pango_layout_get_text (self->pl);
		880	const char *pos = text;
		881	int arg = 4;
		882
		883	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		884	{
		885	PangoRectangle inkrect, rect;
		886	PangoAttribute *attr;
		887
		888	int x = SvIV (ST (arg - 3));
		889	int y = SvIV (ST (arg - 2));
		890	int w = SvIV (ST (arg - 1));
		891	int h = SvIV (ST (arg ));
		892
		893	inkrect.x = 0;
		894	inkrect.y = 0;
		895	inkrect.width = 0;
		896	inkrect.height = 0;
		897
		898	rect.x = x * PANGO_SCALE;
		899	rect.y = y * PANGO_SCALE;
		900	rect.width = w * PANGO_SCALE;
		901	rect.height = h * PANGO_SCALE;
		902
		903	if (!attrs)
		904	attrs = pango_layout_get_attributes (self->pl);
		905
		906	attr = pango_attr_shape_new (&inkrect, &rect);
		907	attr->start_index = pos - text;
		908	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		909	pango_attr_list_insert (attrs, attr);
		910
		911	arg += 4;
		912	pos += sizeof (OBJ_STR) - 1;
		913	}
		914
		915	if (attrs)
		916	pango_layout_set_attributes (self->pl, attrs);
		917	}
		918
		919	void
		920	get_shapes (CFPlus::Layout self)
		921	PPCODE:
		922	{
		923	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		924
		925	do
		926	{
		927	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		928
		929	if (run && shape_attr_p (run))
		930	{
		931	PangoRectangle extents;
		932	pango_layout_iter_get_run_extents (iter, 0, &extents);
		933
		934	EXTEND (SP, 2);
		935	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		936	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		937	}
		938	}
		939	while (pango_layout_iter_next_run (iter));
		940
		941	pango_layout_iter_free (iter);
		942	}
		943
		944	int
		945	has_wrapped (CFPlus::Layout self)
		946	CODE:
		947	{
		948	int lines = 1;
		949	const char *text = pango_layout_get_text (self->pl);
		950
		951	while (*text)
		952	lines += *text++ == '\n';
		953
		954	RETVAL = lines < pango_layout_get_line_count (self->pl);
		955	}
		956	OUTPUT:
		957	RETVAL
		958
785	SV *	959	SV *
786	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
787	CODE:	961	CODE:
788	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
789	SvUTF8_on (RETVAL);	963	sv_utf8_decode (RETVAL);
790	OUTPUT:	964	OUTPUT:
791	RETVAL	965	RETVAL
792		966
793	void	967	void
794	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	968	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
795	CODE:	969	CODE:
796	self->r = r;	970	self->r = r;
797	self->g = g;	971	self->g = g;
798	self->b = b;	972	self->b = b;
799	self->a = a;	973	self->a = a;
800		974
801	void	975	void
802	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
803	CODE:	977	CODE:
804	if (self->font != font)	978	if (self->font != font)
805	{	979	{
806	self->font = font;	980	self->font = font;
807	layout_update_font (self);	981	layout_update_font (self);
808	}	982	}
809		983
810	void	984	void
811	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
812	CODE:	986	CODE:
813	if (self->base_height != base_height)	987	if (self->base_height != base_height)
814	{	988	{
815	self->base_height = base_height;	989	self->base_height = base_height;
816	layout_update_font (self);	990	layout_update_font (self);
817	}	991	}
818		992
819	void	993	void
820	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
821	CODE:	995	CODE:
822	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	996	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
823		997
824	void	998	void
825	set_indent (CFClient::Layout self, int indent)	999	set_indent (CFPlus::Layout self, int indent)
826	CODE:	1000	CODE:
827	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
828		1002
829	void	1003	void
830	set_spacing (CFClient::Layout self, int spacing)	1004	set_spacing (CFPlus::Layout self, int spacing)
831	CODE:	1005	CODE:
832	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
833		1007
834	void	1008	void
835	set_ellipsise (CFClient::Layout self, int ellipsise)	1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
836	CODE:	1010	CODE:
837	pango_layout_set_ellipsize (self->pl,	1011	pango_layout_set_ellipsize (self->pl,
838	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
839	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
840	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
841	: PANGO_ELLIPSIZE_NONE	1015	: PANGO_ELLIPSIZE_NONE
842	);	1016	);
843		1017
844	void	1018	void
845	set_single_paragraph_mode (CFClient::Layout self, int spm)	1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
846	CODE:	1020	CODE:
847	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
848		1022
849	void	1023	void
850	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
851	PPCODE:	1025	PPCODE:
852	{	1026	{
853	int w, h;	1027	int w, h;
854		1028
855	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
858	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
859	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
860	}	1034	}
861		1035
862	int	1036	int
		1037	descent (CFPlus::Layout self)
		1038	CODE:
		1039	{
		1040	PangoRectangle rect;
		1041	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1042	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1043	RETVAL = PANGO_DESCENT (rect);
		1044	}
		1045	OUTPUT:
		1046	RETVAL
		1047
		1048	int
863	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
864	CODE:	1050	CODE:
865	{	1051	{
866	int index, trailing;	1052	int index, trailing;
867	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1053	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
868	RETVAL = index;	1054	RETVAL = index + trailing;
869	}	1055	}
870	OUTPUT:	1056	OUTPUT:
871	RETVAL	1057	RETVAL
872		1058
873	void	1059	void
874	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
875	PPCODE:	1061	PPCODE:
876	{	1062	{
877	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
878	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
879		1065
…		…
882	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
883	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
884	}	1070	}
885		1071
886	void	1072	void
887	render (CFClient::Layout self)	1073	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
888	PPCODE:	1074	PPCODE:
889	{	1075	{
890	SV *retval;	1076	int line, x;
891	int w, h;
892		1077
893	layout_get_pixel_size (self, &w, &h);	1078	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1079	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
894		1080
895	if (self->rgba)
896	{
897	cairo_surface_t *surface;
898	cairo_t *cairo;
899
900	retval = newSV (w * h * 4);
901	SvPOK_only (retval);
902	SvCUR_set (retval, w * h * 4);
903
904	memset (SvPVX (retval), 0, w * h * 4);
905
906	surface = cairo_image_surface_create_for_data (
907	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
908	cairo = cairo_create (surface);
909	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
910
911	pango_cairo_show_layout (cairo, self->pl);
912
913	cairo_destroy (cairo);
914	cairo_surface_destroy (surface);
915
916	// what a mess, and its premultiplied, too :(
917	{
918	uint32_t *p = (uint32_t *)SvPVX (retval);
919	uint32_t *e = p + w * h;
920
921	while (p < e)
922	{
923	uint32_t rgba = *p;
924	rgba = (rgba >> 24) | (rgba << 8);
925	#if 0
926	#ifdef _WIN32
927	{//D
928	uint8_t r = rgba >> 24;
929	uint8_t g = rgba >> 16;
930	uint8_t b = rgba >> 8;
931	uint8_t a = rgba >> 0;
932
933	rgba = (rgba & 0xffffff00) | a;
934	}
935	#endif
936	#endif
937	rgba = SDL_SwapBE32 (rgba);
938	*p++ = rgba;
939	}
940	}
941
942	EXTEND (SP, 5);	1081	EXTEND (SP, 2);
943	PUSHs (sv_2mortal (newSViv (w)));	1082	PUSHs (sv_2mortal (newSViv (line - 1)));
		1083	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1084	}
		1085
		1086	void
		1087	line_x_to_index (CFPlus::Layout self, int line, int x)
		1088	PPCODE:
		1089	{
		1090	PangoLayoutLine *lp;
		1091	int index, trailing;
		1092
		1093	if (line < 0)
		1094	XSRETURN_EMPTY;
		1095
		1096	if (!(lp = pango_layout_get_line (self->pl, line)))
		1097	XSRETURN_EMPTY; /* do better */
		1098
		1099	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1100
		1101	EXTEND (SP, 2);
		1102	if (GIMME_V == G_SCALAR)
944	PUSHs (sv_2mortal (newSViv (h)));	1103	PUSHs (sv_2mortal (newSViv (index + trailing)));
945	PUSHs (sv_2mortal (retval));
946	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
947	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
948	}
949	else	1104	else
950	{	1105	{
951	FT_Bitmap bitmap;
952
953	retval = newSV (w * h);
954	SvPOK_only (retval);
955	SvCUR_set (retval, w * h);
956
957	bitmap.rows = h;
958	bitmap.width = w;
959	bitmap.pitch = w;
960	bitmap.buffer = (unsigned char*)SvPVX (retval);
961	bitmap.num_grays = 256;
962	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
963
964	memset (bitmap.buffer, 0, w * h);
965
966	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
967
968	EXTEND (SP, 5);
969	PUSHs (sv_2mortal (newSViv (w)));	1106	PUSHs (sv_2mortal (newSViv (index)));
970	PUSHs (sv_2mortal (newSViv (h)));	1107	PUSHs (sv_2mortal (newSViv (trailing)));
971	PUSHs (sv_2mortal (retval));
972	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
973	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
974	}	1108	}
975	}	1109	}
976		1110
		1111	void
		1112	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1113	PPCODE:
		1114	pango_opengl_render_layout_subpixel (
		1115	self->pl,
		1116	x * PANGO_SCALE, y * PANGO_SCALE,
		1117	self->r, self->g, self->b, self->a,
		1118	flags
		1119	);
		1120
977	MODULE = CFClient PACKAGE = CFClient::Texture	1121	MODULE = CFPlus PACKAGE = CFPlus::Texture
978		1122
979	void	1123	void
		1124	pad2pot (SV *data_, SV *w_, SV *h_)
		1125	CODE:
		1126	{
		1127	int ow = SvIV (w_);
		1128	int oh = SvIV (h_);
		1129
		1130	if (ow && oh)
		1131	{
		1132	int nw = minpot (ow);
		1133	int nh = minpot (oh);
		1134
		1135	if (nw != ow || nh != oh)
		1136	{
		1137	if (SvOK (data_))
		1138	{
		1139	STRLEN datalen;
		1140	char *data = SvPVbyte (data_, datalen);
		1141	int bpp = datalen / (ow * oh);
		1142	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
		1143
		1144	SvPOK_only (result_);
		1145	SvCUR_set (result_, nw * nh * bpp);
		1146
		1147	memset (SvPVX (result_), 0, nw * nh * bpp);
		1148	while (oh--)
		1149	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1150
		1151	sv_setsv (data_, result_);
		1152	}
		1153
		1154	sv_setiv (w_, nw);
		1155	sv_setiv (h_, nh);
		1156	}
		1157	}
		1158	}
		1159
		1160	void
980	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1161	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
981	PROTOTYPE: $$$;$$	1162	PROTOTYPE: $$$;$$
982	ALIAS:	1163	ALIAS:
983	draw_quad_alpha = 1	1164	draw_quad_alpha = 1
984	draw_quad_alpha_premultiplied = 2	1165	draw_quad_alpha_premultiplied = 2
985	CODE:	1166	CODE:
…		…
1023	glDisable (GL_ALPHA_TEST);	1204	glDisable (GL_ALPHA_TEST);
1024	glDisable (GL_BLEND);	1205	glDisable (GL_BLEND);
1025	}	1206	}
1026	}	1207	}
1027		1208
1028	MODULE = CFClient PACKAGE = CFClient::Map	1209	MODULE = CFPlus PACKAGE = CFPlus::Map
1029		1210
1030	CFClient::Map	1211	CFPlus::Map
1031	new (SV *class, int map_width, int map_height)	1212	new (SV *class)
1032	CODE:	1213	CODE:
1033	New (0, RETVAL, 1, struct map);	1214	New (0, RETVAL, 1, struct map);
1034	RETVAL->x = 0;	1215	RETVAL->x = 0;
1035	RETVAL->y = 0;	1216	RETVAL->y = 0;
1036	RETVAL->w = map_width;	1217	RETVAL->w = 0;
1037	RETVAL->h = map_height;	1218	RETVAL->h = 0;
1038	RETVAL->ox = 0;	1219	RETVAL->ox = 0;
1039	RETVAL->oy = 0;	1220	RETVAL->oy = 0;
1040	RETVAL->faces = 8192;	1221	RETVAL->faces = 8192;
1041	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1222	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1042	RETVAL->texs = 8192;	1223	RETVAL->texs = 8192;
…		…
1045	RETVAL->row = 0;	1226	RETVAL->row = 0;
1046	OUTPUT:	1227	OUTPUT:
1047	RETVAL	1228	RETVAL
1048		1229
1049	void	1230	void
1050	DESTROY (CFClient::Map self)	1231	DESTROY (CFPlus::Map self)
1051	CODE:	1232	CODE:
1052	{	1233	{
1053	map_clear (self);	1234	map_clear (self);
1054	Safefree (self->face);	1235	Safefree (self->face);
		1236	Safefree (self->tex);
1055	Safefree (self);	1237	Safefree (self);
1056	}	1238	}
1057		1239
1058	void	1240	void
		1241	resize (CFPlus::Map self, int map_width, int map_height)
		1242	CODE:
		1243	self->w = map_width;
		1244	self->h = map_height;
		1245
		1246	void
1059	clear (CFClient::Map self)	1247	clear (CFPlus::Map self)
1060	CODE:	1248	CODE:
1061	map_clear (self);	1249	map_clear (self);
1062		1250
1063	void	1251	void
1064	set_face (CFClient::Map self, int face, int texid)	1252	set_face (CFPlus::Map self, int face, int texid)
1065	CODE:	1253	CODE:
1066	{	1254	{
1067	while (self->faces <= face)	1255	while (self->faces <= face)
1068	{	1256	{
1069	Append (mapface, self->face, self->faces, self->faces);	1257	Append (mapface, self->face, self->faces, self->faces);
…		…
1072		1260
1073	self->face [face] = texid;	1261	self->face [face] = texid;
1074	}	1262	}
1075		1263
1076	void	1264	void
1077	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)	1265	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)
1078	CODE:	1266	CODE:
1079	{	1267	{
1080	while (self->texs <= texid)	1268	while (self->texs <= texid)
1081	{	1269	{
1082	Append (maptex, self->tex, self->texs, self->texs);	1270	Append (maptex, self->tex, self->texs, self->texs);
…		…
1106	// from transparent color bleeding and ugly wrapping effects.	1294	// from transparent color bleeding and ugly wrapping effects.
1107	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1295	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108	}	1296	}
1109		1297
1110	int	1298	int
1111	ox (CFClient::Map self)	1299	ox (CFPlus::Map self)
1112	ALIAS:	1300	ALIAS:
1113	oy = 1	1301	oy = 1
1114	x = 2	1302	x = 2
1115	y = 3	1303	y = 3
1116	w = 4	1304	w = 4
…		…
1127	}	1315	}
1128	OUTPUT:	1316	OUTPUT:
1129	RETVAL	1317	RETVAL
1130		1318
1131	void	1319	void
1132	scroll (CFClient::Map self, int dx, int dy)	1320	scroll (CFPlus::Map self, int dx, int dy)
1133	CODE:	1321	CODE:
1134	{	1322	{
1135	if (dx > 0)	1323	if (dx > 0)
1136	map_blank (self, self->x, self->y, dx - 1, self->h);	1324	map_blank (self, self->x, self->y, dx, self->h);
1137	else if (dx < 0)	1325	else if (dx < 0)
1138	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1326	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1139		1327
1140	if (dy > 0)	1328	if (dy > 0)
1141	map_blank (self, self->x, self->y, self->w, dy - 1);	1329	map_blank (self, self->x, self->y, self->w, dy);
1142	else if (dy < 0)	1330	else if (dy < 0)
1143	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1331	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1144		1332
1145	self->ox += dx; self->x += dx;	1333	self->ox += dx; self->x += dx;
1146	self->oy += dy; self->y += dy;	1334	self->oy += dy; self->y += dy;
1147		1335
1148	while (self->y < 0)	1336	while (self->y < 0)
…		…
1153	self->y += MAP_EXTEND_Y;	1341	self->y += MAP_EXTEND_Y;
1154	}	1342	}
1155	}	1343	}
1156		1344
1157	void	1345	void
1158	map1a_update (CFClient::Map self, SV *data_)	1346	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1159	CODE:	1347	CODE:
1160	{	1348	{
1161	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1349	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1162	uint8_t *data_end = (uint8_t *)SvEND (data_);	1350	uint8_t *data_end = (uint8_t *)SvEND (data_);
1163	mapcell *cell;	1351	mapcell *cell;
1164	int x, y, flags;	1352	int x, y, flags;
1165		1353
1166	while (data < data_end)	1354	while (data < data_end - 1)
1167	{	1355	{
1168	flags = (data [0] << 8) + data [1]; data += 2;	1356	flags = (data [0] << 8) + data [1]; data += 2;
1169		1357
1170	x = ((flags >> 10) & 63) + self->x;	1358	x = self->x + ((flags >> 10) & 63);
1171	y = ((flags >> 4) & 63) + self->y;	1359	y = self->y + ((flags >> 4) & 63);
1172		1360
1173	cell = map_get_cell (self, x, y);	1361	cell = map_get_cell (self, x, y);
1174		1362
1175	if (flags & 15)	1363	if (flags & 15)
1176	{	1364	{
1177	if (cell->darkness < 0)	1365	if (!cell->darkness)
1178	{	1366	{
		1367	memset (cell, 0, sizeof (*cell));
1179	cell->darkness = 0;	1368	cell->darkness = 256;
1180	cell->face [0] = 0;
1181	cell->face [1] = 0;
1182	cell->face [2] = 0;
1183	}	1369	}
1184		1370
1185	cell->darkness = flags & 8 ? *data++ : 255;
1186
1187	//TODO: don't trust server data to be in-range(!)	1371	//TODO: don't trust server data to be in-range(!)
		1372
		1373	if (flags & 8)
		1374	{
		1375	if (extmap)
		1376	{
		1377	uint8_t ext, cmd;
		1378
		1379	do
		1380	{
		1381	ext = *data++;
		1382	cmd = ext & 0x3f;
		1383
		1384	if (cmd < 4)
		1385	cell->darkness = 255 - ext * 64 + 1;
		1386	else if (cmd == 5) // health
		1387	{
		1388	cell->stat_width = 1;
		1389	cell->stat_hp = *data++;
		1390	}
		1391	else if (cmd == 6) // monster width
		1392	cell->stat_width = *data++ + 1;
		1393	else if (cmd == 0x47) // monster width
		1394	{
		1395	if (*data == 4)
		1396	; // decode player tag
		1397
		1398	data += *data + 1;
		1399	}
		1400	else if (cmd == 8) // cell flags
		1401	cell->flags = *data++;
		1402	else if (ext & 0x40) // unknown, multibyte => skip
		1403	data += *data + 1;
		1404	else
		1405	data++;
		1406	}
		1407	while (ext & 0x80);
		1408	}
		1409	else
		1410	cell->darkness = *data++ + 1;
		1411	}
1188		1412
1189	if (flags & 4)	1413	if (flags & 4)
1190	{	1414	{
1191	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1415	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1192	}	1416	}
…		…
1200	{	1424	{
1201	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1425	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1202	}	1426	}
1203	}	1427	}
1204	else	1428	else
1205	cell->darkness = -1;	1429	cell->darkness = 0;
1206	}	1430	}
1207	}	1431	}
1208		1432
1209	SV *	1433	SV *
1210	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1434	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1211	CODE:	1435	CODE:
1212	{	1436	{
1213	int x1, x;	1437	int x1, x;
1214	int y1, y;	1438	int y1, y;
1215	int z;	1439	int z;
…		…
1265	}	1489	}
1266	OUTPUT:	1490	OUTPUT:
1267	RETVAL	1491	RETVAL
1268		1492
1269	void	1493	void
1270	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1494	draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1271	PPCODE:	1495	CODE:
1272	{	1496	{
1273	int vx, vy;
1274	int x, y, z;	1497	int x, y, z;
1275	int last_name;	1498	int last_name;
1276	mapface face;	1499	mapface face;
1277	int sw4 = (sw + 3) & ~3;
1278	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1279	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1280
1281	memset (darkness, 255, sw4 * sh);
1282	SvPOK_only (darkness_sv);
1283	SvCUR_set (darkness_sv, sw4 * sh);
1284
1285	vx = self->x + (self->w - sw) / 2 - shift_x;
1286	vy = self->y + (self->h - sh) / 2 - shift_y;
1287
1288	/*
1289	int vx = self->vx = self->w >= sw
1290	? self->x + (self->w - sw) / 2
1291	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1292
1293	int vy = self->vy = self->h >= sh
1294	? self->y + (self->h - sh) / 2
1295	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1296	*/
1297		1500
1298	glColor4ub (255, 255, 255, 255);	1501	glColor4ub (255, 255, 255, 255);
1299		1502
		1503	glEnable (GL_BLEND);
1300	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1504	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1301	glEnable (GL_BLEND);
1302	glEnable (GL_TEXTURE_2D);	1505	glEnable (GL_TEXTURE_2D);
1303	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1506	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1304		1507
1305	glBegin (GL_QUADS);	1508	glBegin (GL_QUADS);
1306		1509
1307	last_name = 0;	1510	last_name = 0;
1308		1511
		1512	mx += self->x;
		1513	my += self->y;
		1514
1309	for (z = 0; z < 3; z++)	1515	for (z = 0; z < 3; z++)
1310	for (y = 0; y < sh; y++)	1516	for (y = 0; y < sh; y++)
1311	if (0 <= y + vy && y + vy < self->rows)	1517	if (0 <= y + my && y + my < self->rows)
1312	{	1518	{
1313	maprow *row = self->row + (y + vy);	1519	maprow *row = self->row + (y + my);
1314		1520
1315	for (x = 0; x < sw; x++)	1521	for (x = 0; x < sw; x++)
1316	if (row->c0 <= x + vx && x + vx < row->c1)	1522	if (row->c0 <= x + mx && x + mx < row->c1)
1317	{	1523	{
1318	mapcell *cell = row->col + (x + vx - row->c0);	1524	mapcell *cell = row->col + (x + mx - row->c0);
1319
1320	darkness[y * sw4 + x] = cell->darkness < 0
1321	? 255 - FOW_DARKNESS
1322	: 255 - cell->darkness;
1323		1525
1324	face = cell->face [z];	1526	face = cell->face [z];
1325		1527
1326	if (face)	1528	if (face && face < self->texs)
1327	{	1529	{
1328	maptex tex = self->tex [face];	1530	maptex tex = self->tex [face];
1329
1330	int px = (x + 1) * 32 - tex.w;	1531	int px = (x + 1) * 32 - tex.w;
1331	int py = (y + 1) * 32 - tex.h;	1532	int py = (y + 1) * 32 - tex.h;
1332		1533
1333	if (last_name != tex.name)	1534	if (last_name != tex.name)
1334	{	1535	{
1335	glEnd ();	1536	glEnd ();
1336	last_name = tex.name;
1337	glBindTexture (GL_TEXTURE_2D, last_name);	1537	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1338	glBegin (GL_QUADS);	1538	glBegin (GL_QUADS);
1339	}	1539	}
1340		1540
1341	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1541	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1342	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1542	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1343	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1543	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1344	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1544	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1345	}	1545	}
		1546
		1547	if (cell->flags && z == 2)
		1548	{
		1549	if (cell->flags & 1)
		1550	{
		1551	maptex tex = self->tex [1];
		1552	int px = (x + 1) * 32 - tex.w + 2;
		1553	int py = (y + 1) * 32 - tex.h - 6;
		1554
		1555	glEnd ();
		1556	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1557	glBegin (GL_QUADS);
		1558
		1559	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1560	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1561	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1562	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1563	}
		1564	}
1346	}	1565	}
1347	}	1566	}
1348		1567
1349	glEnd ();	1568	glEnd ();
1350		1569
1351	glDisable (GL_TEXTURE_2D);	1570	glDisable (GL_TEXTURE_2D);
1352	glDisable (GL_BLEND);	1571	glDisable (GL_BLEND);
		1572
		1573	// top layer: overlays such as the health bar
		1574	for (y = 0; y < sh; y++)
		1575	if (0 <= y + my && y + my < self->rows)
		1576	{
		1577	maprow *row = self->row + (y + my);
		1578
		1579	for (x = 0; x < sw; x++)
		1580	if (row->c0 <= x + mx && x + mx < row->c1)
		1581	{
		1582	mapcell *cell = row->col + (x + mx - row->c0);
		1583
		1584	int px = x * 32;
		1585	int py = y * 32;
		1586
		1587	if (cell->stat_hp)
		1588	{
		1589	int width = cell->stat_width * 32;
		1590	int thick = sh / 28 + 1 + cell->stat_width;
		1591
		1592	glColor3ub (0, 0, 0);
		1593	glRectf (px + 1, py - thick - 2,
		1594	px + width - 1, py);
		1595
		1596	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1597	glRectf (px + 2,
		1598	py - thick - 1,
		1599	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1600	}
		1601	}
		1602	}
		1603	}
		1604
		1605	void
		1606	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1607	CODE:
		1608	{
		1609	static float color[16][3] = {
		1610	{ 0.00F, 0.00F, 0.00F },
		1611	{ 1.00F, 1.00F, 1.00F },
		1612	{ 0.00F, 0.00F, 0.55F },
		1613	{ 1.00F, 0.00F, 0.00F },
		1614
		1615	{ 1.00F, 0.54F, 0.00F },
		1616	{ 0.11F, 0.56F, 1.00F },
		1617	{ 0.93F, 0.46F, 0.00F },
		1618	{ 0.18F, 0.54F, 0.34F },
		1619
		1620	{ 0.56F, 0.73F, 0.56F },
		1621	{ 0.80F, 0.80F, 0.80F },
		1622	{ 0.55F, 0.41F, 0.13F },
		1623	{ 0.99F, 0.77F, 0.26F },
		1624
		1625	{ 0.74F, 0.65F, 0.41F },
		1626
		1627	{ 0.00F, 1.00F, 1.00F },
		1628	{ 1.00F, 0.00F, 1.00F },
		1629	{ 1.00F, 1.00F, 0.00F },
		1630	};
		1631
		1632	int x, y;
		1633
		1634	glEnable (GL_TEXTURE_2D);
		1635	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1636	glEnable (GL_BLEND);
		1637	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1638	glBegin (GL_QUADS);
		1639
		1640	for (y = 0; y < h; y++)
		1641	for (x = 0; x < w; x++)
		1642	{
		1643	unsigned char m = data [x + y * w];
		1644
		1645	if (m)
		1646	{
		1647	float *c = color [m & 15];
		1648
		1649	float tx1 = m & 0x40 ? 0.5 : 0.;
		1650	float tx2 = tx1 + 0.5;
		1651
		1652	glColor4f (c[0], c[1], c[2], 0.75);
		1653	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1654	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1655	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1656	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1657	}
		1658	}
		1659
		1660	glEnd ();
		1661	glDisable (GL_BLEND);
		1662	glDisable (GL_TEXTURE_2D);
		1663	}
		1664
		1665	void
		1666	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1667	PPCODE:
		1668	{
		1669	int x, y;
		1670	int sw4 = (sw + 3) & ~3;
		1671	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1672	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1673
		1674	memset (darkness, 255, sw4 * sh);
		1675	SvPOK_only (darkness_sv);
		1676	SvCUR_set (darkness_sv, sw4 * sh);
		1677
		1678	mx += self->x;
		1679	my += self->y;
		1680
		1681	for (y = 0; y < sh; y++)
		1682	if (0 <= y + my && y + my < self->rows)
		1683	{
		1684	maprow *row = self->row + (y + my);
		1685
		1686	for (x = 0; x < sw; x++)
		1687	if (row->c0 <= x + mx && x + mx < row->c1)
		1688	{
		1689	mapcell *cell = row->col + (x + mx - row->c0);
		1690
		1691	darkness[y * sw4 + x] = cell->darkness
		1692	? 255 - (cell->darkness - 1)
		1693	: 255 - FOW_DARKNESS;
		1694	}
		1695	}
1353		1696
1354	EXTEND (SP, 3);	1697	EXTEND (SP, 3);
1355	PUSHs (sv_2mortal (newSViv (sw4)));	1698	PUSHs (sv_2mortal (newSViv (sw4)));
1356	PUSHs (sv_2mortal (newSViv (sh)));	1699	PUSHs (sv_2mortal (newSViv (sh)));
1357	PUSHs (darkness_sv);	1700	PUSHs (darkness_sv);
1358	}	1701	}
1359		1702
1360	SV *	1703	SV *
1361	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1704	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1362	CODE:	1705	CODE:
1363	{	1706	{
1364	int x, y, x1, y1;	1707	int x, y, x1, y1;
1365	SV *data_sv = newSV (w * h * 7 + 5);	1708	SV *data_sv = newSV (w * h * 7 + 5);
1366	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1709	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1428	}	1771	}
1429	OUTPUT:	1772	OUTPUT:
1430	RETVAL	1773	RETVAL
1431		1774
1432	void	1775	void
1433	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1776	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1434	PPCODE:	1777	PPCODE:
1435	{	1778	{
1436	int x, y, z;	1779	int x, y, z;
1437	int w, h;	1780	int w, h;
1438	int x1, y1;	1781	int x1, y1;
…		…
1470		1813
1471	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1814	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1472	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1815	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1473	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1816	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1474		1817
1475	if (cell->darkness <= 0)	1818	if (cell->darkness == 0)
1476	{	1819	{
1477	cell->darkness = -1;	1820	cell->darkness = 0;
1478		1821
1479	for (z = 0; z <= 2; z++)	1822	for (z = 0; z <= 2; z++)
1480	{	1823	{
1481	cell->face[z] = face[z];	1824	cell->face[z] = face[z];
1482		1825
…		…
1487	}	1830	}
1488	}	1831	}
1489	}	1832	}
1490	}	1833	}
1491		1834
1492	MODULE = CFClient PACKAGE = CFClient::MixChunk	1835	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1493		1836
1494	CFClient::MixChunk	1837	CFPlus::MixChunk
1495	new_from_file (SV *class, char *path)	1838	new_from_file (SV *class, char *path)
1496	CODE:	1839	CODE:
1497	RETVAL = Mix_LoadWAV (path);	1840	RETVAL = Mix_LoadWAV (path);
1498	OUTPUT:	1841	OUTPUT:
1499	RETVAL	1842	RETVAL
1500		1843
1501	void	1844	void
1502	DESTROY (CFClient::MixChunk self)	1845	DESTROY (CFPlus::MixChunk self)
1503	CODE:	1846	CODE:
1504	Mix_FreeChunk (self);	1847	Mix_FreeChunk (self);
1505		1848
1506	int	1849	int
1507	volume (CFClient::MixChunk self, int volume = -1)	1850	volume (CFPlus::MixChunk self, int volume = -1)
1508	CODE:	1851	CODE:
1509	RETVAL = Mix_VolumeChunk (self, volume);	1852	RETVAL = Mix_VolumeChunk (self, volume);
1510	OUTPUT:	1853	OUTPUT:
1511	RETVAL	1854	RETVAL
1512		1855
1513	int	1856	int
1514	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1857	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1515	CODE:	1858	CODE:
1516	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1859	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1517	OUTPUT:	1860	OUTPUT:
1518	RETVAL	1861	RETVAL
1519		1862
1520	MODULE = CFClient PACKAGE = CFClient::MixMusic	1863	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1521		1864
1522	int	1865	int
1523	volume (int volume = -1)	1866	volume (int volume = -1)
1524	CODE:	1867	CODE:
1525	RETVAL = Mix_VolumeMusic (volume);	1868	RETVAL = Mix_VolumeMusic (volume);
1526	OUTPUT:	1869	OUTPUT:
1527	RETVAL	1870	RETVAL
1528		1871
1529	CFClient::MixMusic	1872	CFPlus::MixMusic
1530	new_from_file (SV *class, char *path)	1873	new_from_file (SV *class, char *path)
1531	CODE:	1874	CODE:
1532	RETVAL = Mix_LoadMUS (path);	1875	RETVAL = Mix_LoadMUS (path);
1533	OUTPUT:	1876	OUTPUT:
1534	RETVAL	1877	RETVAL
1535		1878
1536	void	1879	void
1537	DESTROY (CFClient::MixMusic self)	1880	DESTROY (CFPlus::MixMusic self)
1538	CODE:	1881	CODE:
1539	Mix_FreeMusic (self);	1882	Mix_FreeMusic (self);
1540		1883
1541	int	1884	int
1542	play (CFClient::MixMusic self, int loops = -1)	1885	play (CFPlus::MixMusic self, int loops = -1)
1543	CODE:	1886	CODE:
1544	RETVAL = Mix_PlayMusic (self, loops);	1887	RETVAL = Mix_PlayMusic (self, loops);
1545	OUTPUT:	1888	OUTPUT:
1546	RETVAL	1889	RETVAL
1547		1890
1548	MODULE = CFClient PACKAGE = CFClient::OpenGL	1891	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1549		1892
1550	BOOT:	1893	BOOT:
1551	{	1894	{
1552	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1895	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1553	static const struct {	1896	static const struct {
1554	const char *name;	1897	const char *name;
1555	IV iv;	1898	IV iv;
1556	} *civ, const_iv[] = {	1899	} *civ, const_iv[] = {
1557	# define const_iv(name) { # name, (IV)name }	1900	# define const_iv(name) { # name, (IV)name }
…		…
1564	const_iv (GL_SCISSOR_TEST),	1907	const_iv (GL_SCISSOR_TEST),
1565	const_iv (GL_DEPTH_TEST),	1908	const_iv (GL_DEPTH_TEST),
1566	const_iv (GL_ALPHA_TEST),	1909	const_iv (GL_ALPHA_TEST),
1567	const_iv (GL_NORMALIZE),	1910	const_iv (GL_NORMALIZE),
1568	const_iv (GL_RESCALE_NORMAL),	1911	const_iv (GL_RESCALE_NORMAL),
		1912	const_iv (GL_FRONT),
		1913	const_iv (GL_BACK),
1569	const_iv (GL_AND),	1914	const_iv (GL_AND),
1570	const_iv (GL_ONE),	1915	const_iv (GL_ONE),
1571	const_iv (GL_ZERO),	1916	const_iv (GL_ZERO),
1572	const_iv (GL_SRC_ALPHA),	1917	const_iv (GL_SRC_ALPHA),
1573	const_iv (GL_DST_ALPHA),	1918	const_iv (GL_DST_ALPHA),
1574	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1919	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1575	const_iv (GL_ONE_MINUS_DST_ALPHA),	1920	const_iv (GL_ONE_MINUS_DST_ALPHA),
1576	const_iv (GL_SRC_ALPHA_SATURATE),	1921	const_iv (GL_SRC_ALPHA_SATURATE),
1577	const_iv (GL_RGB),	1922	const_iv (GL_RGB),
1578	const_iv (GL_RGBA),	1923	const_iv (GL_RGBA),
		1924	const_iv (GL_RGBA4),
		1925	const_iv (GL_RGBA8),
		1926	const_iv (GL_RGB5_A1),
1579	const_iv (GL_UNSIGNED_BYTE),	1927	const_iv (GL_UNSIGNED_BYTE),
1580	const_iv (GL_UNSIGNED_SHORT),	1928	const_iv (GL_UNSIGNED_SHORT),
1581	const_iv (GL_UNSIGNED_INT),	1929	const_iv (GL_UNSIGNED_INT),
1582	const_iv (GL_ALPHA),	1930	const_iv (GL_ALPHA),
1583	const_iv (GL_INTENSITY),	1931	const_iv (GL_INTENSITY),
…		…
1615	const_iv (GL_SEPARABLE_2D),	1963	const_iv (GL_SEPARABLE_2D),
1616	const_iv (GL_CONVOLUTION_2D),	1964	const_iv (GL_CONVOLUTION_2D),
1617	const_iv (GL_CONVOLUTION_BORDER_MODE),	1965	const_iv (GL_CONVOLUTION_BORDER_MODE),
1618	const_iv (GL_CONSTANT_BORDER),	1966	const_iv (GL_CONSTANT_BORDER),
1619	const_iv (GL_LINES),	1967	const_iv (GL_LINES),
		1968	const_iv (GL_LINE_STRIP),
1620	const_iv (GL_LINE_LOOP),	1969	const_iv (GL_LINE_LOOP),
1621	const_iv (GL_QUADS),	1970	const_iv (GL_QUADS),
1622	const_iv (GL_QUAD_STRIP),	1971	const_iv (GL_QUAD_STRIP),
1623	const_iv (GL_TRIANGLES),	1972	const_iv (GL_TRIANGLES),
1624	const_iv (GL_TRIANGLE_STRIP),	1973	const_iv (GL_TRIANGLE_STRIP),
…		…
1657	OUTPUT:	2006	OUTPUT:
1658	RETVAL	2007	RETVAL
1659		2008
1660	int glGetError ()	2009	int glGetError ()
1661		2010
		2011	void glFinish ()
		2012
1662	void glClear (int mask)	2013	void glClear (int mask)
1663		2014
1664	void glClearColor (float r, float g, float b, float a = 1.0)	2015	void glClearColor (float r, float g, float b, float a = 1.0)
1665	PROTOTYPE: @	2016	PROTOTYPE: @
1666		2017
…		…
1689	void glPushMatrix ()	2040	void glPushMatrix ()
1690		2041
1691	void glPopMatrix ()	2042	void glPopMatrix ()
1692		2043
1693	void glLoadIdentity ()	2044	void glLoadIdentity ()
		2045
		2046	void glDrawBuffer (int buffer)
		2047
		2048	void glReadBuffer (int buffer)
1694		2049
1695	# near_ and far_ are due to microsofts buggy "c" compiler	2050	# near_ and far_ are due to microsofts buggy "c" compiler
1696	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2051	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1697		2052
1698	# near_ and far_ are due to microsofts buggy "c" compiler	2053	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1728	r *= a;	2083	r *= a;
1729	g *= a;	2084	g *= a;
1730	b *= a;	2085	b *= a;
1731	}	2086	}
1732	// microsoft visual "c" rounds instead of truncating...	2087	// microsoft visual "c" rounds instead of truncating...
1733	glColor4ub (MIN ((int)(r * 256.f), 255),	2088	glColor4f (r, g, b, a);
1734	MIN ((int)(g * 256.f), 255),
1735	MIN ((int)(b * 256.f), 255),
1736	MIN ((int)(a * 256.f), 255));
1737		2089
1738	void glInterleavedArrays (int format, int stride, char *data)	2090	void glInterleavedArrays (int format, int stride, char *data)
1739		2091
1740	void glDrawElements (int mode, int count, int type, char *indices)	2092	void glDrawElements (int mode, int count, int type, char *indices)
1741		2093
…		…
1818		2170
1819	void glEndList ()	2171	void glEndList ()
1820		2172
1821	void glCallList (int list)	2173	void glCallList (int list)
1822		2174
1823

Diff Legend

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