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.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

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