ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 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
53static struct 60static 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
70typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
72 85
73typedef PangoFontDescription *CFClient__Font; 86typedef PangoFontDescription *CFPlus__Font;
87
88static int
89shape_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
75typedef struct cf_layout { 106typedef 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
83static CFClient__Font default_font; 113static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 114static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 115static PangoFontMap *opengl_fontmap;
86 116
87static void 117static void
88substitute_func (FcPattern *pattern, gpointer data) 118substitute_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
98static void 127static void
99layout_update_font (CFClient__Layout self) 128layout_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
112static void 141static void
113layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_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
123typedef uint16_t mapface; 159typedef uint16_t mapface;
124 160
125typedef struct { 161typedef 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
132typedef struct { 168typedef 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
137typedef struct { 175typedef 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
155static char * 193static char *
156prepend (char *ptr, int sze, int inc) 194prepend (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
180static maprow * 218static maprow *
181map_get_row (CFClient__Map self, int y) 219map_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
228static mapcell * 266static mapcell *
229map_get_cell (CFClient__Map self, int x, int y) 267map_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
234static void 272static void
235map_clear (CFClient__Map self) 273map_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
252static void 290static void
253map_blank (CFClient__Map self, int x0, int y0, int w, int h) 291map_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
277static void 321static 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
347static unsigned int
348minpot (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
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
367
303MODULE = CFClient PACKAGE = CFClient 368MODULE = CFPlus PACKAGE = CFPlus
304 369
305PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
306 371
307BOOT: 372BOOT:
308{ 373{
309 HV *stash = gv_stashpv ("CFClient", 1); 374 HV *stash = gv_stashpv ("CFPlus", 1);
310 static const struct { 375 static const struct {
311 const char *name; 376 const char *name;
312 IV iv; 377 IV iv;
313 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
314# define const_iv(name) { # name, (IV)name } 379# define const_iv(name) { # name, (IV)name }
380 const_iv (SDLK_MODIFIER_MIN),
381 const_iv (SDLK_MODIFIER_MAX),
382
315 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
316 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
317 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
318 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
319 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
328 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
329 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
330 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
331 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
332 const_iv (SDL_USEREVENT), 400 const_iv (SDL_USEREVENT),
401
402 const_iv (SDL_APPINPUTFOCUS),
403 const_iv (SDL_APPMOUSEFOCUS),
404 const_iv (SDL_APPACTIVE),
405
333 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
334 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
335 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
336 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
337 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
392 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
393 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
394 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
395 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
396 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
397 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
398 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
399 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
400 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
401 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
402 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
403 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
404 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
405 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
406 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
407 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
408 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
409 const_iv (KMOD_CTRL),
410 const_iv (KMOD_SHIFT),
411 const_iv (KMOD_ALT),
412 const_iv (KMOD_META)
413# undef const_iv 487# undef const_iv
414 }; 488 };
415 489
416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 490 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
492
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
418} 495}
496
497int
498in_destruct ()
499 CODE:
500 RETVAL = PL_main_cv == Nullcv;
501 OUTPUT:
502 RETVAL
503
504NV floor (NV x)
505
506NV ceil (NV x)
419 507
420void 508void
421pango_init () 509pango_init ()
422 CODE: 510 CODE:
423{ 511{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425 ft2_fontmap = pango_ft2_font_map_new (); 512 opengl_fontmap = pango_opengl_font_map_new ();
426 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 513 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); 514 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} 515}
432 516
433int 517int
434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 518SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
435 519
436void 520void
437SDL_Quit () 521SDL_Quit ()
438 522
439void 523void
446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 530 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 531 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 532 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449 533
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 534 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 535 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452 536
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 537 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 538 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 539 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 540 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457 541
458 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 542 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
543#if SDL_VERSION_ATLEAST(1,2,10)
544 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
545 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
546#endif
459 547
460 SDL_EnableUNICODE (1); 548 SDL_EnableUNICODE (1);
461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 549 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462 550
463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 551 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
515 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
516 case SDL_KEYUP: 604 case SDL_KEYUP:
517 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
518 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
519 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 607 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
608 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
520 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
521 break; 610 break;
522 611
523 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
550 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 639 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 640 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552 break; 641 break;
553 } 642 }
554 643
555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 644 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556 } 645 }
557} 646}
558 647
559int 648int
560Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 649Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
574#ifndef _WIN32 663#ifndef _WIN32
575 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
576#endif 665#endif
577 666
578void 667void
668win32_proxy_info ()
669 PPCODE:
670{
671#ifdef _WIN32
672 char buffer[2048];
673 DWORD buflen;
674
675 EXTEND (SP, 3);
676
677 buflen = sizeof (buffer);
678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
679 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
680 {
681 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
682
683 buflen = sizeof (buffer);
684 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
685 {
686 PUSHs (newSVpv (buffer, 0));
687
688 buflen = sizeof (buffer);
689 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
690 PUSHs (newSVpv (buffer, 0));
691 }
692 }
693#endif
694}
695
696void
579add_font (char *file) 697add_font (char *file)
580 CODE: 698 CODE:
581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 699 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582#ifdef _WIN32
583 // cairo... sigh... requires win2000
584 AddFontResourceEx (file, FR_PRIVATE, 0);
585#endif
586 700
587void 701void
588load_image_inline (SV *image_) 702load_image_inline (SV *image_)
589 ALIAS: 703 ALIAS:
590 load_image_file = 1 704 load_image_file = 1
632 746
633 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 747 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634 748
635 assert (surface2->pitch == surface2->w * 4); 749 assert (surface2->pitch == surface2->w * 4);
636 750
751 SDL_LockSurface (surface2);
637 EXTEND (SP, 5); 752 EXTEND (SP, 6);
638 PUSHs (sv_2mortal (newSViv (surface2->w))); 753 PUSHs (sv_2mortal (newSViv (surface2->w)));
639 PUSHs (sv_2mortal (newSViv (surface2->h))); 754 PUSHs (sv_2mortal (newSViv (surface2->h)));
640 SDL_LockSurface (surface2);
641 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 755 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))); 756 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 757 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 758 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
759 SDL_UnlockSurface (surface2);
646 760
647 SDL_FreeSurface (surface); 761 SDL_FreeSurface (surface);
648 SDL_FreeSurface (surface2); 762 SDL_FreeSurface (surface2);
649} 763}
650 764
686 CODE: 800 CODE:
687 fprintf (stderr, "FATAL: %s\n", message); 801 fprintf (stderr, "FATAL: %s\n", message);
688#ifdef _WIN32 802#ifdef _WIN32
689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690#endif 804#endif
691 exit (1); 805 _exit (1);
692 806
807void
808_exit (int retval = 0)
809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
812#else
813 _exit (retval);
814#endif
815
693MODULE = CFClient PACKAGE = CFClient::Font 816MODULE = CFPlus PACKAGE = CFPlus::Font
694 817
695CFClient::Font 818CFPlus::Font
696new_from_file (SV *class, char *path, int id = 0) 819new_from_file (SV *class, char *path, int id = 0)
697 CODE: 820 CODE:
698{ 821{
699 int count; 822 int count;
700 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 823 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
703} 826}
704 OUTPUT: 827 OUTPUT:
705 RETVAL 828 RETVAL
706 829
707void 830void
708DESTROY (CFClient::Font self) 831DESTROY (CFPlus::Font self)
709 CODE: 832 CODE:
710 pango_font_description_free (self); 833 pango_font_description_free (self);
711 834
712void 835void
713make_default (CFClient::Font self) 836make_default (CFPlus::Font self)
714 CODE: 837 CODE:
715 default_font = self; 838 default_font = self;
716 839
717MODULE = CFClient PACKAGE = CFClient::Layout 840MODULE = CFPlus PACKAGE = CFPlus::Layout
718 841
719CFClient::Layout 842void
720new (SV *class, int rgba = 0) 843reset_glyph_cache ()
721 CODE: 844 CODE:
722#if _WIN32 845 tc_clear ();
723 //rgba = 0;//D makes text nicer, breaks TextView 846
724#endif 847CFPlus::Layout
848new (SV *class)
849 CODE:
725 New (0, RETVAL, 1, struct cf_layout); 850 New (0, RETVAL, 1, struct cf_layout);
726 851
727 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 852 RETVAL->pl = pango_layout_new (opengl_context);
728 RETVAL->rgba = rgba;
729 RETVAL->r = 1.; 853 RETVAL->r = 1.;
730 RETVAL->g = 1.; 854 RETVAL->g = 1.;
731 RETVAL->b = 1.; 855 RETVAL->b = 1.;
732 RETVAL->a = 1.; 856 RETVAL->a = 1.;
733 RETVAL->base_height = MIN_FONT_HEIGHT; 857 RETVAL->base_height = MIN_FONT_HEIGHT;
737 layout_update_font (RETVAL); 861 layout_update_font (RETVAL);
738 OUTPUT: 862 OUTPUT:
739 RETVAL 863 RETVAL
740 864
741void 865void
742DESTROY (CFClient::Layout self) 866DESTROY (CFPlus::Layout self)
743 CODE: 867 CODE:
744 g_object_unref (self->pl); 868 g_object_unref (self->pl);
745 Safefree (self); 869 Safefree (self);
746 870
747int
748is_rgba (CFClient::Layout self)
749 CODE:
750 RETVAL = self->rgba;
751 OUTPUT:
752 RETVAL
753
754void 871void
755set_text (CFClient::Layout self, SV *text_) 872set_text (CFPlus::Layout self, SV *text_)
756 CODE: 873 CODE:
757{ 874{
758 STRLEN textlen; 875 STRLEN textlen;
759 char *text = SvPVutf8 (text_, textlen); 876 char *text = SvPVutf8 (text_, textlen);
760 877
761 pango_layout_set_text (self->pl, text, textlen); 878 pango_layout_set_text (self->pl, text, textlen);
762} 879}
763 880
764void 881void
765set_markup (CFClient::Layout self, SV *text_) 882set_markup (CFPlus::Layout self, SV *text_)
766 CODE: 883 CODE:
767{ 884{
768 STRLEN textlen; 885 STRLEN textlen;
769 char *text = SvPVutf8 (text_, textlen); 886 char *text = SvPVutf8 (text_, textlen);
770 887
771 pango_layout_set_markup (self->pl, text, textlen); 888 pango_layout_set_markup (self->pl, text, textlen);
772} 889}
773 890
891void
892set_shapes (CFPlus::Layout self, ...)
893 CODE:
894{
895 PangoAttrList *attrs = 0;
896 const char *text = pango_layout_get_text (self->pl);
897 const char *pos = text;
898 int arg = 4;
899
900 while (arg < items && (pos = strstr (pos, OBJ_STR)))
901 {
902 PangoRectangle inkrect, rect;
903 PangoAttribute *attr;
904
905 int x = SvIV (ST (arg - 3));
906 int y = SvIV (ST (arg - 2));
907 int w = SvIV (ST (arg - 1));
908 int h = SvIV (ST (arg ));
909
910 inkrect.x = 0;
911 inkrect.y = 0;
912 inkrect.width = 0;
913 inkrect.height = 0;
914
915 rect.x = x * PANGO_SCALE;
916 rect.y = y * PANGO_SCALE;
917 rect.width = w * PANGO_SCALE;
918 rect.height = h * PANGO_SCALE;
919
920 if (!attrs)
921 attrs = pango_layout_get_attributes (self->pl);
922
923 attr = pango_attr_shape_new (&inkrect, &rect);
924 attr->start_index = pos - text;
925 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
926 pango_attr_list_insert (attrs, attr);
927
928 arg += 4;
929 pos += sizeof (OBJ_STR) - 1;
930 }
931
932 if (attrs)
933 pango_layout_set_attributes (self->pl, attrs);
934}
935
936void
937get_shapes (CFPlus::Layout self)
938 PPCODE:
939{
940 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
941
942 do
943 {
944 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
945
946 if (run && shape_attr_p (run))
947 {
948 PangoRectangle extents;
949 pango_layout_iter_get_run_extents (iter, 0, &extents);
950
951 EXTEND (SP, 2);
952 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
953 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
954 }
955 }
956 while (pango_layout_iter_next_run (iter));
957
958 pango_layout_iter_free (iter);
959}
960
961int
962has_wrapped (CFPlus::Layout self)
963 CODE:
964{
965 int lines = 1;
966 const char *text = pango_layout_get_text (self->pl);
967
968 while (*text)
969 lines += *text++ == '\n';
970
971 RETVAL = lines < pango_layout_get_line_count (self->pl);
972}
973 OUTPUT:
974 RETVAL
975
774SV * 976SV *
775get_text (CFClient::Layout self) 977get_text (CFPlus::Layout self)
776 CODE: 978 CODE:
777 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 979 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778 SvUTF8_on (RETVAL); 980 sv_utf8_decode (RETVAL);
779 OUTPUT: 981 OUTPUT:
780 RETVAL 982 RETVAL
781 983
782void 984void
783set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 985set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
784 CODE: 986 CODE:
785 self->r = r; 987 self->r = r;
786 self->g = g; 988 self->g = g;
787 self->b = b; 989 self->b = b;
788 self->a = a; 990 self->a = a;
789 991
790void 992void
791set_font (CFClient::Layout self, CFClient::Font font = 0) 993set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792 CODE: 994 CODE:
793 if (self->font != font) 995 if (self->font != font)
794 { 996 {
795 self->font = font; 997 self->font = font;
796 layout_update_font (self); 998 layout_update_font (self);
797 } 999 }
798 1000
799void 1001void
800set_height (CFClient::Layout self, int base_height) 1002set_height (CFPlus::Layout self, int base_height)
801 CODE: 1003 CODE:
802 if (self->base_height != base_height) 1004 if (self->base_height != base_height)
803 { 1005 {
804 self->base_height = base_height; 1006 self->base_height = base_height;
805 layout_update_font (self); 1007 layout_update_font (self);
806 } 1008 }
807 1009
808void 1010void
809set_width (CFClient::Layout self, int max_width = -1) 1011set_width (CFPlus::Layout self, int max_width = -1)
810 CODE: 1012 CODE:
811 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1013 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
812 1014
813void 1015void
814set_indent (CFClient::Layout self, int indent) 1016set_indent (CFPlus::Layout self, int indent)
815 CODE: 1017 CODE:
816 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1018 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817 1019
818void 1020void
819set_spacing (CFClient::Layout self, int spacing) 1021set_spacing (CFPlus::Layout self, int spacing)
820 CODE: 1022 CODE:
821 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1023 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822 1024
823void 1025void
824set_ellipsise (CFClient::Layout self, int ellipsise) 1026set_ellipsise (CFPlus::Layout self, int ellipsise)
825 CODE: 1027 CODE:
826 pango_layout_set_ellipsize (self->pl, 1028 pango_layout_set_ellipsize (self->pl,
827 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1029 ellipsise == 1 ? PANGO_ELLIPSIZE_START
828 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1030 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1031 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
830 : PANGO_ELLIPSIZE_NONE 1032 : PANGO_ELLIPSIZE_NONE
831 ); 1033 );
832 1034
833void 1035void
834set_single_paragraph_mode (CFClient::Layout self, int spm) 1036set_single_paragraph_mode (CFPlus::Layout self, int spm)
835 CODE: 1037 CODE:
836 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1038 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837 1039
838void 1040void
839size (CFClient::Layout self) 1041size (CFPlus::Layout self)
840 PPCODE: 1042 PPCODE:
841{ 1043{
842 int w, h; 1044 int w, h;
843 1045
844 layout_get_pixel_size (self, &w, &h); 1046 layout_get_pixel_size (self, &w, &h);
847 PUSHs (sv_2mortal (newSViv (w))); 1049 PUSHs (sv_2mortal (newSViv (w)));
848 PUSHs (sv_2mortal (newSViv (h))); 1050 PUSHs (sv_2mortal (newSViv (h)));
849} 1051}
850 1052
851int 1053int
1054descent (CFPlus::Layout self)
1055 CODE:
1056{
1057 PangoRectangle rect;
1058 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1059 pango_layout_line_get_pixel_extents (line, 0, &rect);
1060 RETVAL = PANGO_DESCENT (rect);
1061}
1062 OUTPUT:
1063 RETVAL
1064
1065int
852xy_to_index (CFClient::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
853 CODE: 1067 CODE:
854{ 1068{
855 int index, trailing; 1069 int index, trailing;
856 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1070 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
857 RETVAL = index; 1071 RETVAL = index + trailing;
858} 1072}
859 OUTPUT: 1073 OUTPUT:
860 RETVAL 1074 RETVAL
861 1075
862void 1076void
863cursor_pos (CFClient::Layout self, int index) 1077cursor_pos (CFPlus::Layout self, int index)
864 PPCODE: 1078 PPCODE:
865{ 1079{
866 PangoRectangle strong_pos; 1080 PangoRectangle strong_pos;
867 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1081 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868 1082
871 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873} 1087}
874 1088
875void 1089void
876render (CFClient::Layout self) 1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
877 PPCODE: 1091 PPCODE:
878{ 1092{
879 SV *retval; 1093 int line, x;
880 int w, h;
881 1094
882 layout_get_pixel_size (self, &w, &h); 1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
883 1097
884 if (self->rgba)
885 {
886 cairo_surface_t *surface;
887 cairo_t *cairo;
888
889 retval = newSV (w * h * 4);
890 SvPOK_only (retval);
891 SvCUR_set (retval, w * h * 4);
892
893 memset (SvPVX (retval), 0, w * h * 4);
894
895 surface = cairo_image_surface_create_for_data (
896 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
897 cairo = cairo_create (surface);
898 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900 pango_cairo_show_layout (cairo, self->pl);
901
902 cairo_destroy (cairo);
903 cairo_surface_destroy (surface);
904
905 // what a mess, and its premultiplied, too :(
906 {
907 uint32_t *p = (uint32_t *)SvPVX (retval);
908 uint32_t *e = p + w * h;
909
910 while (p < e)
911 {
912 uint32_t rgba = *p;
913 rgba = (rgba >> 24) | (rgba << 8);
914#if 0
915#ifdef _WIN32
916 {//D
917 uint8_t r = rgba >> 24;
918 uint8_t g = rgba >> 16;
919 uint8_t b = rgba >> 8;
920 uint8_t a = rgba >> 0;
921
922 rgba = (rgba & 0xffffff00) | a;
923 }
924#endif
925#endif
926 rgba = SDL_SwapBE32 (rgba);
927 *p++ = rgba;
928 }
929 }
930
931 EXTEND (SP, 5); 1098 EXTEND (SP, 2);
932 PUSHs (sv_2mortal (newSViv (w))); 1099 PUSHs (sv_2mortal (newSViv (line - 1)));
1100 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1101}
1102
1103void
1104line_x_to_index (CFPlus::Layout self, int line, int x)
1105 PPCODE:
1106{
1107 PangoLayoutLine *lp;
1108 int index, trailing;
1109
1110 if (line < 0)
1111 XSRETURN_EMPTY;
1112
1113 if (!(lp = pango_layout_get_line (self->pl, line)))
1114 XSRETURN_EMPTY; /* do better */
1115
1116 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1117
1118 EXTEND (SP, 2);
1119 if (GIMME_V == G_SCALAR)
933 PUSHs (sv_2mortal (newSViv (h))); 1120 PUSHs (sv_2mortal (newSViv (index + trailing)));
934 PUSHs (sv_2mortal (retval));
935 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937 }
938 else 1121 else
939 { 1122 {
940 FT_Bitmap bitmap;
941
942 retval = newSV (w * h);
943 SvPOK_only (retval);
944 SvCUR_set (retval, w * h);
945
946 bitmap.rows = h;
947 bitmap.width = w;
948 bitmap.pitch = w;
949 bitmap.buffer = (unsigned char*)SvPVX (retval);
950 bitmap.num_grays = 256;
951 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953 memset (bitmap.buffer, 0, w * h);
954
955 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957 EXTEND (SP, 5);
958 PUSHs (sv_2mortal (newSViv (w))); 1123 PUSHs (sv_2mortal (newSViv (index)));
959 PUSHs (sv_2mortal (newSViv (h))); 1124 PUSHs (sv_2mortal (newSViv (trailing)));
960 PUSHs (sv_2mortal (retval));
961 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963 } 1125 }
964} 1126}
965 1127
1128void
1129render (CFPlus::Layout self, float x, float y, int flags = 0)
1130 PPCODE:
1131 pango_opengl_render_layout_subpixel (
1132 self->pl,
1133 x * PANGO_SCALE, y * PANGO_SCALE,
1134 self->r, self->g, self->b, self->a,
1135 flags
1136 );
1137
966MODULE = CFClient PACKAGE = CFClient::Texture 1138MODULE = CFPlus PACKAGE = CFPlus::Texture
967 1139
968void 1140void
1141pad2pot (SV *data_, SV *w_, SV *h_)
1142 CODE:
1143{
1144 int ow = SvIV (w_);
1145 int oh = SvIV (h_);
1146
1147 if (ow && oh)
1148 {
1149 int nw = minpot (ow);
1150 int nh = minpot (oh);
1151
1152 if (nw != ow || nh != oh)
1153 {
1154 if (SvOK (data_))
1155 {
1156 STRLEN datalen;
1157 char *data = SvPVbyte (data_, datalen);
1158 int bpp = datalen / (ow * oh);
1159 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1160
1161 SvPOK_only (result_);
1162 SvCUR_set (result_, nw * nh * bpp);
1163
1164 memset (SvPVX (result_), 0, nw * nh * bpp);
1165 while (oh--)
1166 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1167
1168 sv_setsv (data_, result_);
1169 }
1170
1171 sv_setiv (w_, nw);
1172 sv_setiv (h_, nh);
1173 }
1174 }
1175}
1176
1177void
969draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1178draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
970 PROTOTYPE: $$$;$$ 1179 PROTOTYPE: $$$;$$
971 ALIAS: 1180 ALIAS:
972 draw_quad_alpha = 1 1181 draw_quad_alpha = 1
973 draw_quad_alpha_premultiplied = 2 1182 draw_quad_alpha_premultiplied = 2
974 CODE: 1183 CODE:
990 1199
991 if (ix == 2) 1200 if (ix == 2)
992 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1201 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993 else 1202 else
994 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1203 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995 GL_ONE_MINUS_DST_ALPHA, GL_ONE); 1204 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996 1205
997 glEnable (GL_ALPHA_TEST); 1206 glEnable (GL_ALPHA_TEST);
998 glAlphaFunc (GL_GREATER, 0.01f); 1207 glAlphaFunc (GL_GREATER, 0.01f);
999 } 1208 }
1000 1209
1012 glDisable (GL_ALPHA_TEST); 1221 glDisable (GL_ALPHA_TEST);
1013 glDisable (GL_BLEND); 1222 glDisable (GL_BLEND);
1014 } 1223 }
1015} 1224}
1016 1225
1017MODULE = CFClient PACKAGE = CFClient::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1018 1227
1019CFClient::Map 1228CFPlus::Map
1020new (SV *class, int map_width, int map_height) 1229new (SV *class)
1021 CODE: 1230 CODE:
1022 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1023 RETVAL->x = 0; 1232 RETVAL->x = 0;
1024 RETVAL->y = 0; 1233 RETVAL->y = 0;
1025 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1026 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1027 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1028 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1029 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1030 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1031 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
1034 RETVAL->row = 0; 1243 RETVAL->row = 0;
1035 OUTPUT: 1244 OUTPUT:
1036 RETVAL 1245 RETVAL
1037 1246
1038void 1247void
1039DESTROY (CFClient::Map self) 1248DESTROY (CFPlus::Map self)
1040 CODE: 1249 CODE:
1041{ 1250{
1042 map_clear (self); 1251 map_clear (self);
1043 Safefree (self->face); 1252 Safefree (self->face);
1253 Safefree (self->tex);
1044 Safefree (self); 1254 Safefree (self);
1045} 1255}
1046 1256
1047void 1257void
1258resize (CFPlus::Map self, int map_width, int map_height)
1259 CODE:
1260 self->w = map_width;
1261 self->h = map_height;
1262
1263void
1048clear (CFClient::Map self) 1264clear (CFPlus::Map self)
1049 CODE: 1265 CODE:
1050 map_clear (self); 1266 map_clear (self);
1051 1267
1052void 1268void
1053set_face (CFClient::Map self, int face, int texid) 1269set_face (CFPlus::Map self, int face, int texid)
1054 CODE: 1270 CODE:
1055{ 1271{
1056 while (self->faces <= face) 1272 while (self->faces <= face)
1057 { 1273 {
1058 Append (mapface, self->face, self->faces, self->faces); 1274 Append (mapface, self->face, self->faces, self->faces);
1061 1277
1062 self->face [face] = texid; 1278 self->face [face] = texid;
1063} 1279}
1064 1280
1065void 1281void
1066set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1282set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1067 CODE: 1283 CODE:
1068{ 1284{
1069 while (self->texs <= texid) 1285 while (self->texs <= texid)
1070 { 1286 {
1071 Append (maptex, self->tex, self->texs, self->texs); 1287 Append (maptex, self->tex, self->texs, self->texs);
1095 // from transparent color bleeding and ugly wrapping effects. 1311 // from transparent color bleeding and ugly wrapping effects.
1096 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1312 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097} 1313}
1098 1314
1099int 1315int
1100ox (CFClient::Map self) 1316ox (CFPlus::Map self)
1101 ALIAS: 1317 ALIAS:
1102 oy = 1 1318 oy = 1
1103 x = 2 1319 x = 2
1104 y = 3 1320 y = 3
1105 w = 4 1321 w = 4
1116 } 1332 }
1117 OUTPUT: 1333 OUTPUT:
1118 RETVAL 1334 RETVAL
1119 1335
1120void 1336void
1121scroll (CFClient::Map self, int dx, int dy) 1337scroll (CFPlus::Map self, int dx, int dy)
1122 CODE: 1338 CODE:
1123{ 1339{
1124 if (dx > 0) 1340 if (dx > 0)
1125 map_blank (self, self->x, self->y, dx - 1, self->h); 1341 map_blank (self, self->x, self->y, dx, self->h);
1126 else if (dx < 0) 1342 else if (dx < 0)
1127 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1343 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1128 1344
1129 if (dy > 0) 1345 if (dy > 0)
1130 map_blank (self, self->x, self->y, self->w, dy - 1); 1346 map_blank (self, self->x, self->y, self->w, dy);
1131 else if (dy < 0) 1347 else if (dy < 0)
1132 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1348 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1133 1349
1134 self->ox += dx; self->x += dx; 1350 self->ox += dx; self->x += dx;
1135 self->oy += dy; self->y += dy; 1351 self->oy += dy; self->y += dy;
1136 1352
1137 while (self->y < 0) 1353 while (self->y < 0)
1142 self->y += MAP_EXTEND_Y; 1358 self->y += MAP_EXTEND_Y;
1143 } 1359 }
1144} 1360}
1145 1361
1146void 1362void
1147map1a_update (CFClient::Map self, SV *data_) 1363map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148 CODE: 1364 CODE:
1149{ 1365{
1150 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1366 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1151 uint8_t *data_end = (uint8_t *)SvEND (data_); 1367 uint8_t *data_end = (uint8_t *)SvEND (data_);
1152 mapcell *cell; 1368 mapcell *cell;
1153 int x, y, flags; 1369 int x, y, flags;
1154 1370
1155 while (data < data_end) 1371 while (data < data_end - 1)
1156 { 1372 {
1157 flags = (data [0] << 8) + data [1]; data += 2; 1373 flags = (data [0] << 8) + data [1]; data += 2;
1158 1374
1159 x = ((flags >> 10) & 63) + self->x; 1375 x = self->x + ((flags >> 10) & 63);
1160 y = ((flags >> 4) & 63) + self->y; 1376 y = self->y + ((flags >> 4) & 63);
1161 1377
1162 cell = map_get_cell (self, x, y); 1378 cell = map_get_cell (self, x, y);
1163 1379
1164 if (flags & 15) 1380 if (flags & 15)
1165 { 1381 {
1166 if (cell->darkness < 0) 1382 if (!cell->darkness)
1167 { 1383 {
1384 memset (cell, 0, sizeof (*cell));
1168 cell->darkness = 0; 1385 cell->darkness = 256;
1169 cell->face [0] = 0;
1170 cell->face [1] = 0;
1171 cell->face [2] = 0;
1172 } 1386 }
1173 1387
1174 cell->darkness = flags & 8 ? *data++ : 255;
1175
1176 //TODO: don't trust server data to be in-range(!) 1388 //TODO: don't trust server data to be in-range(!)
1389
1390 if (flags & 8)
1391 {
1392 if (extmap)
1393 {
1394 uint8_t ext, cmd;
1395
1396 do
1397 {
1398 ext = *data++;
1399 cmd = ext & 0x3f;
1400
1401 if (cmd < 4)
1402 cell->darkness = 255 - ext * 64 + 1;
1403 else if (cmd == 5) // health
1404 {
1405 cell->stat_width = 1;
1406 cell->stat_hp = *data++;
1407 }
1408 else if (cmd == 6) // monster width
1409 cell->stat_width = *data++ + 1;
1410 else if (cmd == 0x47) // monster width
1411 {
1412 if (*data == 4)
1413 ; // decode player tag
1414
1415 data += *data + 1;
1416 }
1417 else if (cmd == 8) // cell flags
1418 cell->flags = *data++;
1419 else if (ext & 0x40) // unknown, multibyte => skip
1420 data += *data + 1;
1421 else
1422 data++;
1423 }
1424 while (ext & 0x80);
1425 }
1426 else
1427 cell->darkness = *data++ + 1;
1428 }
1177 1429
1178 if (flags & 4) 1430 if (flags & 4)
1179 { 1431 {
1180 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1432 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1181 } 1433 }
1189 { 1441 {
1190 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1442 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1191 } 1443 }
1192 } 1444 }
1193 else 1445 else
1194 cell->darkness = -1; 1446 cell->darkness = 0;
1195 } 1447 }
1196} 1448}
1197 1449
1198SV * 1450SV *
1199mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200 CODE: 1452 CODE:
1201{ 1453{
1202 int x1, x; 1454 int x1, x;
1203 int y1, y; 1455 int y1, y;
1204 int z; 1456 int z;
1254} 1506}
1255 OUTPUT: 1507 OUTPUT:
1256 RETVAL 1508 RETVAL
1257 1509
1258void 1510void
1259draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1511draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1260 PPCODE: 1512 CODE:
1261{ 1513{
1262 int vx, vy;
1263 int x, y, z; 1514 int x, y, z;
1264 int last_name; 1515 int last_name;
1265 mapface face; 1516 mapface face;
1266 int sw4 = (sw + 3) & ~3;
1267 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1268 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1269
1270 memset (darkness, 255, sw4 * sh);
1271 SvPOK_only (darkness_sv);
1272 SvCUR_set (darkness_sv, sw4 * sh);
1273
1274 vx = self->x + (self->w - sw) / 2 - shift_x;
1275 vy = self->y + (self->h - sh) / 2 - shift_y;
1276
1277 /*
1278 int vx = self->vx = self->w >= sw
1279 ? self->x + (self->w - sw) / 2
1280 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1281
1282 int vy = self->vy = self->h >= sh
1283 ? self->y + (self->h - sh) / 2
1284 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285 */
1286 1517
1287 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1288 1519
1520 glEnable (GL_BLEND);
1289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290 glEnable (GL_BLEND);
1291 glEnable (GL_TEXTURE_2D); 1522 glEnable (GL_TEXTURE_2D);
1292 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1523 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293 1524
1294 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1295 1526
1296 last_name = 0; 1527 last_name = 0;
1297 1528
1529 mx += self->x;
1530 my += self->y;
1531
1298 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1299 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1300 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1301 { 1535 {
1302 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1303 1537
1304 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1305 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1306 { 1540 {
1307 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1308
1309 darkness[y * sw4 + x] = cell->darkness < 0
1310 ? 255 - FOW_DARKNESS
1311 : 255 - cell->darkness;
1312 1542
1313 face = cell->face [z]; 1543 face = cell->face [z];
1314 1544
1315 if (face) 1545 if (face && face < self->texs)
1316 { 1546 {
1317 maptex tex = self->tex [face]; 1547 maptex tex = self->tex [face];
1318
1319 int px = (x + 1) * 32 - tex.w; 1548 int px = (x + 1) * 32 - tex.w;
1320 int py = (y + 1) * 32 - tex.h; 1549 int py = (y + 1) * 32 - tex.h;
1321 1550
1322 if (last_name != tex.name) 1551 if (last_name != tex.name)
1323 { 1552 {
1324 glEnd (); 1553 glEnd ();
1325 last_name = tex.name;
1326 glBindTexture (GL_TEXTURE_2D, last_name); 1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1327 glBegin (GL_QUADS); 1555 glBegin (GL_QUADS);
1328 } 1556 }
1329 1557
1330 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1331 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1332 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1560 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1333 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1334 } 1562 }
1563
1564 if (cell->flags && z == 2)
1565 {
1566 if (cell->flags & 1)
1567 {
1568 maptex tex = self->tex [1];
1569 int px = (x + 1) * 32 - tex.w + 2;
1570 int py = (y + 1) * 32 - tex.h - 6;
1571
1572 glEnd ();
1573 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1574 glBegin (GL_QUADS);
1575
1576 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1577 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1578 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1579 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1580 }
1581 }
1335 } 1582 }
1336 } 1583 }
1337 1584
1338 glEnd (); 1585 glEnd ();
1339 1586
1340 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1341 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1589
1590 // top layer: overlays such as the health bar
1591 for (y = 0; y < sh; y++)
1592 if (0 <= y + my && y + my < self->rows)
1593 {
1594 maprow *row = self->row + (y + my);
1595
1596 for (x = 0; x < sw; x++)
1597 if (row->c0 <= x + mx && x + mx < row->c1)
1598 {
1599 mapcell *cell = row->col + (x + mx - row->c0);
1600
1601 int px = x * 32;
1602 int py = y * 32;
1603
1604 if (cell->stat_hp)
1605 {
1606 int width = cell->stat_width * 32;
1607 int thick = sh / 28 + 1 + cell->stat_width;
1608
1609 glColor3ub (0, 0, 0);
1610 glRectf (px + 1, py - thick - 2,
1611 px + width - 1, py);
1612
1613 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1614 glRectf (px + 2,
1615 py - thick - 1,
1616 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1617 }
1618 }
1619 }
1620}
1621
1622void
1623draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1624 CODE:
1625{
1626 static float color[16][3] = {
1627 { 0.00F, 0.00F, 0.00F },
1628 { 1.00F, 1.00F, 1.00F },
1629 { 0.00F, 0.00F, 0.55F },
1630 { 1.00F, 0.00F, 0.00F },
1631
1632 { 1.00F, 0.54F, 0.00F },
1633 { 0.11F, 0.56F, 1.00F },
1634 { 0.93F, 0.46F, 0.00F },
1635 { 0.18F, 0.54F, 0.34F },
1636
1637 { 0.56F, 0.73F, 0.56F },
1638 { 0.80F, 0.80F, 0.80F },
1639 { 0.55F, 0.41F, 0.13F },
1640 { 0.99F, 0.77F, 0.26F },
1641
1642 { 0.74F, 0.65F, 0.41F },
1643
1644 { 0.00F, 1.00F, 1.00F },
1645 { 1.00F, 0.00F, 1.00F },
1646 { 1.00F, 1.00F, 0.00F },
1647 };
1648
1649 int x, y;
1650
1651 glEnable (GL_TEXTURE_2D);
1652 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1653 glEnable (GL_BLEND);
1654 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1655 glBegin (GL_QUADS);
1656
1657 for (y = 0; y < h; y++)
1658 for (x = 0; x < w; x++)
1659 {
1660 unsigned char m = data [x + y * w];
1661
1662 if (m)
1663 {
1664 float *c = color [m & 15];
1665
1666 float tx1 = m & 0x40 ? 0.5 : 0.;
1667 float tx2 = tx1 + 0.5;
1668
1669 glColor4f (c[0], c[1], c[2], 0.75);
1670 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1671 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1672 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1673 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1674 }
1675 }
1676
1677 glEnd ();
1678 glDisable (GL_BLEND);
1679 glDisable (GL_TEXTURE_2D);
1680}
1681
1682void
1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1684 PPCODE:
1685{
1686 int x, y;
1687 int sw4 = (sw + 3) & ~3;
1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1690
1691 memset (darkness, 255, sw4 * sh);
1692 SvPOK_only (darkness_sv);
1693 SvCUR_set (darkness_sv, sw4 * sh);
1694
1695 mx += self->x;
1696 my += self->y;
1697
1698 for (y = 0; y < sh; y++)
1699 if (0 <= y + my && y + my < self->rows)
1700 {
1701 maprow *row = self->row + (y + my);
1702
1703 for (x = 0; x < sw; x++)
1704 if (row->c0 <= x + mx && x + mx < row->c1)
1705 {
1706 mapcell *cell = row->col + (x + mx - row->c0);
1707
1708 darkness[y * sw4 + x] = cell->darkness
1709 ? 255 - (cell->darkness - 1)
1710 : 255 - FOW_DARKNESS;
1711 }
1712 }
1342 1713
1343 EXTEND (SP, 3); 1714 EXTEND (SP, 3);
1344 PUSHs (sv_2mortal (newSViv (sw4))); 1715 PUSHs (sv_2mortal (newSViv (sw4)));
1345 PUSHs (sv_2mortal (newSViv (sh))); 1716 PUSHs (sv_2mortal (newSViv (sh)));
1346 PUSHs (darkness_sv); 1717 PUSHs (darkness_sv);
1347} 1718}
1348 1719
1349SV * 1720SV *
1350get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1721get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351 CODE: 1722 CODE:
1352{ 1723{
1353 int x, y, x1, y1; 1724 int x, y, x1, y1;
1354 SV *data_sv = newSV (w * h * 7 + 5); 1725 SV *data_sv = newSV (w * h * 7 + 5);
1355 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1726 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1417} 1788}
1418 OUTPUT: 1789 OUTPUT:
1419 RETVAL 1790 RETVAL
1420 1791
1421void 1792void
1422set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1793set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423 PPCODE: 1794 PPCODE:
1424{ 1795{
1425 int x, y, z; 1796 int x, y, z;
1426 int w, h; 1797 int w, h;
1427 int x1, y1; 1798 int x1, y1;
1459 1830
1460 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1831 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1461 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1832 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1462 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1833 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1463 1834
1464 if (cell->darkness <= 0) 1835 if (cell->darkness == 0)
1465 { 1836 {
1466 cell->darkness = -1; 1837 cell->darkness = 0;
1467 1838
1468 for (z = 0; z <= 2; z++) 1839 for (z = 0; z <= 2; z++)
1469 { 1840 {
1470 cell->face[z] = face[z]; 1841 cell->face[z] = face[z];
1471 1842
1476 } 1847 }
1477 } 1848 }
1478 } 1849 }
1479} 1850}
1480 1851
1481MODULE = CFClient PACKAGE = CFClient::MixChunk 1852MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482 1853
1483CFClient::MixChunk 1854CFPlus::MixChunk
1484new_from_file (SV *class, char *path) 1855new_from_file (SV *class, char *path)
1485 CODE: 1856 CODE:
1486 RETVAL = Mix_LoadWAV (path); 1857 RETVAL = Mix_LoadWAV (path);
1487 OUTPUT: 1858 OUTPUT:
1488 RETVAL 1859 RETVAL
1489 1860
1490void 1861void
1491DESTROY (CFClient::MixChunk self) 1862DESTROY (CFPlus::MixChunk self)
1492 CODE: 1863 CODE:
1493 Mix_FreeChunk (self); 1864 Mix_FreeChunk (self);
1494 1865
1495int 1866int
1496volume (CFClient::MixChunk self, int volume = -1) 1867volume (CFPlus::MixChunk self, int volume = -1)
1497 CODE: 1868 CODE:
1498 RETVAL = Mix_VolumeChunk (self, volume); 1869 RETVAL = Mix_VolumeChunk (self, volume);
1499 OUTPUT: 1870 OUTPUT:
1500 RETVAL 1871 RETVAL
1501 1872
1502int 1873int
1503play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1874play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504 CODE: 1875 CODE:
1505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1876 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506 OUTPUT: 1877 OUTPUT:
1507 RETVAL 1878 RETVAL
1508 1879
1509MODULE = CFClient PACKAGE = CFClient::MixMusic 1880MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510 1881
1511int 1882int
1512volume (int volume = -1) 1883volume (int volume = -1)
1513 CODE: 1884 CODE:
1514 RETVAL = Mix_VolumeMusic (volume); 1885 RETVAL = Mix_VolumeMusic (volume);
1515 OUTPUT: 1886 OUTPUT:
1516 RETVAL 1887 RETVAL
1517 1888
1518CFClient::MixMusic 1889CFPlus::MixMusic
1519new_from_file (SV *class, char *path) 1890new_from_file (SV *class, char *path)
1520 CODE: 1891 CODE:
1521 RETVAL = Mix_LoadMUS (path); 1892 RETVAL = Mix_LoadMUS (path);
1522 OUTPUT: 1893 OUTPUT:
1523 RETVAL 1894 RETVAL
1524 1895
1525void 1896void
1526DESTROY (CFClient::MixMusic self) 1897DESTROY (CFPlus::MixMusic self)
1527 CODE: 1898 CODE:
1528 Mix_FreeMusic (self); 1899 Mix_FreeMusic (self);
1529 1900
1530int 1901int
1531play (CFClient::MixMusic self, int loops = -1) 1902play (CFPlus::MixMusic self, int loops = -1)
1532 CODE: 1903 CODE:
1533 RETVAL = Mix_PlayMusic (self, loops); 1904 RETVAL = Mix_PlayMusic (self, loops);
1534 OUTPUT: 1905 OUTPUT:
1535 RETVAL 1906 RETVAL
1536 1907
1537MODULE = CFClient PACKAGE = CFClient::OpenGL 1908MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538 1909
1539BOOT: 1910BOOT:
1540{ 1911{
1541 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1912 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542 static const struct { 1913 static const struct {
1543 const char *name; 1914 const char *name;
1544 IV iv; 1915 IV iv;
1545 } *civ, const_iv[] = { 1916 } *civ, const_iv[] = {
1546# define const_iv(name) { # name, (IV)name } 1917# define const_iv(name) { # name, (IV)name }
1553 const_iv (GL_SCISSOR_TEST), 1924 const_iv (GL_SCISSOR_TEST),
1554 const_iv (GL_DEPTH_TEST), 1925 const_iv (GL_DEPTH_TEST),
1555 const_iv (GL_ALPHA_TEST), 1926 const_iv (GL_ALPHA_TEST),
1556 const_iv (GL_NORMALIZE), 1927 const_iv (GL_NORMALIZE),
1557 const_iv (GL_RESCALE_NORMAL), 1928 const_iv (GL_RESCALE_NORMAL),
1929 const_iv (GL_FRONT),
1930 const_iv (GL_BACK),
1558 const_iv (GL_AND), 1931 const_iv (GL_AND),
1559 const_iv (GL_ONE), 1932 const_iv (GL_ONE),
1560 const_iv (GL_ZERO), 1933 const_iv (GL_ZERO),
1561 const_iv (GL_SRC_ALPHA), 1934 const_iv (GL_SRC_ALPHA),
1562 const_iv (GL_SRC_ALPHA_SATURATE), 1935 const_iv (GL_DST_ALPHA),
1563 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1936 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564 const_iv (GL_ONE_MINUS_DST_ALPHA), 1937 const_iv (GL_ONE_MINUS_DST_ALPHA),
1938 const_iv (GL_SRC_ALPHA_SATURATE),
1565 const_iv (GL_RGB), 1939 const_iv (GL_RGB),
1566 const_iv (GL_RGBA), 1940 const_iv (GL_RGBA),
1941 const_iv (GL_RGBA4),
1942 const_iv (GL_RGBA8),
1943 const_iv (GL_RGB5_A1),
1567 const_iv (GL_UNSIGNED_BYTE), 1944 const_iv (GL_UNSIGNED_BYTE),
1568 const_iv (GL_UNSIGNED_SHORT), 1945 const_iv (GL_UNSIGNED_SHORT),
1569 const_iv (GL_UNSIGNED_INT), 1946 const_iv (GL_UNSIGNED_INT),
1570 const_iv (GL_ALPHA), 1947 const_iv (GL_ALPHA),
1571 const_iv (GL_INTENSITY), 1948 const_iv (GL_INTENSITY),
1603 const_iv (GL_SEPARABLE_2D), 1980 const_iv (GL_SEPARABLE_2D),
1604 const_iv (GL_CONVOLUTION_2D), 1981 const_iv (GL_CONVOLUTION_2D),
1605 const_iv (GL_CONVOLUTION_BORDER_MODE), 1982 const_iv (GL_CONVOLUTION_BORDER_MODE),
1606 const_iv (GL_CONSTANT_BORDER), 1983 const_iv (GL_CONSTANT_BORDER),
1607 const_iv (GL_LINES), 1984 const_iv (GL_LINES),
1985 const_iv (GL_LINE_STRIP),
1608 const_iv (GL_LINE_LOOP), 1986 const_iv (GL_LINE_LOOP),
1609 const_iv (GL_QUADS), 1987 const_iv (GL_QUADS),
1610 const_iv (GL_QUAD_STRIP), 1988 const_iv (GL_QUAD_STRIP),
1611 const_iv (GL_TRIANGLES), 1989 const_iv (GL_TRIANGLES),
1612 const_iv (GL_TRIANGLE_STRIP), 1990 const_iv (GL_TRIANGLE_STRIP),
1645 OUTPUT: 2023 OUTPUT:
1646 RETVAL 2024 RETVAL
1647 2025
1648int glGetError () 2026int glGetError ()
1649 2027
2028void glFinish ()
2029
1650void glClear (int mask) 2030void glClear (int mask)
1651 2031
1652void glClearColor (float r, float g, float b, float a = 1.0) 2032void glClearColor (float r, float g, float b, float a = 1.0)
1653 PROTOTYPE: @ 2033 PROTOTYPE: @
1654 2034
1677void glPushMatrix () 2057void glPushMatrix ()
1678 2058
1679void glPopMatrix () 2059void glPopMatrix ()
1680 2060
1681void glLoadIdentity () 2061void glLoadIdentity ()
2062
2063void glDrawBuffer (int buffer)
2064
2065void glReadBuffer (int buffer)
1682 2066
1683# near_ and far_ are due to microsofts buggy "c" compiler 2067# near_ and far_ are due to microsofts buggy "c" compiler
1684void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2068void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685 2069
1686# near_ and far_ are due to microsofts buggy "c" compiler 2070# near_ and far_ are due to microsofts buggy "c" compiler
1716 r *= a; 2100 r *= a;
1717 g *= a; 2101 g *= a;
1718 b *= a; 2102 b *= a;
1719 } 2103 }
1720 // microsoft visual "c" rounds instead of truncating... 2104 // microsoft visual "c" rounds instead of truncating...
1721 glColor4ub (MIN ((int)(r * 256.f), 255), 2105 glColor4f (r, g, b, a);
1722 MIN ((int)(g * 256.f), 255),
1723 MIN ((int)(b * 256.f), 255),
1724 MIN ((int)(a * 256.f), 255));
1725 2106
1726void glInterleavedArrays (int format, int stride, char *data) 2107void glInterleavedArrays (int format, int stride, char *data)
1727 2108
1728void glDrawElements (int mode, int count, int type, char *indices) 2109void glDrawElements (int mode, int count, int type, char *indices)
1729 2110
1806 2187
1807void glEndList () 2188void glEndList ()
1808 2189
1809void glCallList (int list) 2190void glCallList (int list)
1810 2191
1811

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines