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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.59 by root, Sun Apr 23 04:41:33 2006 UTC vs.
Revision 1.100 by root, Wed May 31 17:16:47 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>
11		15
12	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
13	#include <SDL_image.h>	18	#include <SDL_image.h>
14	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
16		21
17	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
18		23
19	#include <pango/pango.h>	24	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
22		28
23	#ifndef _WIN32	29	#ifndef _WIN32
24	# include <sys/types.h>	30	# include <sys/types.h>
25	# include <sys/socket.h>	31	# include <sys/socket.h>
26	# include <netinet/in.h>	32	# include <netinet/in.h>
40	#define FOW_DARKNESS 32	46	#define FOW_DARKNESS 32
41		47
42	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
44		50
45	#define MIN_FONT_HEIGHT 8 * PANGO_SCALE	51	#define MIN_FONT_HEIGHT 10
		52
		53	#define GL_CALL(type,func,args) \
		54	{ \
		55	static int init_; \
		56	static type fptr_; \
		57	\
		58	if (!init_) \
		59	{ \
		60	init_ = 1; \
		61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		62	} \
		63	\
		64	if (fptr_) \
		65	fptr_ args; \
		66	}
46		67
47	typedef Mix_Chunk *CFClient__MixChunk;	68	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
49		70
50	static PangoContext *context;	71	typedef PangoFontDescription *CFClient__Font;
51	static PangoFontMap *fontmap;
52		72
53	typedef struct cf_layout {	73	typedef struct cf_layout {
54	PangoLayout *pl;	74	PangoLayout *pl; // either derived from a cairo or ft2 context
		75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		76	float r, g, b, a; // default color for rgba mode
55	int base_height;	77	int base_height;
		78	CFClient__Font font;
56	} *CFClient__Layout;	79	} *CFClient__Layout;
		80
		81	static CFClient__Font default_font;
		82	static PangoContext ft2_context, cairo_context;
		83	static PangoFontMap ft2_fontmap, cairo_fontmap;
57		84
58	static void	85	static void
59	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
60	{	87	{
61	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
62	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
63	}	94	}
64		95
65	static void	96	static void
66	layout_update (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
67	{	98	{
68	/* use a random scale factor to account for unknown descenders, 0.8 works	99	/* use a random scale factor to account for unknown descenders, 0.8 works
69	* reasonably well with bitstream vera	100	* reasonably well with bitstream vera
70	*/	101	*/
71	PangoFontDescription *font = pango_layout_get_font_description (self->pl);	102	PangoFontDescription *font = self->font ? self->font : default_font;
72		103
73	int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75	if (height < MIN_FONT_HEIGHT)
76	height = MIN_FONT_HEIGHT;
77
78	if (pango_font_description_get_size (font) != height)
79	{
80	font = pango_font_description_copy (font);
81	pango_font_description_set_absolute_size (font, height);	104	pango_font_description_set_absolute_size (font,
		105	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
		106
82	pango_layout_set_font_description (self->pl, font);	107	pango_layout_set_font_description (self->pl, font);
83	}
84	}	108	}
85		109
86	static void	110	static void
87	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
88	{	112	{
89	layout_update (self);
90
91	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
92		114
93	w = (w + 3) & ~3;
94	if (!w) w = 1;	115	if (!w) w = 1;
95	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
96	}	119	}
97		120
98	typedef uint16_t mapface;	121	typedef uint16_t mapface;
99		122
100	typedef struct {	123	typedef struct {
…		…
248	}	271	}
249	}	272	}
250	}	273	}
251		274
252	static void	275	static void
253	music_finished ()	276	music_finished (void)
254	{	277	{
255	SDL_UserEvent ev;	278	SDL_UserEvent ev;
256		279
257	ev.type = SDL_USEREVENT;	280	ev.type = SDL_USEREVENT;
258	ev.code = 0;	281	ev.code = 0;
259	ev.data1 = 0;	282	ev.data1 = 0;
		283	ev.data2 = 0;
		284
		285	SDL_PushEvent ((SDL_Event *)&ev);
		286	}
		287
		288	static void
		289	channel_finished (int channel)
		290	{
		291	SDL_UserEvent ev;
		292
		293	ev.type = SDL_USEREVENT;
		294	ev.code = 1;
		295	ev.data1 = (void *)(long)channel;
260	ev.data2 = 0;	296	ev.data2 = 0;
261		297
262	SDL_PushEvent ((SDL_Event *)&ev);	298	SDL_PushEvent ((SDL_Event *)&ev);
263	}	299	}
264		300
…		…
375	# undef const_iv	411	# undef const_iv
376	};	412	};
377		413
378	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
379	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
380		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
381	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
382	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
383	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426
		427	cairo_fontmap = pango_cairo_font_map_get_default ();
		428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
384	}	429	}
385		430
386	int	431	int
387	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
388		433
…		…
398	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
399	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
400	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
401	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
402		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		450
403	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
404	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
405	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
406	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
407		455
408	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
409	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
410	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
411		457
412	SDL_EnableUNICODE (1);	458	SDL_EnableUNICODE (1);
413	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
414		460
415	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
424		470
425	++m;	471	++m;
426	}	472	}
427	}	473	}
428		474
		475	char *
		476	SDL_GetError ()
		477
429	int	478	int
430	SDL_SetVideoMode (int w, int h, int fullscreen)	479	SDL_SetVideoMode (int w, int h, int fullscreen)
431	CODE:	480	CODE:
432	RETVAL = !!SDL_SetVideoMode (	481	RETVAL = !!SDL_SetVideoMode (
433	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
…		…
437	RETVAL	486	RETVAL
438		487
439	void	488	void
440	SDL_GL_SwapBuffers ()	489	SDL_GL_SwapBuffers ()
441		490
		491	char *
		492	SDL_GetKeyName (int sym)
		493
442	void	494	void
443	SDL_PollEvent ()	495	SDL_PollEvent ()
444	PPCODE:	496	PPCODE:
445	{	497	{
446	SDL_Event ev;	498	SDL_Event ev;
447		499
448	while (SDL_PollEvent (&ev))	500	while (SDL_PollEvent (&ev))
449	{	501	{
450	HV *hv = newHV ();	502	HV *hv = newHV ();
451	hv_store (hv, "type", 4, newSViv (ev.type), 0);	503	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		504
452	switch (ev.type)	505	switch (ev.type)
453	{	506	{
454	case SDL_KEYDOWN:	507	case SDL_KEYDOWN:
455	case SDL_KEYUP:	508	case SDL_KEYUP:
456	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	509	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
463	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	516	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
464	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	517	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
465	break;	518	break;
466		519
467	case SDL_MOUSEMOTION:	520	case SDL_MOUSEMOTION:
		521	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		522
468	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	523	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
469	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	524	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
470	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	525	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
471	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	526	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
472	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	527	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
473	break;	528	break;
474		529
475	case SDL_MOUSEBUTTONDOWN:	530	case SDL_MOUSEBUTTONDOWN:
476	case SDL_MOUSEBUTTONUP:	531	case SDL_MOUSEBUTTONUP:
		532	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		533
477	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	534	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
478	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	535	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
479	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	536	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
480	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	537	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		538	break;
		539
		540	case SDL_USEREVENT:
		541	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		544	break;
481	}	545	}
482		546
483	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
484	}	548	}
485	}	549	}
486		550
487	int	551	int
488	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
489	POSTCALL:	553	POSTCALL:
490	Mix_HookMusicFinished (music_finished);	554	Mix_HookMusicFinished (music_finished);
		555	Mix_ChannelFinished (channel_finished);
491		556
492	void	557	void
493	Mix_CloseAudio ()	558	Mix_CloseAudio ()
494		559
495	int	560	int
…		…
500	CODE:	565	CODE:
501	#ifndef _WIN32	566	#ifndef _WIN32
502	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
503	#endif	568	#endif
504		569
505	char *
506	gl_version ()
507	CODE:
508	RETVAL = (char *)glGetString (GL_VERSION);
509	OUTPUT:
510	RETVAL
511
512	char *
513	gl_extensions ()
514	CODE:
515	RETVAL = (char *)glGetString (GL_EXTENSIONS);
516	OUTPUT:
517	RETVAL
518
519	void	570	void
520	add_font (char *file)	571	add_font (char *file)
521	CODE:	572	CODE:
522	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	573	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
523		574	#ifdef _WIN32
524	void	575	// cairo... sigh... requires win2000
525	set_font (char *file)	576	AddFontResourceEx (file, FR_PRIVATE, 0);
526	CODE:	577	#endif
527	{
528	int count;
529	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
530	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
531	FcPatternDestroy (pattern);
532	pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
533	pango_context_set_font_description (context, font);
534	}
535		578
536	void	579	void
537	load_image_inline (SV *image_)	580	load_image_inline (SV *image_)
538	ALIAS:	581	ALIAS:
539	load_image_file = 1	582	load_image_file = 1
…		…
621	PUSHs (sv_2mortal (newSViv (b / y)));	664	PUSHs (sv_2mortal (newSViv (b / y)));
622	PUSHs (sv_2mortal (newSViv (a / y)));	665	PUSHs (sv_2mortal (newSViv (a / y)));
623	}	666	}
624		667
625	void	668	void
		669	error (char *message)
		670	CODE:
		671	fprintf (stderr, "ERROR: %s\n", message);
		672	#ifdef _WIN32
		673	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		674	#endif
		675
		676	void
626	fatal (char *message)	677	fatal (char *message)
627	CODE:	678	CODE:
		679	fprintf (stderr, "FATAL: %s\n", message);
628	#ifdef _WIN32	680	#ifdef _WIN32
629	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
630	#else
631	fprintf (stderr, "FATAL: %s\n", message);
632	#endif	682	#endif
633	exit (1);	683	exit (1);
634		684
		685	MODULE = CFClient PACKAGE = CFClient::Font
		686
		687	CFClient::Font
		688	new_from_file (SV class, char path, int id = 0)
		689	CODE:
		690	{
		691	int count;
		692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		693	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		694	FcPatternDestroy (pattern);
		695	}
		696	OUTPUT:
		697	RETVAL
		698
		699	void
		700	DESTROY (CFClient::Font self)
		701	CODE:
		702	pango_font_description_free (self);
		703
		704	void
		705	make_default (CFClient::Font self)
		706	CODE:
		707	default_font = self;
		708
635	MODULE = CFClient PACKAGE = CFClient::Layout	709	MODULE = CFClient PACKAGE = CFClient::Layout
636		710
637	CFClient::Layout	711	CFClient::Layout
638	new (SV *class, int base_height = 10)	712	new (SV *class, int rgba = 0)
639	CODE:	713	CODE:
		714	#if _WIN32
		715	//rgba = 0;//D make stext nicer, breaks TextView
		716	#endif
640	New (0, RETVAL, 1, struct cf_layout);	717	New (0, RETVAL, 1, struct cf_layout);
641	RETVAL->base_height = base_height;	718
642	RETVAL->pl = pango_layout_new (context);	719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		720	RETVAL->rgba = rgba;
		721	RETVAL->r = 1.;
		722	RETVAL->g = 1.;
		723	RETVAL->b = 1.;
		724	RETVAL->a = 1.;
		725	RETVAL->base_height = MIN_FONT_HEIGHT;
		726	RETVAL->font = 0;
		727
643	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	728	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
644	pango_layout_set_font_description (RETVAL->pl,	729	layout_update_font (RETVAL);
645	pango_font_description_copy (
646	pango_context_get_font_description (context)));
647	OUTPUT:	730	OUTPUT:
648	RETVAL	731	RETVAL
649		732
650	void	733	void
651	DESTROY (CFClient::Layout self)	734	DESTROY (CFClient::Layout self)
652	CODE:	735	CODE:
653	g_object_unref (self->pl);	736	g_object_unref (self->pl);
654	Safefree (self);	737	Safefree (self);
655		738
		739	int
		740	is_rgba (CFClient::Layout self)
		741	CODE:
		742	RETVAL = self->rgba;
		743	OUTPUT:
		744	RETVAL
		745
656	void	746	void
657	set_text (CFClient::Layout self, SV *text_)	747	set_text (CFClient::Layout self, SV *text_)
658	CODE:	748	CODE:
659	{	749	{
660	STRLEN textlen;	750	STRLEN textlen;
…		…
680	SvUTF8_on (RETVAL);	770	SvUTF8_on (RETVAL);
681	OUTPUT:	771	OUTPUT:
682	RETVAL	772	RETVAL
683		773
684	void	774	void
		775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		776	CODE:
		777	self->r = r;
		778	self->g = g;
		779	self->b = b;
		780	self->a = a;
		781
		782	void
		783	set_font (CFClient::Layout self, CFClient::Font font = 0)
		784	CODE:
		785	if (self->font != font)
		786	{
		787	self->font = font;
		788	layout_update_font (self);
		789	}
		790
		791	void
685	set_height (CFClient::Layout self, int base_height)	792	set_height (CFClient::Layout self, int base_height)
686	CODE:	793	CODE:
		794	if (self->base_height != base_height)
		795	{
687	self->base_height = base_height;	796	self->base_height = base_height;
		797	layout_update_font (self);
		798	}
688		799
689	void	800	void
690	set_width (CFClient::Layout self, int max_width = -1)	801	set_width (CFClient::Layout self, int max_width = -1)
691	CODE:	802	CODE:
692	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
		804
		805	void
		806	set_indent (CFClient::Layout self, int indent)
		807	CODE:
		808	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		809
		810	void
		811	set_spacing (CFClient::Layout self, int spacing)
		812	CODE:
		813	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		814
		815	void
		816	set_ellipsise (CFClient::Layout self, int ellipsise)
		817	CODE:
		818	pango_layout_set_ellipsize (self->pl,
		819	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		820	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		821	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		822	: PANGO_ELLIPSIZE_NONE
		823	);
		824
		825	void
		826	set_single_paragraph_mode (CFClient::Layout self, int spm)
		827	CODE:
		828	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
693		829
694	void	830	void
695	size (CFClient::Layout self)	831	size (CFClient::Layout self)
696	PPCODE:	832	PPCODE:
697	{	833	{
698	int w, h;	834	int w, h;
699		835
700	layout_update (self);
701	layout_get_pixel_size (self, &w, &h);	836	layout_get_pixel_size (self, &w, &h);
702		837
703	EXTEND (SP, 2);	838	EXTEND (SP, 2);
704	PUSHs (sv_2mortal (newSViv (w)));	839	PUSHs (sv_2mortal (newSViv (w)));
705	PUSHs (sv_2mortal (newSViv (h)));	840	PUSHs (sv_2mortal (newSViv (h)));
…		…
708	int	843	int
709	xy_to_index (CFClient::Layout self, int x, int y)	844	xy_to_index (CFClient::Layout self, int x, int y)
710	CODE:	845	CODE:
711	{	846	{
712	int index, trailing;	847	int index, trailing;
713
714	layout_update (self);
715	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	848	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
716
717	RETVAL = index;	849	RETVAL = index;
718	}	850	}
719	OUTPUT:	851	OUTPUT:
720	RETVAL	852	RETVAL
721		853
722	void	854	void
723	cursor_pos (CFClient::Layout self, int index)	855	cursor_pos (CFClient::Layout self, int index)
724	PPCODE:	856	PPCODE:
725	{	857	{
726	PangoRectangle strong_pos;	858	PangoRectangle strong_pos;
727	layout_update (self);
728	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	859	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
729		860
730	EXTEND (SP, 3);	861	EXTEND (SP, 3);
731	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	862	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
732	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	863	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
737	render (CFClient::Layout self)	868	render (CFClient::Layout self)
738	PPCODE:	869	PPCODE:
739	{	870	{
740	SV *retval;	871	SV *retval;
741	int w, h;	872	int w, h;
742	FT_Bitmap bitmap;
743		873
744	layout_update (self);
745	layout_get_pixel_size (self, &w, &h);	874	layout_get_pixel_size (self, &w, &h);
746		875
		876	if (self->rgba)
		877	{
		878	cairo_surface_t *surface;
		879	cairo_t *cairo;
		880
		881	retval = newSV (w * h * 4);
		882	SvPOK_only (retval);
		883	SvCUR_set (retval, w * h * 4);
		884
		885	memset (SvPVX (retval), 0, w * h * 4);
		886
		887	surface = cairo_image_surface_create_for_data (
		888	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		889	cairo = cairo_create (surface);
		890	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		891
		892	pango_cairo_show_layout (cairo, self->pl);
		893
		894	cairo_destroy (cairo);
		895	cairo_surface_destroy (surface);
		896
		897	// what a mess, and its premultiplied, too :(
		898	{
		899	uint32_t p = (uint32_t )SvPVX (retval);
		900	uint32_t e = p + w h;
		901
		902	while (p < e)
		903	{
		904	uint32_t rgba = *p;
		905	rgba = (rgba >> 24) \| (rgba << 8);
		906	#if 0
		907	#ifdef _WIN32
		908	{//D
		909	uint8_t r = rgba >> 24;
		910	uint8_t g = rgba >> 16;
		911	uint8_t b = rgba >> 8;
		912	uint8_t a = rgba >> 0;
		913
		914	rgba = (rgba & 0xffffff00) \| a;
		915	}
		916	#endif
		917	#endif
		918	rgba = SDL_SwapBE32 (rgba);
		919	*p++ = rgba;
		920	}
		921	}
		922
		923	EXTEND (SP, 5);
		924	PUSHs (sv_2mortal (newSViv (w)));
		925	PUSHs (sv_2mortal (newSViv (h)));
		926	PUSHs (sv_2mortal (retval));
		927	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		928	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		929	}
		930	else
		931	{
		932	FT_Bitmap bitmap;
		933
747	retval = newSV (w * h);	934	retval = newSV (w * h);
748	SvPOK_only (retval);	935	SvPOK_only (retval);
749	SvCUR_set (retval, w * h);	936	SvCUR_set (retval, w * h);
750		937
751	bitmap.rows = h;	938	bitmap.rows = h;
752	bitmap.width = w;	939	bitmap.width = w;
753	bitmap.pitch = w;	940	bitmap.pitch = w;
754	bitmap.buffer = (unsigned char*)SvPVX (retval);	941	bitmap.buffer = (unsigned char*)SvPVX (retval);
755	bitmap.num_grays = 256;	942	bitmap.num_grays = 256;
756	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	943	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
757		944
758	memset (bitmap.buffer, 0, w * h);	945	memset (bitmap.buffer, 0, w * h);
759		946
760	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	947	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
761		948
762	EXTEND (SP, 3);	949	EXTEND (SP, 5);
763	PUSHs (sv_2mortal (newSViv (w)));	950	PUSHs (sv_2mortal (newSViv (w)));
764	PUSHs (sv_2mortal (newSViv (h)));	951	PUSHs (sv_2mortal (newSViv (h)));
765	PUSHs (sv_2mortal (retval));	952	PUSHs (sv_2mortal (retval));
		953	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		954	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		955	}
766	}	956	}
767		957
768	MODULE = CFClient PACKAGE = CFClient::Texture	958	MODULE = CFClient PACKAGE = CFClient::Texture
769		959
770	void	960	void
771	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
772	PROTOTYPE: $$$;$$	962	PROTOTYPE: $$$;$$
		963	ALIAS:
		964	draw_quad_alpha = 1
		965	draw_quad_alpha_premultiplied = 2
773	CODE:	966	CODE:
774	{	967	{
775	HV hv = (HV )SvRV (self);	968	HV hv = (HV )SvRV (self);
776	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	969	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
777	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	970	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
778	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	971	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
779	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
780		972
781	if (items < 5)	973	if (items < 5)
782	{	974	{
783	w = SvNV (*hv_fetch (hv, "w", 1, 1));	975	w = SvNV (*hv_fetch (hv, "w", 1, 1));
784	h = SvNV (*hv_fetch (hv, "h", 1, 1));	976	h = SvNV (*hv_fetch (hv, "h", 1, 1));
785	}	977	}
786		978
		979	if (ix)
		980	{
		981	glEnable (GL_BLEND);
		982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		983	glEnable (GL_ALPHA_TEST);
		984	glAlphaFunc (GL_GREATER, 0.01f);
		985	}
		986
787	glBindTexture (GL_TEXTURE_2D, name);	987	glBindTexture (GL_TEXTURE_2D, name);
788	if (wrap_mode) {	988
789	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
790	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
791	}
792	glBegin (GL_QUADS);	989	glBegin (GL_QUADS);
793	glTexCoord2f (0, 0); glVertex2f (x , y );	990	glTexCoord2f (0, 0); glVertex2f (x , y );
794	glTexCoord2f (0, t); glVertex2f (x , y + h);	991	glTexCoord2f (0, t); glVertex2f (x , y + h);
795	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	992	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
796	glTexCoord2f (s, 0); glVertex2f (x + w, y );	993	glTexCoord2f (s, 0); glVertex2f (x + w, y );
797	glEnd ();	994	glEnd ();
		995
		996	if (ix)
		997	{
		998	glDisable (GL_ALPHA_TEST);
		999	glDisable (GL_BLEND);
		1000	}
798	}	1001	}
799		1002
800	MODULE = CFClient PACKAGE = CFClient::Map	1003	MODULE = CFClient PACKAGE = CFClient::Map
801		1004
802	CFClient::Map	1005	CFClient::Map
…		…
866	tex->r = r;	1069	tex->r = r;
867	tex->g = g;	1070	tex->g = g;
868	tex->b = b;	1071	tex->b = b;
869	tex->a = a;	1072	tex->a = a;
870	}	1073	}
		1074
		1075	// somewhat hackish, but for textures that require it, it really
		1076	// improves the look, and most others don't suffer.
		1077	glBindTexture (GL_TEXTURE_2D, name);
		1078	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1079	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1080	// use uglier nearest interpolation because linear suffers
		1081	// from transparent color bleeding and ugly wrapping effects.
		1082	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
871	}	1083	}
872		1084
873	int	1085	int
874	ox (CFClient::Map self)	1086	ox (CFClient::Map self)
875	ALIAS:	1087	ALIAS:
…		…
1311	} *civ, const_iv[] = {	1523	} *civ, const_iv[] = {
1312	# define const_iv(name) { # name, (IV)name }	1524	# define const_iv(name) { # name, (IV)name }
1313	const_iv (GL_COLOR_MATERIAL),	1525	const_iv (GL_COLOR_MATERIAL),
1314	const_iv (GL_SMOOTH),	1526	const_iv (GL_SMOOTH),
1315	const_iv (GL_FLAT),	1527	const_iv (GL_FLAT),
		1528	const_iv (GL_DITHER),
1316	const_iv (GL_BLEND),	1529	const_iv (GL_BLEND),
		1530	const_iv (GL_CULL_FACE),
		1531	const_iv (GL_SCISSOR_TEST),
		1532	const_iv (GL_DEPTH_TEST),
		1533	const_iv (GL_ALPHA_TEST),
		1534	const_iv (GL_NORMALIZE),
		1535	const_iv (GL_RESCALE_NORMAL),
1317	const_iv (GL_AND),	1536	const_iv (GL_AND),
		1537	const_iv (GL_ONE),
		1538	const_iv (GL_ZERO),
1318	const_iv (GL_SRC_ALPHA),	1539	const_iv (GL_SRC_ALPHA),
		1540	const_iv (GL_SRC_ALPHA_SATURATE),
1319	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1541	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1542	const_iv (GL_ONE_MINUS_DST_ALPHA),
1320	const_iv (GL_RGB),	1543	const_iv (GL_RGB),
1321	const_iv (GL_RGBA),	1544	const_iv (GL_RGBA),
1322	const_iv (GL_UNSIGNED_BYTE),	1545	const_iv (GL_UNSIGNED_BYTE),
1323	const_iv (GL_ALPHA4),	1546	const_iv (GL_UNSIGNED_SHORT),
		1547	const_iv (GL_UNSIGNED_INT),
1324	const_iv (GL_ALPHA),	1548	const_iv (GL_ALPHA),
		1549	const_iv (GL_INTENSITY),
		1550	const_iv (GL_LUMINANCE),
		1551	const_iv (GL_LUMINANCE_ALPHA),
1325	const_iv (GL_FLOAT),	1552	const_iv (GL_FLOAT),
1326	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1553	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1327	const_iv (GL_COMPILE),	1554	const_iv (GL_COMPILE),
1328	const_iv (GL_TEXTURE_1D),	1555	const_iv (GL_TEXTURE_1D),
1329	const_iv (GL_TEXTURE_2D),	1556	const_iv (GL_TEXTURE_2D),
…		…
1331	const_iv (GL_TEXTURE_MAG_FILTER),	1558	const_iv (GL_TEXTURE_MAG_FILTER),
1332	const_iv (GL_TEXTURE_MIN_FILTER),	1559	const_iv (GL_TEXTURE_MIN_FILTER),
1333	const_iv (GL_TEXTURE_ENV_MODE),	1560	const_iv (GL_TEXTURE_ENV_MODE),
1334	const_iv (GL_TEXTURE_WRAP_S),	1561	const_iv (GL_TEXTURE_WRAP_S),
1335	const_iv (GL_TEXTURE_WRAP_T),	1562	const_iv (GL_TEXTURE_WRAP_T),
		1563	const_iv (GL_REPEAT),
1336	const_iv (GL_CLAMP),	1564	const_iv (GL_CLAMP),
1337	const_iv (GL_REPEAT),	1565	const_iv (GL_CLAMP_TO_EDGE),
1338	const_iv (GL_NEAREST),	1566	const_iv (GL_NEAREST),
1339	const_iv (GL_LINEAR),	1567	const_iv (GL_LINEAR),
1340	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1568	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1341	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1569	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1342	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1570	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1343	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1571	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1344	const_iv (GL_GENERATE_MIPMAP),	1572	const_iv (GL_GENERATE_MIPMAP),
1345	const_iv (GL_LINEAR),
1346	const_iv (GL_MODULATE),	1573	const_iv (GL_MODULATE),
		1574	const_iv (GL_DECAL),
1347	const_iv (GL_REPLACE),	1575	const_iv (GL_REPLACE),
		1576	const_iv (GL_DEPTH_BUFFER_BIT),
1348	const_iv (GL_COLOR_BUFFER_BIT),	1577	const_iv (GL_COLOR_BUFFER_BIT),
1349	const_iv (GL_PROJECTION),	1578	const_iv (GL_PROJECTION),
1350	const_iv (GL_MODELVIEW),	1579	const_iv (GL_MODELVIEW),
1351	const_iv (GL_COLOR_LOGIC_OP),	1580	const_iv (GL_COLOR_LOGIC_OP),
		1581	const_iv (GL_SEPARABLE_2D),
1352	const_iv (GL_CONVOLUTION_2D),	1582	const_iv (GL_CONVOLUTION_2D),
1353	const_iv (GL_CONVOLUTION_BORDER_MODE),	1583	const_iv (GL_CONVOLUTION_BORDER_MODE),
1354	const_iv (GL_CONSTANT_BORDER),	1584	const_iv (GL_CONSTANT_BORDER),
1355	const_iv (GL_LINES),	1585	const_iv (GL_LINES),
		1586	const_iv (GL_LINE_LOOP),
1356	const_iv (GL_QUADS),	1587	const_iv (GL_QUADS),
1357	const_iv (GL_LINE_LOOP),	1588	const_iv (GL_QUAD_STRIP),
		1589	const_iv (GL_TRIANGLES),
		1590	const_iv (GL_TRIANGLE_STRIP),
		1591	const_iv (GL_TRIANGLE_FAN),
1358	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1592	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1359	const_iv (GL_FASTEST),	1593	const_iv (GL_FASTEST),
		1594	const_iv (GL_V2F),
		1595	const_iv (GL_V3F),
		1596	const_iv (GL_T2F_V3F),
		1597	const_iv (GL_T2F_N3F_V3F),
1360	# undef const_iv	1598	# undef const_iv
1361	};	1599	};
1362		1600
1363	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1601	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1364	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1602	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1365	}	1603	}
1366		1604
		1605	char *
		1606	gl_vendor ()
		1607	CODE:
		1608	RETVAL = (char *)glGetString (GL_VENDOR);
		1609	OUTPUT:
		1610	RETVAL
		1611
		1612	char *
		1613	gl_version ()
		1614	CODE:
		1615	RETVAL = (char *)glGetString (GL_VERSION);
		1616	OUTPUT:
		1617	RETVAL
		1618
		1619	char *
		1620	gl_extensions ()
		1621	CODE:
		1622	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1623	OUTPUT:
		1624	RETVAL
		1625
1367	int glGetError ()	1626	int glGetError ()
1368		1627
1369	void glClear (int mask)	1628	void glClear (int mask)
1370		1629
1371	void glClearColor (float r, float g, float b, float a = 1.0)	1630	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1379		1638
1380	void glHint (int target, int mode)	1639	void glHint (int target, int mode)
1381		1640
1382	void glBlendFunc (int sfactor, int dfactor)	1641	void glBlendFunc (int sfactor, int dfactor)
1383		1642
		1643	void glDepthMask (int flag)
		1644
1384	void glLogicOp (int opcode)	1645	void glLogicOp (int opcode)
1385		1646
		1647	void glColorMask (int red, int green, int blue, int alpha)
		1648
1386	void glMatrixMode (int mode)	1649	void glMatrixMode (int mode)
1387		1650
1388	void glPushMatrix ()	1651	void glPushMatrix ()
1389		1652
1390	void glPopMatrix ()	1653	void glPopMatrix ()
1391		1654
1392	void glLoadIdentity ()	1655	void glLoadIdentity ()
1393		1656
		1657	# near_ and far_ are due to microsofts buggy "c" compiler
		1658	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1659
		1660	# near_ and far_ are due to microsofts buggy "c" compiler
1394	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1661	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1395		1662
1396	void glViewport (int x, int y, int width, int height)	1663	void glViewport (int x, int y, int width, int height)
		1664
		1665	void glScissor (int x, int y, int width, int height)
1397		1666
1398	void glTranslate (float x, float y, float z = 0.)	1667	void glTranslate (float x, float y, float z = 0.)
1399	CODE:	1668	CODE:
1400	glTranslatef (x, y, z);	1669	glTranslatef (x, y, z);
1401		1670
1402	void glScale (float x, float y, float z)	1671	void glScale (float x, float y, float z = 1.)
1403	CODE:	1672	CODE:
1404	glScalef (x, y, z);	1673	glScalef (x, y, z);
1405		1674
1406	void glRotate (float angle, float x, float y, float z)	1675	void glRotate (float angle, float x, float y, float z)
1407	CODE:	1676	CODE:
…		…
1412	void glEnd ()	1681	void glEnd ()
1413		1682
1414	void glColor (float r, float g, float b, float a = 1.0)	1683	void glColor (float r, float g, float b, float a = 1.0)
1415	PROTOTYPE: @	1684	PROTOTYPE: @
1416	CODE:	1685	CODE:
1417	glColor4f (r, g, b, a);	1686	// microsoft visual "c" rounds instead of truncating...
		1687	glColor4ub (MIN ((int)(r * 256.f), 255),
		1688	MIN ((int)(g * 256.f), 255),
		1689	MIN ((int)(b * 256.f), 255),
		1690	MIN ((int)(a * 256.f), 255));
		1691
		1692	void glInterleavedArrays (int format, int stride, char *data)
		1693
		1694	void glDrawElements (int mode, int count, int type, char *indices)
		1695
		1696	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1697
		1698	void glRasterPos (float x, float y, float z = 0.)
		1699	CODE:
		1700	glRasterPos3f (0, 0, z);
		1701	glBitmap (0, 0, 0, 0, x, y, 0);
1418		1702
1419	void glVertex (float x, float y, float z = 0.)	1703	void glVertex (float x, float y, float z = 0.)
1420	CODE:	1704	CODE:
1421	glVertex3f (x, y, z);	1705	glVertex3f (x, y, z);
1422		1706
…		…
1434		1718
1435	void glBindTexture (int target, int name)	1719	void glBindTexture (int target, int name)
1436		1720
1437	void glConvolutionParameter (int target, int pname, float params)	1721	void glConvolutionParameter (int target, int pname, float params)
1438	CODE:	1722	CODE:
1439	glConvolutionParameterf (target, pname, params);	1723	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1440		1724
1441	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1725	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1726	CODE:
		1727	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1728	(target, internalformat, width, height, format, type, data));
		1729
		1730	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1731	CODE:
		1732	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1733	(target, internalformat, width, height, format, type, row, column));
1442		1734
1443	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1735	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1444		1736
1445	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1737	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1738
		1739	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		1740
		1741	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1446		1742
1447	int glGenTexture ()	1743	int glGenTexture ()
1448	CODE:	1744	CODE:
1449	{	1745	{
1450	GLuint name;	1746	GLuint name;
…		…
1475		1771
1476	void glEndList ()	1772	void glEndList ()
1477		1773
1478	void glCallList (int list)	1774	void glCallList (int list)
1479		1775
		1776

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.59 by root, Sun Apr 23 04:41:33 2006 UTC vs. Revision 1.100 by root, Wed May 31 17:16:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.59 by root, Sun Apr 23 04:41:33 2006 UTC vs.
Revision 1.100 by root, Wed May 31 17:16:47 2006 UTC