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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
		12	#include <math.h>
9	#include <string.h>	13	#include <string.h>
10	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
11		16
12	#include <SDL.h>	17	#include <SDL.h>
		18	#include <SDL_endian.h>
13	#include <SDL_image.h>	19	#include <SDL_image.h>
14	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	21	#include <SDL_opengl.h>
16		22
17	#include <glib/gmacros.h>	23	#include <glib/gmacros.h>
18		24
19	#include <pango/pango.h>	25	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	26	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	27	#include <pango/pangoft2.h>
		28	#include <pango/pangocairo.h>
22		29
23	#ifndef _WIN32	30	#ifndef _WIN32
24	# include <sys/types.h>	31	# include <sys/types.h>
25	# include <sys/socket.h>	32	# include <sys/socket.h>
26	# include <netinet/in.h>	33	# include <netinet/in.h>
33	typedef signed char int8_t;	40	typedef signed char int8_t;
34	typedef signed short int16_t;	41	typedef signed short int16_t;
35	typedef signed int int32_t;	42	typedef signed int int32_t;
36	#endif	43	#endif
37		44
		45	#include "glext.h"
		46
38	#define FOW_DARKNESS 32	47	#define FOW_DARKNESS 32
39		48
40	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
41	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
42		51
		52	#define MIN_FONT_HEIGHT 10
		53
		54	static struct
		55	{
		56	#define GL_FUNC(ptr,name) ptr name;
		57	#include "glfunc.h"
		58	#undef GL_FUNC
		59	} gl;
		60
		61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		62	{
		63	if (gl.BlendFuncSeparate)
		64	gl.BlendFuncSeparate (sa, da, saa, daa);
		65	else if (gl.BlendFuncSeparateEXT)
		66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		67	else
		68	glBlendFunc (sa, da);
		69	}
		70
43	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
44	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
45		73
46	static PangoContext *context;	74	typedef PangoFontDescription *CFClient__Font;
47	static PangoFontMap *fontmap;
48		75
49	typedef struct cf_layout {	76	typedef struct cf_layout {
50	PangoLayout *pl;	77	PangoLayout *pl; // either derived from a cairo or ft2 context
		78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		79	float r, g, b, a; // default color for rgba mode
51	int base_height;	80	int base_height;
		81	CFClient__Font font;
52	} *CFClient__Layout;	82	} *CFClient__Layout;
		83
		84	static CFClient__Font default_font;
		85	static PangoContext ft2_context, cairo_context;
		86	static PangoFontMap ft2_fontmap, cairo_fontmap;
53		87
54	static void	88	static void
55	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
56	{	90	{
57	FcPatternAddBool (pattern, FC_HINTING , 1);	91	FcPatternAddBool (pattern, FC_HINTING, 1);
		92	#ifdef FC_HINT_STYLE
		93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
		95	#ifdef _WIN32
		96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		97	#else
58	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		99	#endif
59	}	100	}
60		101
61	static void	102	static void
62	layout_update (CFClient__Layout self)	103	layout_update_font (CFClient__Layout self)
63	{	104	{
64	/* use a random scale factor to account for unknown descenders, 0.8 works	105	/* use a random scale factor to account for unknown descenders, 0.8 works
65	* reasonably well with bitstream vera	106	* reasonably well with bitstream vera
66	*/	107	*/
67	PangoFontDescription *font = pango_context_get_font_description (context);	108	PangoFontDescription *font = self->font ? self->font : default_font;
68		109
69	int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71	if (pango_font_description_get_size (font) != height)
72	{
73	pango_font_description_set_absolute_size (font, height);	110	pango_font_description_set_absolute_size (font,
74	pango_layout_context_changed (self->pl);	111	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75	}	112
		113	pango_layout_set_font_description (self->pl, font);
76	}	114	}
77		115
78	static void	116	static void
79	layout_get_pixel_size (CFClient__Layout self, int w, int h)	117	layout_get_pixel_size (CFClient__Layout self, int w, int h)
80	{	118	{
81	layout_update (self);
82
83	pango_layout_get_pixel_size (self->pl, w, h);	119	pango_layout_get_pixel_size (self->pl, w, h);
84		120
85	w = (w + 3) & ~3;
86	if (!w) w = 1;	121	if (!w) w = 1;
87	if (!h) h = 1;	122	if (!h) h = 1;
		123
		124	w = (w + 3) & ~3;
88	}	125	}
89		126
90	typedef uint16_t mapface;	127	typedef uint16_t mapface;
91		128
92	typedef struct {	129	typedef struct {
…		…
237	break;	274	break;
238		275
239	row->col[x - row->c0].darkness = -1;	276	row->col[x - row->c0].darkness = -1;
240	}	277	}
241	}	278	}
		279	}
		280
		281	static void
		282	music_finished (void)
		283	{
		284	SDL_UserEvent ev;
		285
		286	ev.type = SDL_USEREVENT;
		287	ev.code = 0;
		288	ev.data1 = 0;
		289	ev.data2 = 0;
		290
		291	SDL_PushEvent ((SDL_Event *)&ev);
		292	}
		293
		294	static void
		295	channel_finished (int channel)
		296	{
		297	SDL_UserEvent ev;
		298
		299	ev.type = SDL_USEREVENT;
		300	ev.code = 1;
		301	ev.data1 = (void *)(long)channel;
		302	ev.data2 = 0;
		303
		304	SDL_PushEvent ((SDL_Event *)&ev);
		305	}
		306
		307	static unsigned int
		308	minpot (unsigned int n)
		309	{
		310	if (!n)
		311	return 0;
		312
		313	--n;
		314
		315	n \|= n >> 1;
		316	n \|= n >> 2;
		317	n \|= n >> 4;
		318	n \|= n >> 8;
		319	n \|= n >> 16;
		320
		321	return n + 1;
242	}	322	}
243		323
244	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
245		325
246	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
354	# undef const_iv	434	# undef const_iv
355	};	435	};
356		436
357	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
358	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		439	}
359		440
		441	NV floor (NV x)
		442
		443	NV ceil (NV x)
		444
		445	void
		446	pango_init ()
		447	CODE:
		448	// delayed, so it can pick up new fonts added by AddFontResourceEx
		449	{
		450	{
360	fontmap = pango_ft2_font_map_new ();	451	ft2_fontmap = pango_ft2_font_map_new ();
361	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
362	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		454	}
		455	{
		456	cairo_font_options_t *fopt = cairo_font_options_create ();
		457	cairo_fontmap = pango_cairo_font_map_get_default ();
		458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		459	#ifdef _WIN32
		460	// cairo looks like shit eaten twice on windows
		461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		462	#else
		463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		464	#endif
		465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		467	pango_cairo_context_set_font_options (cairo_context, fopt);
		468	cairo_font_options_destroy (fopt);
		469	}
363	}	470	}
364		471
365	int	472	int
366	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
367		474
…		…
377	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	484	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
378	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	485	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
379	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	486	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
380	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	487	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
381		488
		489	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		490	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		491
382	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	492	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
383	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
384	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
385	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
386		496
387	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
388	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
389	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
390		498
391	SDL_EnableUNICODE (1);	499	SDL_EnableUNICODE (1);
392	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
393		501
394	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
403		511
404	++m;	512	++m;
405	}	513	}
406	}	514	}
407		515
		516	char *
		517	SDL_GetError ()
		518
408	int	519	int
409	SDL_SetVideoMode (int w, int h, int fullscreen)	520	SDL_SetVideoMode (int w, int h, int fullscreen)
410	CODE:	521	CODE:
411	RETVAL = !!SDL_SetVideoMode (	522	RETVAL = !!SDL_SetVideoMode (
412	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	523	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
413	);	524	);
		525	if (RETVAL)
		526	{
414	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	527	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		528	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		529	# include "glfunc.h"
		530	# undef GL_FUNC
		531	}
415	OUTPUT:	532	OUTPUT:
416	RETVAL	533	RETVAL
417		534
418	void	535	void
419	SDL_GL_SwapBuffers ()	536	SDL_GL_SwapBuffers ()
		537
		538	char *
		539	SDL_GetKeyName (int sym)
420		540
421	void	541	void
422	SDL_PollEvent ()	542	SDL_PollEvent ()
423	PPCODE:	543	PPCODE:
424	{	544	{
…		…
426		546
427	while (SDL_PollEvent (&ev))	547	while (SDL_PollEvent (&ev))
428	{	548	{
429	HV *hv = newHV ();	549	HV *hv = newHV ();
430	hv_store (hv, "type", 4, newSViv (ev.type), 0);	550	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		551
431	switch (ev.type)	552	switch (ev.type)
432	{	553	{
433	case SDL_KEYDOWN:	554	case SDL_KEYDOWN:
434	case SDL_KEYUP:	555	case SDL_KEYUP:
435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	556	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
442	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	563	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
443	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	564	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
444	break;	565	break;
445		566
446	case SDL_MOUSEMOTION:	567	case SDL_MOUSEMOTION:
		568	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		569
447	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	570	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
448	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	571	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
449	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	572	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
450	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	573	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
451	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	574	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
452	break;	575	break;
453		576
454	case SDL_MOUSEBUTTONDOWN:	577	case SDL_MOUSEBUTTONDOWN:
455	case SDL_MOUSEBUTTONUP:	578	case SDL_MOUSEBUTTONUP:
		579	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		580
456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	581	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	582	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	583	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	584	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		585	break;
		586
		587	case SDL_USEREVENT:
		588	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		591	break;
460	}	592	}
461		593
462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
463	}	595	}
464	}	596	}
465		597
466	int	598	int
467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	599	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
		600	POSTCALL:
		601	Mix_HookMusicFinished (music_finished);
		602	Mix_ChannelFinished (channel_finished);
468		603
469	void	604	void
470	Mix_CloseAudio ()	605	Mix_CloseAudio ()
471		606
472	int	607	int
…		…
477	CODE:	612	CODE:
478	#ifndef _WIN32	613	#ifndef _WIN32
479	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	614	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
480	#endif	615	#endif
481		616
482	char *
483	gl_version ()
484	CODE:
485	RETVAL = (char *)glGetString (GL_VERSION);
486	OUTPUT:
487	RETVAL
488
489	char *
490	gl_extensions ()
491	CODE:
492	RETVAL = (char *)glGetString (GL_EXTENSIONS);
493	OUTPUT:
494	RETVAL
495
496	void	617	void
497	add_font (char *file)	618	add_font (char *file)
498	CODE:	619	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
500		621	#ifdef _WIN32
501	void	622	// cairo... sigh... requires win2000
502	set_font (char *file)	623	AddFontResourceEx (file, FR_PRIVATE, 0);
503	CODE:	624	#endif
504	{
505	int count;
506	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
507	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508	FcPatternDestroy (pattern);
509	pango_context_set_font_description (context, font);
510	}
511		625
512	void	626	void
513	load_image_inline (SV *image_)	627	load_image_inline (SV *image_)
514	ALIAS:	628	ALIAS:
515	load_image_file = 1	629	load_image_file = 1
…		…
597	PUSHs (sv_2mortal (newSViv (b / y)));	711	PUSHs (sv_2mortal (newSViv (b / y)));
598	PUSHs (sv_2mortal (newSViv (a / y)));	712	PUSHs (sv_2mortal (newSViv (a / y)));
599	}	713	}
600		714
601	void	715	void
		716	error (char *message)
		717	CODE:
		718	fprintf (stderr, "ERROR: %s\n", message);
		719	#ifdef _WIN32
		720	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		721	#endif
		722
		723	void
602	fatal (char *message)	724	fatal (char *message)
603	CODE:	725	CODE:
		726	fprintf (stderr, "FATAL: %s\n", message);
604	#ifdef _WIN32	727	#ifdef _WIN32
605	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
606	#else
607	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	729	#endif
609	exit (1);	730	_exit (1);
		731
		732	void
		733	_exit (int retval)
		734	CODE:
		735	_exit (retval);
		736
		737	MODULE = CFClient PACKAGE = CFClient::Font
		738
		739	CFClient::Font
		740	new_from_file (SV class, char path, int id = 0)
		741	CODE:
		742	{
		743	int count;
		744	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		745	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		746	FcPatternDestroy (pattern);
		747	}
		748	OUTPUT:
		749	RETVAL
		750
		751	void
		752	DESTROY (CFClient::Font self)
		753	CODE:
		754	pango_font_description_free (self);
		755
		756	void
		757	make_default (CFClient::Font self)
		758	CODE:
		759	default_font = self;
610		760
611	MODULE = CFClient PACKAGE = CFClient::Layout	761	MODULE = CFClient PACKAGE = CFClient::Layout
612		762
613	CFClient::Layout	763	CFClient::Layout
614	new (SV *class, int base_height = 10)	764	new (SV *class, int rgba = 0)
615	CODE:	765	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	766	New (0, RETVAL, 1, struct cf_layout);
617	RETVAL->base_height = base_height;	767
618	RETVAL->pl = pango_layout_new (context);	768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		769	RETVAL->rgba = rgba;
		770	RETVAL->r = 1.;
		771	RETVAL->g = 1.;
		772	RETVAL->b = 1.;
		773	RETVAL->a = 1.;
		774	RETVAL->base_height = MIN_FONT_HEIGHT;
		775	RETVAL->font = 0;
		776
619	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	777	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		778	layout_update_font (RETVAL);
620	OUTPUT:	779	OUTPUT:
621	RETVAL	780	RETVAL
622		781
623	void	782	void
624	DESTROY (CFClient::Layout self)	783	DESTROY (CFClient::Layout self)
625	CODE:	784	CODE:
626	g_object_unref (self->pl);	785	g_object_unref (self->pl);
627	Safefree (self);	786	Safefree (self);
628		787
		788	int
		789	is_rgba (CFClient::Layout self)
		790	CODE:
		791	RETVAL = self->rgba;
		792	OUTPUT:
		793	RETVAL
		794
629	void	795	void
630	set_text (CFClient::Layout self, SV *text_)	796	set_text (CFClient::Layout self, SV *text_)
631	CODE:	797	CODE:
632	{	798	{
633	STRLEN textlen;	799	STRLEN textlen;
…		…
648		814
649	SV *	815	SV *
650	get_text (CFClient::Layout self)	816	get_text (CFClient::Layout self)
651	CODE:	817	CODE:
652	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
653	SvUTF8_on (RETVAL);	819	sv_utf8_decode (RETVAL);
654	OUTPUT:	820	OUTPUT:
655	RETVAL	821	RETVAL
		822
		823	void
		824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		825	CODE:
		826	self->r = r;
		827	self->g = g;
		828	self->b = b;
		829	self->a = a;
		830
		831	void
		832	set_font (CFClient::Layout self, CFClient::Font font = 0)
		833	CODE:
		834	if (self->font != font)
		835	{
		836	self->font = font;
		837	layout_update_font (self);
		838	}
656		839
657	void	840	void
658	set_height (CFClient::Layout self, int base_height)	841	set_height (CFClient::Layout self, int base_height)
659	CODE:	842	CODE:
		843	if (self->base_height != base_height)
		844	{
660	self->base_height = base_height;	845	self->base_height = base_height;
		846	layout_update_font (self);
		847	}
661		848
662	void	849	void
663	set_width (CFClient::Layout self, int max_width = -1)	850	set_width (CFClient::Layout self, int max_width = -1)
664	CODE:	851	CODE:
665	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	852	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
		853
		854	void
		855	set_indent (CFClient::Layout self, int indent)
		856	CODE:
		857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		858
		859	void
		860	set_spacing (CFClient::Layout self, int spacing)
		861	CODE:
		862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		863
		864	void
		865	set_ellipsise (CFClient::Layout self, int ellipsise)
		866	CODE:
		867	pango_layout_set_ellipsize (self->pl,
		868	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		871	: PANGO_ELLIPSIZE_NONE
		872	);
		873
		874	void
		875	set_single_paragraph_mode (CFClient::Layout self, int spm)
		876	CODE:
		877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
666		878
667	void	879	void
668	size (CFClient::Layout self)	880	size (CFClient::Layout self)
669	PPCODE:	881	PPCODE:
670	{	882	{
671	int w, h;	883	int w, h;
672		884
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	885	layout_get_pixel_size (self, &w, &h);
675		886
676	EXTEND (SP, 2);	887	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	888	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	889	PUSHs (sv_2mortal (newSViv (h)));
…		…
681	int	892	int
682	xy_to_index (CFClient::Layout self, int x, int y)	893	xy_to_index (CFClient::Layout self, int x, int y)
683	CODE:	894	CODE:
684	{	895	{
685	int index, trailing;	896	int index, trailing;
686
687	layout_update (self);
688	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690	RETVAL = index;	898	RETVAL = index;
691	}	899	}
692	OUTPUT:	900	OUTPUT:
693	RETVAL	901	RETVAL
694		902
695	void	903	void
696	cursor_pos (CFClient::Layout self, int index)	904	cursor_pos (CFClient::Layout self, int index)
697	PPCODE:	905	PPCODE:
698	{	906	{
699	PangoRectangle strong_pos;	907	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	908	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		909
703	EXTEND (SP, 3);	910	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	911	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
710	render (CFClient::Layout self)	917	render (CFClient::Layout self)
711	PPCODE:	918	PPCODE:
712	{	919	{
713	SV *retval;	920	SV *retval;
714	int w, h;	921	int w, h;
715	FT_Bitmap bitmap;
716		922
717	layout_update (self);
718	layout_get_pixel_size (self, &w, &h);	923	layout_get_pixel_size (self, &w, &h);
719		924
		925	if (self->rgba)
		926	{
		927	cairo_surface_t *surface;
		928	cairo_t *cairo;
		929
		930	retval = newSV (w * h * 4);
		931	SvPOK_only (retval);
		932	SvCUR_set (retval, w * h * 4);
		933
		934	memset (SvPVX (retval), 0, w * h * 4);
		935
		936	surface = cairo_image_surface_create_for_data (
		937	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		938	cairo = cairo_create (surface);
		939	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		940
		941	pango_cairo_show_layout (cairo, self->pl);
		942
		943	cairo_destroy (cairo);
		944	cairo_surface_destroy (surface);
		945
		946	// what a mess, and its premultiplied, too :(
		947	{
		948	uint32_t p = (uint32_t )SvPVX (retval);
		949	uint32_t e = p + w h;
		950
		951	while (p < e)
		952	{
		953	uint32_t rgba = *p;
		954	rgba = (rgba >> 24) \| (rgba << 8);
		955	#if 0
		956	#ifdef _WIN32
		957	{//D
		958	uint8_t r = rgba >> 24;
		959	uint8_t g = rgba >> 16;
		960	uint8_t b = rgba >> 8;
		961	uint8_t a = rgba >> 0;
		962
		963	rgba = (rgba & 0xffffff00) \| a;
		964	}
		965	#endif
		966	#endif
		967	rgba = SDL_SwapBE32 (rgba);
		968	*p++ = rgba;
		969	}
		970	}
		971
		972	EXTEND (SP, 5);
		973	PUSHs (sv_2mortal (newSViv (w)));
		974	PUSHs (sv_2mortal (newSViv (h)));
		975	PUSHs (sv_2mortal (retval));
		976	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		977	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		978	}
		979	else
		980	{
		981	FT_Bitmap bitmap;
		982
720	retval = newSV (w * h);	983	retval = newSV (w * h);
721	SvPOK_only (retval);	984	SvPOK_only (retval);
722	SvCUR_set (retval, w * h);	985	SvCUR_set (retval, w * h);
723		986
724	bitmap.rows = h;	987	bitmap.rows = h;
725	bitmap.width = w;	988	bitmap.width = w;
726	bitmap.pitch = w;	989	bitmap.pitch = w;
727	bitmap.buffer = (unsigned char*)SvPVX (retval);	990	bitmap.buffer = (unsigned char*)SvPVX (retval);
728	bitmap.num_grays = 256;	991	bitmap.num_grays = 256;
729	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	992	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730		993
731	memset (bitmap.buffer, 0, w * h);	994	memset (bitmap.buffer, 0, w * h);
732		995
733	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	996	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
734		997
735	EXTEND (SP, 3);	998	EXTEND (SP, 5);
736	PUSHs (sv_2mortal (newSViv (w)));	999	PUSHs (sv_2mortal (newSViv (w)));
737	PUSHs (sv_2mortal (newSViv (h)));	1000	PUSHs (sv_2mortal (newSViv (h)));
738	PUSHs (sv_2mortal (retval));	1001	PUSHs (sv_2mortal (retval));
		1002	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		1003	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		1004	}
739	}	1005	}
740		1006
741	MODULE = CFClient PACKAGE = CFClient::Texture	1007	MODULE = CFClient PACKAGE = CFClient::Texture
742		1008
743	void	1009	void
		1010	pad2pot (SV data_, SV w_, SV *h_)
		1011	CODE:
		1012	{
		1013	int ow = SvIV (w_);
		1014	int oh = SvIV (h_);
		1015
		1016	if (ow && oh)
		1017	{
		1018	int nw = minpot (ow);
		1019	int nh = minpot (oh);
		1020
		1021	if (nw != ow \|\| nh != oh)
		1022	{
		1023	if (SvOK (data_))
		1024	{
		1025	STRLEN datalen;
		1026	char *data = SvPVbyte (data_, datalen);
		1027	int bpp = datalen / (ow * oh);
		1028	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1029
		1030	SvPOK_only (result_);
		1031	SvCUR_set (result_, nw * nh * bpp);
		1032
		1033	memset (SvPVX (result_), 0, nw * nh * bpp);
		1034	while (oh--)
		1035	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1036
		1037	sv_setsv (data_, result_);
		1038	}
		1039
		1040	sv_setiv (w_, nw);
		1041	sv_setiv (h_, nh);
		1042	}
		1043	}
		1044	}
		1045
		1046	void
744	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1047	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
745	PROTOTYPE: $$$;$$	1048	PROTOTYPE: $$$;$$
		1049	ALIAS:
		1050	draw_quad_alpha = 1
		1051	draw_quad_alpha_premultiplied = 2
746	CODE:	1052	CODE:
747	{	1053	{
748	HV hv = (HV )SvRV (self);	1054	HV hv = (HV )SvRV (self);
749	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1055	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1056	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
751	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1057	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
752	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
753		1058
754	if (items < 5)	1059	if (items < 5)
755	{	1060	{
756	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1061	w = SvNV (*hv_fetch (hv, "w", 1, 1));
757	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1062	h = SvNV (*hv_fetch (hv, "h", 1, 1));
758	}	1063	}
759		1064
		1065	if (ix)
		1066	{
		1067	glEnable (GL_BLEND);
		1068
		1069	if (ix == 2)
		1070	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1071	else
		1072	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1073	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1074
		1075	glEnable (GL_ALPHA_TEST);
		1076	glAlphaFunc (GL_GREATER, 0.01f);
		1077	}
		1078
760	glBindTexture (GL_TEXTURE_2D, name);	1079	glBindTexture (GL_TEXTURE_2D, name);
761	if (wrap_mode) {	1080
762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764	}
765	glBegin (GL_QUADS);	1081	glBegin (GL_QUADS);
766	glTexCoord2f (0, 0); glVertex2f (x , y );	1082	glTexCoord2f (0, 0); glVertex2f (x , y );
767	glTexCoord2f (0, t); glVertex2f (x , y + h);	1083	glTexCoord2f (0, t); glVertex2f (x , y + h);
768	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1084	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1085	glTexCoord2f (s, 0); glVertex2f (x + w, y );
770	glEnd ();	1086	glEnd ();
		1087
		1088	if (ix)
		1089	{
		1090	glDisable (GL_ALPHA_TEST);
		1091	glDisable (GL_BLEND);
		1092	}
771	}	1093	}
772		1094
773	MODULE = CFClient PACKAGE = CFClient::Map	1095	MODULE = CFClient PACKAGE = CFClient::Map
774		1096
775	CFClient::Map	1097	CFClient::Map
…		…
795	DESTROY (CFClient::Map self)	1117	DESTROY (CFClient::Map self)
796	CODE:	1118	CODE:
797	{	1119	{
798	map_clear (self);	1120	map_clear (self);
799	Safefree (self->face);	1121	Safefree (self->face);
		1122	Safefree (self->tex);
800	Safefree (self);	1123	Safefree (self);
801	}	1124	}
802		1125
803	void	1126	void
804	clear (CFClient::Map self)	1127	clear (CFClient::Map self)
…		…
839	tex->r = r;	1162	tex->r = r;
840	tex->g = g;	1163	tex->g = g;
841	tex->b = b;	1164	tex->b = b;
842	tex->a = a;	1165	tex->a = a;
843	}	1166	}
		1167
		1168	// somewhat hackish, but for textures that require it, it really
		1169	// improves the look, and most others don't suffer.
		1170	glBindTexture (GL_TEXTURE_2D, name);
		1171	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1172	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1173	// use uglier nearest interpolation because linear suffers
		1174	// from transparent color bleeding and ugly wrapping effects.
		1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
844	}	1176	}
845		1177
846	int	1178	int
847	ox (CFClient::Map self)	1179	ox (CFClient::Map self)
848	ALIAS:	1180	ALIAS:
849	oy = 1	1181	oy = 1
		1182	x = 2
		1183	y = 3
		1184	w = 4
		1185	h = 5
850	CODE:	1186	CODE:
851	switch (ix)	1187	switch (ix)
852	{	1188	{
853	case 0: RETVAL = self->ox; break;	1189	case 0: RETVAL = self->ox; break;
854	case 1: RETVAL = self->oy; break;	1190	case 1: RETVAL = self->oy; break;
		1191	case 2: RETVAL = self->x; break;
		1192	case 3: RETVAL = self->y; break;
		1193	case 4: RETVAL = self->w; break;
		1194	case 5: RETVAL = self->h; break;
855	}	1195	}
856	OUTPUT:	1196	OUTPUT:
857	RETVAL	1197	RETVAL
858		1198
859	void	1199	void
…		…
933	cell->darkness = -1;	1273	cell->darkness = -1;
934	}	1274	}
935	}	1275	}
936		1276
937	SV *	1277	SV *
938	mapmap (CFClient::Map self, int w, int h)	1278	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
939	CODE:	1279	CODE:
940	{	1280	{
941	int x0, x1, x;	1281	int x1, x;
942	int y0, y1, y;	1282	int y1, y;
943	int z;	1283	int z;
944	SV map_sv = newSV (w h * sizeof (uint32_t));	1284	SV map_sv = newSV (w h * sizeof (uint32_t));
945	uint32_t map = (uint32_t )SvPVX (map_sv);	1285	uint32_t map = (uint32_t )SvPVX (map_sv);
946		1286
947	SvPOK_only (map_sv);	1287	SvPOK_only (map_sv);
948	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	1288	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949		1289
950	x0 = self->x - w / 2; x1 = x0 + w;	1290	x0 += self->x; x1 = x0 + w;
951	y0 = self->y - h / 2; y1 = y0 + h;	1291	y0 += self->y; y1 = y0 + h;
952		1292
953	for (y = y0; y < y1; y++)	1293	for (y = y0; y < y1; y++)
954	{	1294	{
955	maprow *row = 0 <= y && y < self->rows	1295	maprow *row = 0 <= y && y < self->rows
956	? self->row + y	1296	? self->row + y
…		…
994	OUTPUT:	1334	OUTPUT:
995	RETVAL	1335	RETVAL
996		1336
997	void	1337	void
998	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1338	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
999	PPCODE:	1339	CODE:
1000	{	1340	{
1001	int vx, vy;	1341	int vx, vy;
1002	int x, y, z;	1342	int x, y, z;
1003	int last_name;	1343	int last_name;
1004	mapface face;	1344	mapface face;
1005	int sw4 = (sw + 3) & ~3;
1006	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1007	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1008		1345
1009	memset (darkness, 255, sw4 * sh);
1010	SvPOK_only (darkness_sv);
1011	SvCUR_set (darkness_sv, sw4 * sh);
1012
1013	vx = self->x + (self->w - sw) / 2 - shift_x;	1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1014	vy = self->y + (self->h - sh) / 2 - shift_y;	1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1015		1348
1016	/*	1349	/*
1017	int vx = self->vx = self->w >= sw	1350	int vx = self->vx = self->w >= sw
1018	? self->x + (self->w - sw) / 2	1351	? self->x + (self->w - sw) / 2
1019	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1042		1375
1043	for (x = 0; x < sw; x++)	1376	for (x = 0; x < sw; x++)
1044	if (row->c0 <= x + vx && x + vx < row->c1)	1377	if (row->c0 <= x + vx && x + vx < row->c1)
1045	{	1378	{
1046	mapcell *cell = row->col + (x + vx - row->c0);	1379	mapcell *cell = row->col + (x + vx - row->c0);
1047
1048	darkness[y * sw4 + x] = cell->darkness < 0
1049	? 255 - FOW_DARKNESS
1050	: 255 - cell->darkness;
1051		1380
1052	face = cell->face [z];	1381	face = cell->face [z];
1053		1382
1054	if (face)	1383	if (face)
1055	{	1384	{
…		…
1076		1405
1077	glEnd ();	1406	glEnd ();
1078		1407
1079	glDisable (GL_TEXTURE_2D);	1408	glDisable (GL_TEXTURE_2D);
1080	glDisable (GL_BLEND);	1409	glDisable (GL_BLEND);
		1410	}
		1411
		1412	void
		1413	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1414	PPCODE:
		1415	{
		1416	int vx, vy;
		1417	int x, y;
		1418	int sw4 = (sw + 3) & ~3;
		1419	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1420	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1421
		1422	memset (darkness, 255, sw4 * sh);
		1423	SvPOK_only (darkness_sv);
		1424	SvCUR_set (darkness_sv, sw4 * sh);
		1425
		1426	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1427	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1428
		1429	for (y = 0; y < sh; y++)
		1430	if (0 <= y + vy && y + vy < self->rows)
		1431	{
		1432	maprow *row = self->row + (y + vy);
		1433
		1434	for (x = 0; x < sw; x++)
		1435	if (row->c0 <= x + vx && x + vx < row->c1)
		1436	{
		1437	mapcell *cell = row->col + (x + vx - row->c0);
		1438
		1439	darkness[y * sw4 + x] = cell->darkness < 0
		1440	? 255 - FOW_DARKNESS
		1441	: 255 - cell->darkness;
		1442	}
		1443	}
1081		1444
1082	EXTEND (SP, 3);	1445	EXTEND (SP, 3);
1083	PUSHs (sv_2mortal (newSViv (sw4)));	1446	PUSHs (sv_2mortal (newSViv (sw4)));
1084	PUSHs (sv_2mortal (newSViv (sh)));	1447	PUSHs (sv_2mortal (newSViv (sh)));
1085	PUSHs (darkness_sv);	1448	PUSHs (darkness_sv);
…		…
1096	data++ = 0; / version 0 format */	1459	data++ = 0; / version 0 format */
1097	data++ = w >> 8; data++ = w;	1460	data++ = w >> 8; data++ = w;
1098	data++ = h >> 8; data++ = h;	1461	data++ = h >> 8; data++ = h;
1099		1462
1100	// we need to do this 'cause we don't keep an absolute coord system for rows	1463	// we need to do this 'cause we don't keep an absolute coord system for rows
1101	// TODO: treat rows as we treat	1464	// TODO: treat rows as we treat columns
1102	map_get_row (self, y0 + self->y - self->oy);//D	1465	map_get_row (self, y0 + self->y - self->oy);//D
1103	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1466	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104		1467
1105	x0 += self->x - self->ox;	1468	x0 += self->x - self->ox;
1106	y0 += self->y - self->oy;	1469	y0 += self->y - self->oy;
…		…
1170		1533
1171	w = data++ << 8; w \|= data++;	1534	w = data++ << 8; w \|= data++;
1172	h = data++ << 8; h \|= data++;	1535	h = data++ << 8; h \|= data++;
1173		1536
1174	// we need to do this 'cause we don't keep an absolute coord system for rows	1537	// we need to do this 'cause we don't keep an absolute coord system for rows
1175	// TODO: treat rows as we treat	1538	// TODO: treat rows as we treat columns
1176	map_get_row (self, y0 + self->y - self->oy);//D	1539	map_get_row (self, y0 + self->y - self->oy);//D
1177	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1540	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178		1541
1179	x0 += self->x - self->ox;	1542	x0 += self->x - self->ox;
1180	y0 += self->y - self->oy;	1543	y0 += self->y - self->oy;
…		…
1284	} *civ, const_iv[] = {	1647	} *civ, const_iv[] = {
1285	# define const_iv(name) { # name, (IV)name }	1648	# define const_iv(name) { # name, (IV)name }
1286	const_iv (GL_COLOR_MATERIAL),	1649	const_iv (GL_COLOR_MATERIAL),
1287	const_iv (GL_SMOOTH),	1650	const_iv (GL_SMOOTH),
1288	const_iv (GL_FLAT),	1651	const_iv (GL_FLAT),
		1652	const_iv (GL_DITHER),
1289	const_iv (GL_BLEND),	1653	const_iv (GL_BLEND),
		1654	const_iv (GL_CULL_FACE),
		1655	const_iv (GL_SCISSOR_TEST),
		1656	const_iv (GL_DEPTH_TEST),
		1657	const_iv (GL_ALPHA_TEST),
		1658	const_iv (GL_NORMALIZE),
		1659	const_iv (GL_RESCALE_NORMAL),
1290	const_iv (GL_AND),	1660	const_iv (GL_AND),
		1661	const_iv (GL_ONE),
		1662	const_iv (GL_ZERO),
1291	const_iv (GL_SRC_ALPHA),	1663	const_iv (GL_SRC_ALPHA),
		1664	const_iv (GL_DST_ALPHA),
1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1665	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1666	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1667	const_iv (GL_SRC_ALPHA_SATURATE),
1293	const_iv (GL_RGB),	1668	const_iv (GL_RGB),
1294	const_iv (GL_RGBA),	1669	const_iv (GL_RGBA),
		1670	const_iv (GL_RGBA4),
		1671	const_iv (GL_RGBA8),
		1672	const_iv (GL_RGB5_A1),
1295	const_iv (GL_UNSIGNED_BYTE),	1673	const_iv (GL_UNSIGNED_BYTE),
1296	const_iv (GL_ALPHA4),	1674	const_iv (GL_UNSIGNED_SHORT),
		1675	const_iv (GL_UNSIGNED_INT),
1297	const_iv (GL_ALPHA),	1676	const_iv (GL_ALPHA),
		1677	const_iv (GL_INTENSITY),
		1678	const_iv (GL_LUMINANCE),
		1679	const_iv (GL_LUMINANCE_ALPHA),
1298	const_iv (GL_FLOAT),	1680	const_iv (GL_FLOAT),
1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1681	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300	const_iv (GL_COMPILE),	1682	const_iv (GL_COMPILE),
1301	const_iv (GL_TEXTURE_1D),	1683	const_iv (GL_TEXTURE_1D),
1302	const_iv (GL_TEXTURE_2D),	1684	const_iv (GL_TEXTURE_2D),
…		…
1304	const_iv (GL_TEXTURE_MAG_FILTER),	1686	const_iv (GL_TEXTURE_MAG_FILTER),
1305	const_iv (GL_TEXTURE_MIN_FILTER),	1687	const_iv (GL_TEXTURE_MIN_FILTER),
1306	const_iv (GL_TEXTURE_ENV_MODE),	1688	const_iv (GL_TEXTURE_ENV_MODE),
1307	const_iv (GL_TEXTURE_WRAP_S),	1689	const_iv (GL_TEXTURE_WRAP_S),
1308	const_iv (GL_TEXTURE_WRAP_T),	1690	const_iv (GL_TEXTURE_WRAP_T),
		1691	const_iv (GL_REPEAT),
1309	const_iv (GL_CLAMP),	1692	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1693	const_iv (GL_CLAMP_TO_EDGE),
1311	const_iv (GL_NEAREST),	1694	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1695	const_iv (GL_LINEAR),
		1696	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1697	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1698	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1699	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1700	const_iv (GL_GENERATE_MIPMAP),
1313	const_iv (GL_MODULATE),	1701	const_iv (GL_MODULATE),
		1702	const_iv (GL_DECAL),
1314	const_iv (GL_REPLACE),	1703	const_iv (GL_REPLACE),
		1704	const_iv (GL_DEPTH_BUFFER_BIT),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1705	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1706	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1707	const_iv (GL_MODELVIEW),
1318	const_iv (GL_COLOR_LOGIC_OP),	1708	const_iv (GL_COLOR_LOGIC_OP),
		1709	const_iv (GL_SEPARABLE_2D),
1319	const_iv (GL_CONVOLUTION_2D),	1710	const_iv (GL_CONVOLUTION_2D),
1320	const_iv (GL_CONVOLUTION_BORDER_MODE),	1711	const_iv (GL_CONVOLUTION_BORDER_MODE),
1321	const_iv (GL_CONSTANT_BORDER),	1712	const_iv (GL_CONSTANT_BORDER),
1322	const_iv (GL_LINES),	1713	const_iv (GL_LINES),
		1714	const_iv (GL_LINE_LOOP),
1323	const_iv (GL_QUADS),	1715	const_iv (GL_QUADS),
		1716	const_iv (GL_QUAD_STRIP),
		1717	const_iv (GL_TRIANGLES),
		1718	const_iv (GL_TRIANGLE_STRIP),
		1719	const_iv (GL_TRIANGLE_FAN),
1324	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1720	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325	const_iv (GL_FASTEST),	1721	const_iv (GL_FASTEST),
		1722	const_iv (GL_V2F),
		1723	const_iv (GL_V3F),
		1724	const_iv (GL_T2F_V3F),
		1725	const_iv (GL_T2F_N3F_V3F),
1326	# undef const_iv	1726	# undef const_iv
1327	};	1727	};
1328		1728
1329	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1729	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1330	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1730	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1331	}	1731	}
1332		1732
		1733	char *
		1734	gl_vendor ()
		1735	CODE:
		1736	RETVAL = (char *)glGetString (GL_VENDOR);
		1737	OUTPUT:
		1738	RETVAL
		1739
		1740	char *
		1741	gl_version ()
		1742	CODE:
		1743	RETVAL = (char *)glGetString (GL_VERSION);
		1744	OUTPUT:
		1745	RETVAL
		1746
		1747	char *
		1748	gl_extensions ()
		1749	CODE:
		1750	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1751	OUTPUT:
		1752	RETVAL
		1753
1333	int glGetError ()	1754	int glGetError ()
		1755
		1756	void glFinish ()
1334		1757
1335	void glClear (int mask)	1758	void glClear (int mask)
1336		1759
1337	void glClearColor (float r, float g, float b, float a = 1.0)	1760	void glClearColor (float r, float g, float b, float a = 1.0)
1338	PROTOTYPE: @	1761	PROTOTYPE: @
…		…
1345		1768
1346	void glHint (int target, int mode)	1769	void glHint (int target, int mode)
1347		1770
1348	void glBlendFunc (int sfactor, int dfactor)	1771	void glBlendFunc (int sfactor, int dfactor)
1349		1772
		1773	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1774	CODE:
		1775	gl_BlendFuncSeparate (sa, da, saa, daa);
		1776
		1777	void glDepthMask (int flag)
		1778
1350	void glLogicOp (int opcode)	1779	void glLogicOp (int opcode)
1351		1780
		1781	void glColorMask (int red, int green, int blue, int alpha)
		1782
1352	void glMatrixMode (int mode)	1783	void glMatrixMode (int mode)
1353		1784
1354	void glPushMatrix ()	1785	void glPushMatrix ()
1355		1786
1356	void glPopMatrix ()	1787	void glPopMatrix ()
1357		1788
1358	void glLoadIdentity ()	1789	void glLoadIdentity ()
1359		1790
		1791	# near_ and far_ are due to microsofts buggy "c" compiler
		1792	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1793
		1794	# near_ and far_ are due to microsofts buggy "c" compiler
1360	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1795	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1361		1796
1362	void glViewport (int x, int y, int width, int height)	1797	void glViewport (int x, int y, int width, int height)
		1798
		1799	void glScissor (int x, int y, int width, int height)
1363		1800
1364	void glTranslate (float x, float y, float z = 0.)	1801	void glTranslate (float x, float y, float z = 0.)
1365	CODE:	1802	CODE:
1366	glTranslatef (x, y, z);	1803	glTranslatef (x, y, z);
1367		1804
1368	void glScale (float x, float y, float z)	1805	void glScale (float x, float y, float z = 1.)
1369	CODE:	1806	CODE:
1370	glScalef (x, y, z);	1807	glScalef (x, y, z);
1371		1808
1372	void glRotate (float angle, float x, float y, float z)	1809	void glRotate (float angle, float x, float y, float z)
1373	CODE:	1810	CODE:
…		…
1377		1814
1378	void glEnd ()	1815	void glEnd ()
1379		1816
1380	void glColor (float r, float g, float b, float a = 1.0)	1817	void glColor (float r, float g, float b, float a = 1.0)
1381	PROTOTYPE: @	1818	PROTOTYPE: @
		1819	ALIAS:
		1820	glColor_premultiply = 1
1382	CODE:	1821	CODE:
1383	glColor4f (r, g, b, a);	1822	if (ix)
		1823	{
		1824	r *= a;
		1825	g *= a;
		1826	b *= a;
		1827	}
		1828	// microsoft visual "c" rounds instead of truncating...
		1829	glColor4ub (MIN ((int)(r * 256.f), 255),
		1830	MIN ((int)(g * 256.f), 255),
		1831	MIN ((int)(b * 256.f), 255),
		1832	MIN ((int)(a * 256.f), 255));
		1833
		1834	void glInterleavedArrays (int format, int stride, char *data)
		1835
		1836	void glDrawElements (int mode, int count, int type, char *indices)
		1837
		1838	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1839
		1840	void glRasterPos (float x, float y, float z = 0.)
		1841	CODE:
		1842	glRasterPos3f (0, 0, z);
		1843	glBitmap (0, 0, 0, 0, x, y, 0);
1384		1844
1385	void glVertex (float x, float y, float z = 0.)	1845	void glVertex (float x, float y, float z = 0.)
1386	CODE:	1846	CODE:
1387	glVertex3f (x, y, z);	1847	glVertex3f (x, y, z);
1388		1848
…		…
1400		1860
1401	void glBindTexture (int target, int name)	1861	void glBindTexture (int target, int name)
1402		1862
1403	void glConvolutionParameter (int target, int pname, float params)	1863	void glConvolutionParameter (int target, int pname, float params)
1404	CODE:	1864	CODE:
		1865	if (gl.ConvolutionParameterf)
1405	glConvolutionParameterf (target, pname, params);	1866	gl.ConvolutionParameterf (target, pname, params);
1406		1867
1407	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1868	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1869	CODE:
		1870	if (gl.ConvolutionFilter2D)
		1871	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		1872
		1873	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1874	CODE:
		1875	if (gl.SeparableFilter2D)
		1876	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1408		1877
1409	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1878	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1410		1879
1411	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1880	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1881
		1882	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		1883
		1884	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1412		1885
1413	int glGenTexture ()	1886	int glGenTexture ()
1414	CODE:	1887	CODE:
1415	{	1888	{
1416	GLuint name;	1889	GLuint name;
…		…
1441		1914
1442	void glEndList ()	1915	void glEndList ()
1443		1916
1444	void glCallList (int list)	1917	void glCallList (int list)
1445		1918
		1919

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs. Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC