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.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 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	{	495	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	496	opengl_fontmap = pango_opengl_font_map_new ();
426	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);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	498	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429	cairo_fontmap = pango_cairo_font_map_get_default ();
430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431	}	499	}
432		500
433	int	501	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	502	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
435		503
436	void	504	void
437	SDL_Quit ()	505	SDL_Quit ()
438		506
439	void	507	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	514	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	515	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	516	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		517
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	518	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	519	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		520
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		525
458	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
459		531
460	SDL_EnableUNICODE (1);	532	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	533	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		534
463	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	535	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	622	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	623	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	624	break;
553	}	625	}
554		626
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	627	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	628	}
557	}	629	}
558		630
559	int	631	int
560	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)
…		…
574	#ifndef _WIN32	646	#ifndef _WIN32
575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
576	#endif	648	#endif
577		649
578	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
579	add_font (char *file)	680	add_font (char *file)
580	CODE:	681	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	682	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		683
587	void	684	void
588	load_image_inline (SV *image_)	685	load_image_inline (SV *image_)
589	ALIAS:	686	ALIAS:
590	load_image_file = 1	687	load_image_file = 1
…		…
632		729
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	730	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		731
635	assert (surface2->pitch == surface2->w * 4);	732	assert (surface2->pitch == surface2->w * 4);
636		733
		734	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	735	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	736	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	737	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	738	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642	SDL_UnlockSurface (surface2);
643	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)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	740	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	741	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		742	SDL_UnlockSurface (surface2);
646		743
647	SDL_FreeSurface (surface);	744	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	745	SDL_FreeSurface (surface2);
649	}	746	}
650		747
…		…
686	CODE:	783	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	784	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	785	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	786	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690	#endif	787	#endif
691	exit (1);	788	_exit (1);
692		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
693	MODULE = CFClient PACKAGE = CFClient::Font	799	MODULE = CFPlus PACKAGE = CFPlus::Font
694		800
695	CFClient::Font	801	CFPlus::Font
696	new_from_file (SV *class, char *path, int id = 0)	802	new_from_file (SV *class, char *path, int id = 0)
697	CODE:	803	CODE:
698	{	804	{
699	int count;	805	int count;
700	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	806	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
703	}	809	}
704	OUTPUT:	810	OUTPUT:
705	RETVAL	811	RETVAL
706		812
707	void	813	void
708	DESTROY (CFClient::Font self)	814	DESTROY (CFPlus::Font self)
709	CODE:	815	CODE:
710	pango_font_description_free (self);	816	pango_font_description_free (self);
711		817
712	void	818	void
713	make_default (CFClient::Font self)	819	make_default (CFPlus::Font self)
714	CODE:	820	CODE:
715	default_font = self;	821	default_font = self;
716		822
717	MODULE = CFClient PACKAGE = CFClient::Layout	823	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		824
719	CFClient::Layout	825	void
720	new (SV *class, int rgba = 0)	826	reset_glyph_cache ()
721	CODE:	827	CODE:
722	#if _WIN32	828	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	829
724	#endif	830	CFPlus::Layout
725	rgba=1;//D	831	new (SV *class)
		832	CODE:
726	New (0, RETVAL, 1, struct cf_layout);	833	New (0, RETVAL, 1, struct cf_layout);
727		834
728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	835	RETVAL->pl = pango_layout_new (opengl_context);
729	RETVAL->rgba = rgba;
730	RETVAL->r = 1.;	836	RETVAL->r = 1.;
731	RETVAL->g = 1.;	837	RETVAL->g = 1.;
732	RETVAL->b = 1.;	838	RETVAL->b = 1.;
733	RETVAL->a = 1.;	839	RETVAL->a = 1.;
734	RETVAL->base_height = MIN_FONT_HEIGHT;	840	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
738	layout_update_font (RETVAL);	844	layout_update_font (RETVAL);
739	OUTPUT:	845	OUTPUT:
740	RETVAL	846	RETVAL
741		847
742	void	848	void
743	DESTROY (CFClient::Layout self)	849	DESTROY (CFPlus::Layout self)
744	CODE:	850	CODE:
745	g_object_unref (self->pl);	851	g_object_unref (self->pl);
746	Safefree (self);	852	Safefree (self);
747		853
748	int
749	is_rgba (CFClient::Layout self)
750	CODE:
751	RETVAL = self->rgba;
752	OUTPUT:
753	RETVAL
754
755	void	854	void
756	set_text (CFClient::Layout self, SV *text_)	855	set_text (CFPlus::Layout self, SV *text_)
757	CODE:	856	CODE:
758	{	857	{
759	STRLEN textlen;	858	STRLEN textlen;
760	char *text = SvPVutf8 (text_, textlen);	859	char *text = SvPVutf8 (text_, textlen);
761		860
762	pango_layout_set_text (self->pl, text, textlen);	861	pango_layout_set_text (self->pl, text, textlen);
763	}	862	}
764		863
765	void	864	void
766	set_markup (CFClient::Layout self, SV *text_)	865	set_markup (CFPlus::Layout self, SV *text_)
767	CODE:	866	CODE:
768	{	867	{
769	STRLEN textlen;	868	STRLEN textlen;
770	char *text = SvPVutf8 (text_, textlen);	869	char *text = SvPVutf8 (text_, textlen);
771		870
772	pango_layout_set_markup (self->pl, text, textlen);	871	pango_layout_set_markup (self->pl, text, textlen);
773	}	872	}
774		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
775	SV *	959	SV *
776	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
777	CODE:	961	CODE:
778	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779	SvUTF8_on (RETVAL);	963	sv_utf8_decode (RETVAL);
780	OUTPUT:	964	OUTPUT:
781	RETVAL	965	RETVAL
782		966
783	void	967	void
784	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.)
785	CODE:	969	CODE:
786	self->r = r;	970	self->r = r;
787	self->g = g;	971	self->g = g;
788	self->b = b;	972	self->b = b;
789	self->a = a;	973	self->a = a;
790		974
791	void	975	void
792	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793	CODE:	977	CODE:
794	if (self->font != font)	978	if (self->font != font)
795	{	979	{
796	self->font = font;	980	self->font = font;
797	layout_update_font (self);	981	layout_update_font (self);
798	}	982	}
799		983
800	void	984	void
801	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
802	CODE:	986	CODE:
803	if (self->base_height != base_height)	987	if (self->base_height != base_height)
804	{	988	{
805	self->base_height = base_height;	989	self->base_height = base_height;
806	layout_update_font (self);	990	layout_update_font (self);
807	}	991	}
808		992
809	void	993	void
810	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
811	CODE:	995	CODE:
812	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);
813		997
814	void	998	void
815	set_indent (CFClient::Layout self, int indent)	999	set_indent (CFPlus::Layout self, int indent)
816	CODE:	1000	CODE:
817	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818		1002
819	void	1003	void
820	set_spacing (CFClient::Layout self, int spacing)	1004	set_spacing (CFPlus::Layout self, int spacing)
821	CODE:	1005	CODE:
822	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823		1007
824	void	1008	void
825	set_ellipsise (CFClient::Layout self, int ellipsise)	1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
826	CODE:	1010	CODE:
827	pango_layout_set_ellipsize (self->pl,	1011	pango_layout_set_ellipsize (self->pl,
828	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
829	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
831	: PANGO_ELLIPSIZE_NONE	1015	: PANGO_ELLIPSIZE_NONE
832	);	1016	);
833		1017
834	void	1018	void
835	set_single_paragraph_mode (CFClient::Layout self, int spm)	1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
836	CODE:	1020	CODE:
837	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838		1022
839	void	1023	void
840	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
841	PPCODE:	1025	PPCODE:
842	{	1026	{
843	int w, h;	1027	int w, h;
844		1028
845	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
848	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
849	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
850	}	1034	}
851		1035
852	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
853	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
854	CODE:	1050	CODE:
855	{	1051	{
856	int index, trailing;	1052	int index, trailing;
857	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);
858	RETVAL = index;	1054	RETVAL = index;
859	}	1055	}
860	OUTPUT:	1056	OUTPUT:
861	RETVAL	1057	RETVAL
862		1058
863	void	1059	void
864	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
865	PPCODE:	1061	PPCODE:
866	{	1062	{
867	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
868	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869		1065
…		…
872	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874	}	1070	}
875		1071
876	void	1072	void
877	render (CFClient::Layout self)	1073	render (CFPlus::Layout self, float x, float y, int flags = 0)
878	PPCODE:	1074	PPCODE:
879	{	1075	pango_opengl_render_layout_subpixel (
880	SV *retval;	1076	self->pl,
881	int w, h;	1077	x * PANGO_SCALE, y * PANGO_SCALE,
		1078	self->r, self->g, self->b, self->a,
		1079	flags
		1080	);
882		1081
883	layout_get_pixel_size (self, &w, &h);	1082	MODULE = CFPlus PACKAGE = CFPlus::Texture
884		1083
885	if (self->rgba)	1084	void
		1085	pad2pot (SV *data_, SV *w_, SV *h_)
		1086	CODE:
		1087	{
		1088	int ow = SvIV (w_);
		1089	int oh = SvIV (h_);
		1090
		1091	if (ow && oh)
886	{	1092	{
887	cairo_surface_t *surface;	1093	int nw = minpot (ow);
888	cairo_t *cairo;	1094	int nh = minpot (oh);
889		1095
890	retval = newSV (w * h * 4);	1096	if (nw != ow || nh != oh)
891	SvPOK_only (retval);
892	SvCUR_set (retval, w * h * 4);
893
894	memset (SvPVX (retval), 0, w * h * 4);
895
896	surface = cairo_image_surface_create_for_data (
897	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
898	cairo = cairo_create (surface);
899	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901	pango_cairo_show_layout (cairo, self->pl);
902
903	cairo_destroy (cairo);
904	cairo_surface_destroy (surface);
905
906	// what a mess, and its premultiplied, too :(
907	{	1097	{
908	uint32_t *p = (uint32_t *)SvPVX (retval);	1098	if (SvOK (data_))
909	uint32_t *e = p + w * h;
910
911	while (p < e)
912	{	1099	{
913	uint32_t rgba = *p;	1100	STRLEN datalen;
914	rgba = (rgba >> 24) | (rgba << 8);	1101	char *data = SvPVbyte (data_, datalen);
915	#if 0	1102	int bpp = datalen / (ow * oh);
916	#ifdef _WIN32	1103	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
917	{//D
918	uint8_t r = rgba >> 24;
919	uint8_t g = rgba >> 16;
920	uint8_t b = rgba >> 8;
921	uint8_t a = rgba >> 0;
922		1104
923	rgba = (rgba & 0xffffff00) | a;	1105	SvPOK_only (result_);
		1106	SvCUR_set (result_, nw * nh * bpp);
		1107
		1108	memset (SvPVX (result_), 0, nw * nh * bpp);
		1109	while (oh--)
		1110	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1111
		1112	sv_setsv (data_, result_);
924	}	1113	}
925	#endif	1114
926	#endif	1115	sv_setiv (w_, nw);
927	rgba = SDL_SwapBE32 (rgba);	1116	sv_setiv (h_, nh);
928	*p++ = rgba;
929	}	1117	}
930	}
931
932	EXTEND (SP, 5);
933	PUSHs (sv_2mortal (newSViv (w)));
934	PUSHs (sv_2mortal (newSViv (h)));
935	PUSHs (sv_2mortal (retval));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938	}	1118	}
939	else
940	{
941	FT_Bitmap bitmap;
942
943	retval = newSV (w * h);
944	SvPOK_only (retval);
945	SvCUR_set (retval, w * h);
946
947	bitmap.rows = h;
948	bitmap.width = w;
949	bitmap.pitch = w;
950	bitmap.buffer = (unsigned char*)SvPVX (retval);
951	bitmap.num_grays = 256;
952	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954	memset (bitmap.buffer, 0, w * h);
955
956	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958	EXTEND (SP, 5);
959	PUSHs (sv_2mortal (newSViv (w)));
960	PUSHs (sv_2mortal (newSViv (h)));
961	PUSHs (sv_2mortal (retval));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964	}
965	}	1119	}
966		1120
967	MODULE = CFClient PACKAGE = CFClient::Texture
968
969	void	1121	void
970	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1122	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
971	PROTOTYPE: $$$;$$	1123	PROTOTYPE: $$$;$$
972	ALIAS:	1124	ALIAS:
973	draw_quad_alpha = 1	1125	draw_quad_alpha = 1
974	draw_quad_alpha_premultiplied = 2	1126	draw_quad_alpha_premultiplied = 2
975	CODE:	1127	CODE:
…		…
1013	glDisable (GL_ALPHA_TEST);	1165	glDisable (GL_ALPHA_TEST);
1014	glDisable (GL_BLEND);	1166	glDisable (GL_BLEND);
1015	}	1167	}
1016	}	1168	}
1017		1169
1018	MODULE = CFClient PACKAGE = CFClient::Map	1170	MODULE = CFPlus PACKAGE = CFPlus::Map
1019		1171
1020	CFClient::Map	1172	CFPlus::Map
1021	new (SV *class, int map_width, int map_height)	1173	new (SV *class)
1022	CODE:	1174	CODE:
1023	New (0, RETVAL, 1, struct map);	1175	New (0, RETVAL, 1, struct map);
1024	RETVAL->x = 0;	1176	RETVAL->x = 0;
1025	RETVAL->y = 0;	1177	RETVAL->y = 0;
1026	RETVAL->w = map_width;	1178	RETVAL->w = 0;
1027	RETVAL->h = map_height;	1179	RETVAL->h = 0;
1028	RETVAL->ox = 0;	1180	RETVAL->ox = 0;
1029	RETVAL->oy = 0;	1181	RETVAL->oy = 0;
1030	RETVAL->faces = 8192;	1182	RETVAL->faces = 8192;
1031	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1183	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1032	RETVAL->texs = 8192;	1184	RETVAL->texs = 8192;
…		…
1035	RETVAL->row = 0;	1187	RETVAL->row = 0;
1036	OUTPUT:	1188	OUTPUT:
1037	RETVAL	1189	RETVAL
1038		1190
1039	void	1191	void
1040	DESTROY (CFClient::Map self)	1192	DESTROY (CFPlus::Map self)
1041	CODE:	1193	CODE:
1042	{	1194	{
1043	map_clear (self);	1195	map_clear (self);
1044	Safefree (self->face);	1196	Safefree (self->face);
		1197	Safefree (self->tex);
1045	Safefree (self);	1198	Safefree (self);
1046	}	1199	}
1047		1200
1048	void	1201	void
		1202	resize (CFPlus::Map self, int map_width, int map_height)
		1203	CODE:
		1204	self->w = map_width;
		1205	self->h = map_height;
		1206
		1207	void
1049	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
1050	CODE:	1209	CODE:
1051	map_clear (self);	1210	map_clear (self);
1052		1211
1053	void	1212	void
1054	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
1055	CODE:	1214	CODE:
1056	{	1215	{
1057	while (self->faces <= face)	1216	while (self->faces <= face)
1058	{	1217	{
1059	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
1062		1221
1063	self->face [face] = texid;	1222	self->face [face] = texid;
1064	}	1223	}
1065		1224
1066	void	1225	void
1067	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)	1226	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)
1068	CODE:	1227	CODE:
1069	{	1228	{
1070	while (self->texs <= texid)	1229	while (self->texs <= texid)
1071	{	1230	{
1072	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
1096	// from transparent color bleeding and ugly wrapping effects.	1255	// from transparent color bleeding and ugly wrapping effects.
1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1256	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098	}	1257	}
1099		1258
1100	int	1259	int
1101	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
1102	ALIAS:	1261	ALIAS:
1103	oy = 1	1262	oy = 1
1104	x = 2	1263	x = 2
1105	y = 3	1264	y = 3
1106	w = 4	1265	w = 4
…		…
1117	}	1276	}
1118	OUTPUT:	1277	OUTPUT:
1119	RETVAL	1278	RETVAL
1120		1279
1121	void	1280	void
1122	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
1123	CODE:	1282	CODE:
1124	{	1283	{
1125	if (dx > 0)	1284	if (dx > 0)
1126	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
1127	else if (dx < 0)	1286	else if (dx < 0)
1128	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1287	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1129		1288
1130	if (dy > 0)	1289	if (dy > 0)
1131	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
1132	else if (dy < 0)	1291	else if (dy < 0)
1133	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1292	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1134		1293
1135	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
1136	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
1137		1296
1138	while (self->y < 0)	1297	while (self->y < 0)
…		…
1143	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
1144	}	1303	}
1145	}	1304	}
1146		1305
1147	void	1306	void
1148	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1149	CODE:	1308	CODE:
1150	{	1309	{
1151	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1310	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1152	uint8_t *data_end = (uint8_t *)SvEND (data_);	1311	uint8_t *data_end = (uint8_t *)SvEND (data_);
1153	mapcell *cell;	1312	mapcell *cell;
1154	int x, y, flags;	1313	int x, y, flags;
1155		1314
1156	while (data < data_end)	1315	while (data < data_end - 1)
1157	{	1316	{
1158	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
1159		1318
1160	x = ((flags >> 10) & 63) + self->x;	1319	x = self->x + ((flags >> 10) & 63);
1161	y = ((flags >> 4) & 63) + self->y;	1320	y = self->y + ((flags >> 4) & 63);
1162		1321
1163	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
1164		1323
1165	if (flags & 15)	1324	if (flags & 15)
1166	{	1325	{
1167	if (cell->darkness < 0)	1326	if (!cell->darkness)
1168	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
1169	cell->darkness = 0;	1329	cell->darkness = 256;
1170	cell->face [0] = 0;
1171	cell->face [1] = 0;
1172	cell->face [2] = 0;
1173	}	1330	}
1174		1331
1175	cell->darkness = flags & 8 ? *data++ : 255;
1176
1177	//TODO: don't trust server data to be in-range(!)	1332	//TODO: don't trust server data to be in-range(!)
		1333
		1334	if (flags & 8)
		1335	{
		1336	if (extmap)
		1337	{
		1338	uint8_t ext, cmd;
		1339
		1340	do
		1341	{
		1342	ext = *data++;
		1343	cmd = ext & 0x3f;
		1344
		1345	if (cmd < 4)
		1346	cell->darkness = 255 - ext * 64 + 1;
		1347	else if (cmd == 5) // health
		1348	{
		1349	cell->stat_width = 1;
		1350	cell->stat_hp = *data++;
		1351	}
		1352	else if (cmd == 6) // monster width
		1353	cell->stat_width = *data++ + 1;
		1354	else if (cmd == 0x47) // monster width
		1355	{
		1356	if (*data == 4)
		1357	; // decode player tag
		1358
		1359	data += *data + 1;
		1360	}
		1361	else if (cmd == 8) // cell flags
		1362	cell->flags = *data++;
		1363	else if (ext & 0x40) // unknown, multibyte => skip
		1364	data += *data + 1;
		1365	else
		1366	data++;
		1367	}
		1368	while (ext & 0x80);
		1369	}
		1370	else
		1371	cell->darkness = *data++ + 1;
		1372	}
1178		1373
1179	if (flags & 4)	1374	if (flags & 4)
1180	{	1375	{
1181	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1376	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1182	}	1377	}
…		…
1190	{	1385	{
1191	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1386	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1192	}	1387	}
1193	}	1388	}
1194	else	1389	else
1195	cell->darkness = -1;	1390	cell->darkness = 0;
1196	}	1391	}
1197	}	1392	}
1198		1393
1199	SV *	1394	SV *
1200	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1395	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1201	CODE:	1396	CODE:
1202	{	1397	{
1203	int x1, x;	1398	int x1, x;
1204	int y1, y;	1399	int y1, y;
1205	int z;	1400	int z;
…		…
1255	}	1450	}
1256	OUTPUT:	1451	OUTPUT:
1257	RETVAL	1452	RETVAL
1258		1453
1259	void	1454	void
1260	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1455	draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1261	PPCODE:	1456	CODE:
1262	{	1457	{
1263	int vx, vy;
1264	int x, y, z;	1458	int x, y, z;
1265	int last_name;	1459	int last_name;
1266	mapface face;	1460	mapface face;
1267	int sw4 = (sw + 3) & ~3;
1268	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1269	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1270
1271	memset (darkness, 255, sw4 * sh);
1272	SvPOK_only (darkness_sv);
1273	SvCUR_set (darkness_sv, sw4 * sh);
1274
1275	vx = self->x + (self->w - sw) / 2 - shift_x;
1276	vy = self->y + (self->h - sh) / 2 - shift_y;
1277
1278	/*
1279	int vx = self->vx = self->w >= sw
1280	? self->x + (self->w - sw) / 2
1281	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1282
1283	int vy = self->vy = self->h >= sh
1284	? self->y + (self->h - sh) / 2
1285	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1286	*/
1287		1461
1288	glColor4ub (255, 255, 255, 255);	1462	glColor4ub (255, 255, 255, 255);
1289		1463
		1464	glEnable (GL_BLEND);
1290	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1465	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291	glEnable (GL_BLEND);
1292	glEnable (GL_TEXTURE_2D);	1466	glEnable (GL_TEXTURE_2D);
1293	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1467	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294		1468
1295	glBegin (GL_QUADS);	1469	glBegin (GL_QUADS);
1296		1470
1297	last_name = 0;	1471	last_name = 0;
1298		1472
		1473	mx += self->x;
		1474	my += self->y;
		1475
1299	for (z = 0; z < 3; z++)	1476	for (z = 0; z < 3; z++)
1300	for (y = 0; y < sh; y++)	1477	for (y = 0; y < sh; y++)
1301	if (0 <= y + vy && y + vy < self->rows)	1478	if (0 <= y + my && y + my < self->rows)
1302	{	1479	{
1303	maprow *row = self->row + (y + vy);	1480	maprow *row = self->row + (y + my);
1304		1481
1305	for (x = 0; x < sw; x++)	1482	for (x = 0; x < sw; x++)
1306	if (row->c0 <= x + vx && x + vx < row->c1)	1483	if (row->c0 <= x + mx && x + mx < row->c1)
1307	{	1484	{
1308	mapcell *cell = row->col + (x + vx - row->c0);	1485	mapcell *cell = row->col + (x + mx - row->c0);
1309
1310	darkness[y * sw4 + x] = cell->darkness < 0
1311	? 255 - FOW_DARKNESS
1312	: 255 - cell->darkness;
1313		1486
1314	face = cell->face [z];	1487	face = cell->face [z];
1315		1488
1316	if (face)	1489	if (face && face < self->texs)
1317	{	1490	{
1318	maptex tex = self->tex [face];	1491	maptex tex = self->tex [face];
1319
1320	int px = (x + 1) * 32 - tex.w;	1492	int px = (x + 1) * 32 - tex.w;
1321	int py = (y + 1) * 32 - tex.h;	1493	int py = (y + 1) * 32 - tex.h;
1322		1494
1323	if (last_name != tex.name)	1495	if (last_name != tex.name)
1324	{	1496	{
1325	glEnd ();	1497	glEnd ();
1326	last_name = tex.name;
1327	glBindTexture (GL_TEXTURE_2D, last_name);	1498	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1328	glBegin (GL_QUADS);	1499	glBegin (GL_QUADS);
1329	}	1500	}
1330		1501
1331	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1502	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1332	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1503	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1333	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1504	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1334	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1505	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1335	}	1506	}
		1507
		1508	if (cell->flags && z == 2)
		1509	{
		1510	if (cell->flags & 1)
		1511	{
		1512	maptex tex = self->tex [1];
		1513	int px = (x + 1) * 32 - tex.w + 2;
		1514	int py = (y + 1) * 32 - tex.h - 6;
		1515
		1516	glEnd ();
		1517	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1518	glBegin (GL_QUADS);
		1519
		1520	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1521	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1522	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1523	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1524	}
		1525	}
1336	}	1526	}
1337	}	1527	}
1338		1528
1339	glEnd ();	1529	glEnd ();
1340		1530
1341	glDisable (GL_TEXTURE_2D);	1531	glDisable (GL_TEXTURE_2D);
1342	glDisable (GL_BLEND);	1532	glDisable (GL_BLEND);
		1533
		1534	// top layer: overlays such as the health bar
		1535	for (y = 0; y < sh; y++)
		1536	if (0 <= y + my && y + my < self->rows)
		1537	{
		1538	maprow *row = self->row + (y + my);
		1539
		1540	for (x = 0; x < sw; x++)
		1541	if (row->c0 <= x + mx && x + mx < row->c1)
		1542	{
		1543	mapcell *cell = row->col + (x + mx - row->c0);
		1544
		1545	int px = x * 32;
		1546	int py = y * 32;
		1547
		1548	if (cell->stat_hp)
		1549	{
		1550	int width = cell->stat_width * 32;
		1551	int thick = sh / 28 + 1 + cell->stat_width;
		1552
		1553	glColor3ub (0, 0, 0);
		1554	glRectf (px + 1, py - thick - 2,
		1555	px + width - 1, py);
		1556
		1557	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1558	glRectf (px + 2,
		1559	py - thick - 1,
		1560	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1561	}
		1562	}
		1563	}
		1564	}
		1565
		1566	void
		1567	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1568	CODE:
		1569	{
		1570	static float color[16][3] = {
		1571	{ 0.00F, 0.00F, 0.00F },
		1572	{ 1.00F, 1.00F, 1.00F },
		1573	{ 0.00F, 0.00F, 0.55F },
		1574	{ 1.00F, 0.00F, 0.00F },
		1575
		1576	{ 1.00F, 0.54F, 0.00F },
		1577	{ 0.11F, 0.56F, 1.00F },
		1578	{ 0.93F, 0.46F, 0.00F },
		1579	{ 0.18F, 0.54F, 0.34F },
		1580
		1581	{ 0.56F, 0.73F, 0.56F },
		1582	{ 0.80F, 0.80F, 0.80F },
		1583	{ 0.55F, 0.41F, 0.13F },
		1584	{ 0.99F, 0.77F, 0.26F },
		1585
		1586	{ 0.74F, 0.65F, 0.41F },
		1587
		1588	{ 0.00F, 1.00F, 1.00F },
		1589	{ 1.00F, 0.00F, 1.00F },
		1590	{ 1.00F, 1.00F, 0.00F },
		1591	};
		1592
		1593	int x, y;
		1594
		1595	glEnable (GL_TEXTURE_2D);
		1596	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1597	glEnable (GL_BLEND);
		1598	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1599	glBegin (GL_QUADS);
		1600
		1601	for (y = 0; y < h; y++)
		1602	for (x = 0; x < w; x++)
		1603	{
		1604	unsigned char m = data [x + y * w];
		1605
		1606	if (m)
		1607	{
		1608	float *c = color [m & 15];
		1609
		1610	float tx1 = m & 0x40 ? 0.5 : 0.;
		1611	float tx2 = tx1 + 0.5;
		1612
		1613	glColor4f (c[0], c[1], c[2], 0.75);
		1614	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1615	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1616	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1617	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1618	}
		1619	}
		1620
		1621	glEnd ();
		1622	glDisable (GL_BLEND);
		1623	glDisable (GL_TEXTURE_2D);
		1624	}
		1625
		1626	void
		1627	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1628	PPCODE:
		1629	{
		1630	int x, y;
		1631	int sw4 = (sw + 3) & ~3;
		1632	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1633	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1634
		1635	memset (darkness, 255, sw4 * sh);
		1636	SvPOK_only (darkness_sv);
		1637	SvCUR_set (darkness_sv, sw4 * sh);
		1638
		1639	mx += self->x;
		1640	my += self->y;
		1641
		1642	for (y = 0; y < sh; y++)
		1643	if (0 <= y + my && y + my < self->rows)
		1644	{
		1645	maprow *row = self->row + (y + my);
		1646
		1647	for (x = 0; x < sw; x++)
		1648	if (row->c0 <= x + mx && x + mx < row->c1)
		1649	{
		1650	mapcell *cell = row->col + (x + mx - row->c0);
		1651
		1652	darkness[y * sw4 + x] = cell->darkness
		1653	? 255 - (cell->darkness - 1)
		1654	: 255 - FOW_DARKNESS;
		1655	}
		1656	}
1343		1657
1344	EXTEND (SP, 3);	1658	EXTEND (SP, 3);
1345	PUSHs (sv_2mortal (newSViv (sw4)));	1659	PUSHs (sv_2mortal (newSViv (sw4)));
1346	PUSHs (sv_2mortal (newSViv (sh)));	1660	PUSHs (sv_2mortal (newSViv (sh)));
1347	PUSHs (darkness_sv);	1661	PUSHs (darkness_sv);
1348	}	1662	}
1349		1663
1350	SV *	1664	SV *
1351	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1665	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1352	CODE:	1666	CODE:
1353	{	1667	{
1354	int x, y, x1, y1;	1668	int x, y, x1, y1;
1355	SV *data_sv = newSV (w * h * 7 + 5);	1669	SV *data_sv = newSV (w * h * 7 + 5);
1356	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1670	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1418	}	1732	}
1419	OUTPUT:	1733	OUTPUT:
1420	RETVAL	1734	RETVAL
1421		1735
1422	void	1736	void
1423	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1737	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1424	PPCODE:	1738	PPCODE:
1425	{	1739	{
1426	int x, y, z;	1740	int x, y, z;
1427	int w, h;	1741	int w, h;
1428	int x1, y1;	1742	int x1, y1;
…		…
1460		1774
1461	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1775	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1462	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1776	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1463	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1777	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1464		1778
1465	if (cell->darkness <= 0)	1779	if (cell->darkness == 0)
1466	{	1780	{
1467	cell->darkness = -1;	1781	cell->darkness = 0;
1468		1782
1469	for (z = 0; z <= 2; z++)	1783	for (z = 0; z <= 2; z++)
1470	{	1784	{
1471	cell->face[z] = face[z];	1785	cell->face[z] = face[z];
1472		1786
…		…
1477	}	1791	}
1478	}	1792	}
1479	}	1793	}
1480	}	1794	}
1481		1795
1482	MODULE = CFClient PACKAGE = CFClient::MixChunk	1796	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483		1797
1484	CFClient::MixChunk	1798	CFPlus::MixChunk
1485	new_from_file (SV *class, char *path)	1799	new_from_file (SV *class, char *path)
1486	CODE:	1800	CODE:
1487	RETVAL = Mix_LoadWAV (path);	1801	RETVAL = Mix_LoadWAV (path);
1488	OUTPUT:	1802	OUTPUT:
1489	RETVAL	1803	RETVAL
1490		1804
1491	void	1805	void
1492	DESTROY (CFClient::MixChunk self)	1806	DESTROY (CFPlus::MixChunk self)
1493	CODE:	1807	CODE:
1494	Mix_FreeChunk (self);	1808	Mix_FreeChunk (self);
1495		1809
1496	int	1810	int
1497	volume (CFClient::MixChunk self, int volume = -1)	1811	volume (CFPlus::MixChunk self, int volume = -1)
1498	CODE:	1812	CODE:
1499	RETVAL = Mix_VolumeChunk (self, volume);	1813	RETVAL = Mix_VolumeChunk (self, volume);
1500	OUTPUT:	1814	OUTPUT:
1501	RETVAL	1815	RETVAL
1502		1816
1503	int	1817	int
1504	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1818	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1505	CODE:	1819	CODE:
1506	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1820	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507	OUTPUT:	1821	OUTPUT:
1508	RETVAL	1822	RETVAL
1509		1823
1510	MODULE = CFClient PACKAGE = CFClient::MixMusic	1824	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511		1825
1512	int	1826	int
1513	volume (int volume = -1)	1827	volume (int volume = -1)
1514	CODE:	1828	CODE:
1515	RETVAL = Mix_VolumeMusic (volume);	1829	RETVAL = Mix_VolumeMusic (volume);
1516	OUTPUT:	1830	OUTPUT:
1517	RETVAL	1831	RETVAL
1518		1832
1519	CFClient::MixMusic	1833	CFPlus::MixMusic
1520	new_from_file (SV *class, char *path)	1834	new_from_file (SV *class, char *path)
1521	CODE:	1835	CODE:
1522	RETVAL = Mix_LoadMUS (path);	1836	RETVAL = Mix_LoadMUS (path);
1523	OUTPUT:	1837	OUTPUT:
1524	RETVAL	1838	RETVAL
1525		1839
1526	void	1840	void
1527	DESTROY (CFClient::MixMusic self)	1841	DESTROY (CFPlus::MixMusic self)
1528	CODE:	1842	CODE:
1529	Mix_FreeMusic (self);	1843	Mix_FreeMusic (self);
1530		1844
1531	int	1845	int
1532	play (CFClient::MixMusic self, int loops = -1)	1846	play (CFPlus::MixMusic self, int loops = -1)
1533	CODE:	1847	CODE:
1534	RETVAL = Mix_PlayMusic (self, loops);	1848	RETVAL = Mix_PlayMusic (self, loops);
1535	OUTPUT:	1849	OUTPUT:
1536	RETVAL	1850	RETVAL
1537		1851
1538	MODULE = CFClient PACKAGE = CFClient::OpenGL	1852	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539		1853
1540	BOOT:	1854	BOOT:
1541	{	1855	{
1542	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1856	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543	static const struct {	1857	static const struct {
1544	const char *name;	1858	const char *name;
1545	IV iv;	1859	IV iv;
1546	} *civ, const_iv[] = {	1860	} *civ, const_iv[] = {
1547	# define const_iv(name) { # name, (IV)name }	1861	# define const_iv(name) { # name, (IV)name }
…		…
1554	const_iv (GL_SCISSOR_TEST),	1868	const_iv (GL_SCISSOR_TEST),
1555	const_iv (GL_DEPTH_TEST),	1869	const_iv (GL_DEPTH_TEST),
1556	const_iv (GL_ALPHA_TEST),	1870	const_iv (GL_ALPHA_TEST),
1557	const_iv (GL_NORMALIZE),	1871	const_iv (GL_NORMALIZE),
1558	const_iv (GL_RESCALE_NORMAL),	1872	const_iv (GL_RESCALE_NORMAL),
		1873	const_iv (GL_FRONT),
		1874	const_iv (GL_BACK),
1559	const_iv (GL_AND),	1875	const_iv (GL_AND),
1560	const_iv (GL_ONE),	1876	const_iv (GL_ONE),
1561	const_iv (GL_ZERO),	1877	const_iv (GL_ZERO),
1562	const_iv (GL_SRC_ALPHA),	1878	const_iv (GL_SRC_ALPHA),
1563	const_iv (GL_DST_ALPHA),	1879	const_iv (GL_DST_ALPHA),
1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1880	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565	const_iv (GL_ONE_MINUS_DST_ALPHA),	1881	const_iv (GL_ONE_MINUS_DST_ALPHA),
1566	const_iv (GL_SRC_ALPHA_SATURATE),	1882	const_iv (GL_SRC_ALPHA_SATURATE),
1567	const_iv (GL_RGB),	1883	const_iv (GL_RGB),
1568	const_iv (GL_RGBA),	1884	const_iv (GL_RGBA),
		1885	const_iv (GL_RGBA4),
		1886	const_iv (GL_RGBA8),
		1887	const_iv (GL_RGB5_A1),
1569	const_iv (GL_UNSIGNED_BYTE),	1888	const_iv (GL_UNSIGNED_BYTE),
1570	const_iv (GL_UNSIGNED_SHORT),	1889	const_iv (GL_UNSIGNED_SHORT),
1571	const_iv (GL_UNSIGNED_INT),	1890	const_iv (GL_UNSIGNED_INT),
1572	const_iv (GL_ALPHA),	1891	const_iv (GL_ALPHA),
1573	const_iv (GL_INTENSITY),	1892	const_iv (GL_INTENSITY),
…		…
1605	const_iv (GL_SEPARABLE_2D),	1924	const_iv (GL_SEPARABLE_2D),
1606	const_iv (GL_CONVOLUTION_2D),	1925	const_iv (GL_CONVOLUTION_2D),
1607	const_iv (GL_CONVOLUTION_BORDER_MODE),	1926	const_iv (GL_CONVOLUTION_BORDER_MODE),
1608	const_iv (GL_CONSTANT_BORDER),	1927	const_iv (GL_CONSTANT_BORDER),
1609	const_iv (GL_LINES),	1928	const_iv (GL_LINES),
		1929	const_iv (GL_LINE_STRIP),
1610	const_iv (GL_LINE_LOOP),	1930	const_iv (GL_LINE_LOOP),
1611	const_iv (GL_QUADS),	1931	const_iv (GL_QUADS),
1612	const_iv (GL_QUAD_STRIP),	1932	const_iv (GL_QUAD_STRIP),
1613	const_iv (GL_TRIANGLES),	1933	const_iv (GL_TRIANGLES),
1614	const_iv (GL_TRIANGLE_STRIP),	1934	const_iv (GL_TRIANGLE_STRIP),
…		…
1647	OUTPUT:	1967	OUTPUT:
1648	RETVAL	1968	RETVAL
1649		1969
1650	int glGetError ()	1970	int glGetError ()
1651		1971
		1972	void glFinish ()
		1973
1652	void glClear (int mask)	1974	void glClear (int mask)
1653		1975
1654	void glClearColor (float r, float g, float b, float a = 1.0)	1976	void glClearColor (float r, float g, float b, float a = 1.0)
1655	PROTOTYPE: @	1977	PROTOTYPE: @
1656		1978
…		…
1679	void glPushMatrix ()	2001	void glPushMatrix ()
1680		2002
1681	void glPopMatrix ()	2003	void glPopMatrix ()
1682		2004
1683	void glLoadIdentity ()	2005	void glLoadIdentity ()
		2006
		2007	void glDrawBuffer (int buffer)
		2008
		2009	void glReadBuffer (int buffer)
1684		2010
1685	# near_ and far_ are due to microsofts buggy "c" compiler	2011	# near_ and far_ are due to microsofts buggy "c" compiler
1686	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2012	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1687		2013
1688	# near_ and far_ are due to microsofts buggy "c" compiler	2014	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1718	r *= a;	2044	r *= a;
1719	g *= a;	2045	g *= a;
1720	b *= a;	2046	b *= a;
1721	}	2047	}
1722	// microsoft visual "c" rounds instead of truncating...	2048	// microsoft visual "c" rounds instead of truncating...
1723	glColor4ub (MIN ((int)(r * 256.f), 255),	2049	glColor4f (r, g, b, a);
1724	MIN ((int)(g * 256.f), 255),
1725	MIN ((int)(b * 256.f), 255),
1726	MIN ((int)(a * 256.f), 255));
1727		2050
1728	void glInterleavedArrays (int format, int stride, char *data)	2051	void glInterleavedArrays (int format, int stride, char *data)
1729		2052
1730	void glDrawElements (int mode, int count, int type, char *indices)	2053	void glDrawElements (int mode, int count, int type, char *indices)
1731		2054
…		…
1808		2131
1809	void glEndList ()	2132	void glEndList ()
1810		2133
1811	void glCallList (int list)	2134	void glCallList (int list)
1812		2135
1813

Diff Legend

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