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.116 by root, Thu Jun 15 08:29:16 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"
14
15#ifdef _WIN32
16# undef pipe
17#endif
11 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>
15#include <stdlib.h> 22#include <stdlib.h>
18#include <SDL_endian.h> 25#include <SDL_endian.h>
19#include <SDL_image.h> 26#include <SDL_image.h>
20#include <SDL_mixer.h> 27#include <SDL_mixer.h>
21#include <SDL_opengl.h> 28#include <SDL_opengl.h>
22 29
30#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS
32
23#include <glib/gmacros.h> 33#include <glib/gmacros.h>
24 34
25#include <pango/pango.h> 35#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 36
30#ifndef _WIN32 37#ifndef _WIN32
31# include <sys/types.h> 38# include <sys/types.h>
32# include <sys/socket.h> 39# include <sys/socket.h>
33# include <netinet/in.h> 40# include <netinet/in.h>
34# include <netinet/tcp.h> 41# include <netinet/tcp.h>
35# include <inttypes.h> 42# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 43#endif
44 44
45#include "glext.h" 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 46
47#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
48 48
49#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
51 51
52#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
53 59
54static struct 60static struct
55{ 61{
56#define GL_FUNC(ptr,name) ptr name; 62#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 63#include "glfunc.h"
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 72 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 73 else
68 glBlendFunc (sa, da); 74 glBlendFunc (sa, da);
69} 75}
70 76
77#include "texcache.c"
78
79#include "pango-font.c"
80#include "pango-fontmap.c"
81#include "pango-render.c"
82
71typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
73 85
74typedef 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}
75 105
76typedef struct cf_layout { 106typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 107 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
80 int base_height; 109 int base_height;
81 CFClient__Font font; 110 CFPlus__Font font;
82} *CFClient__Layout; 111} *CFPlus__Layout;
83 112
84static CFClient__Font default_font; 113static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 114static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 115static PangoFontMap *opengl_fontmap;
87 116
88static void 117static void
89substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
90{ 119{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 120 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 121#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 122 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 123#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 125}
101 126
102static void 127static void
103layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
104{ 129{
105 /* 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
106 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
107 */ 132 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
112 137
113 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
114} 139}
115 140
116static void 141static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
120 148
121 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 151
124 *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;
125} 157}
126 158
127typedef uint16_t mapface; 159typedef uint16_t mapface;
128 160
129typedef struct { 161typedef struct {
132 float s, t; 164 float s, t;
133 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
134} maptex; 166} maptex;
135 167
136typedef struct { 168typedef struct {
137 int16_t darkness; 169 uint32_t player;
138 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
139} mapcell; 173} mapcell;
140 174
141typedef struct { 175typedef struct {
142 int32_t c0, c1; 176 int32_t c0, c1;
143 mapcell *col; 177 mapcell *col;
152 int texs; 186 int texs;
153 maptex *tex; 187 maptex *tex;
154 188
155 int32_t rows; 189 int32_t rows;
156 maprow *row; 190 maprow *row;
157} *CFClient__Map; 191} *CFPlus__Map;
158 192
159static char * 193static char *
160prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
161{ 195{
162 char *p; 196 char *p;
180 214
181#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))
182#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))
183 217
184static maprow * 218static maprow *
185map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
186{ 220{
187 if (0 > y) 221 if (0 > y)
188 { 222 {
189 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
228 262
229 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
230} 264}
231 265
232static mapcell * 266static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
234{ 268{
235 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
236} 270}
237 271
238static void 272static void
239map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
240{ 274{
241 int r; 275 int r;
242 276
243 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
252 self->row = 0; 286 self->row = 0;
253 self->rows = 0; 287 self->rows = 0;
254} 288}
255 289
256static void 290static void
257map_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)
258{ 292{
259 int x, y; 293 int x, y;
260 maprow *row; 294 maprow *row;
295 mapcell *cell;
261 296
262 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 298 if (y >= 0)
264 { 299 {
265 if (y >= self->rows) 300 if (y >= self->rows)
271 if (x >= row->c0) 306 if (x >= row->c0)
272 { 307 {
273 if (x >= row->c1) 308 if (x >= row->c1)
274 break; 309 break;
275 310
276 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;
277 } 317 }
278 } 318 }
279} 319}
280 320
281static void 321static void
319 n |= n >> 16; 359 n |= n >> 16;
320 360
321 return n + 1; 361 return n + 1;
322} 362}
323 363
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
367
324MODULE = CFClient PACKAGE = CFClient 368MODULE = CFPlus PACKAGE = CFPlus
325 369
326PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
327 371
328BOOT: 372BOOT:
329{ 373{
330 HV *stash = gv_stashpv ("CFClient", 1); 374 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 375 static const struct {
332 const char *name; 376 const char *name;
333 IV iv; 377 IV iv;
334 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
335# 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
336 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
337 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
338 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
339 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
340 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
349 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
350 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
351 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
352 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
353 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
354 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
355 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
356 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
357 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
358 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
413 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
414 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
415 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
416 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
417 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
418 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
419 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
420 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
421 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
422 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
423 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
424 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
425 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
426 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
427 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
428 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
429 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
430 const_iv (KMOD_CTRL),
431 const_iv (KMOD_SHIFT),
432 const_iv (KMOD_ALT),
433 const_iv (KMOD_META)
434# undef const_iv 487# undef const_iv
435 }; 488 };
436 489
437 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; )
438 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);
439} 495}
496
497int
498in_destruct ()
499 CODE:
500 RETVAL = PL_main_cv == Nullcv;
501 OUTPUT:
502 RETVAL
440 503
441NV floor (NV x) 504NV floor (NV x)
442 505
443NV ceil (NV x) 506NV ceil (NV x)
444 507
445void 508void
446pango_init () 509pango_init ()
447 CODE: 510 CODE:
448 // delayed, so it can pick up new fonts added by AddFontResourceEx
449{ 511{
450 {
451 ft2_fontmap = pango_ft2_font_map_new (); 512 opengl_fontmap = pango_opengl_font_map_new ();
452 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);
453 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 514 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454 }
455 {
456 cairo_font_options_t *fopt = cairo_font_options_create ();
457 cairo_fontmap = pango_cairo_font_map_get_default ();
458 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459#ifdef _WIN32
460 // cairo looks like shit eaten twice on windows
461 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462#else
463 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464#endif
465 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467 pango_cairo_context_set_font_options (cairo_context, fopt);
468 cairo_font_options_destroy (fopt);
469 }
470} 515}
471 516
472int 517int
473SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 518SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
474 519
475void 520void
476SDL_Quit () 521SDL_Quit ()
477 522
478void 523void
493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 538 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 539 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 540 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496 541
497 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
498 547
499 SDL_EnableUNICODE (1); 548 SDL_EnableUNICODE (1);
500 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 549 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501 550
502 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 551 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
554 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
555 case SDL_KEYUP: 604 case SDL_KEYUP:
556 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
557 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
558 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 */
559 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
560 break; 610 break;
561 611
562 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
563 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
589 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 639 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 640 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591 break; 641 break;
592 } 642 }
593 643
594 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 644 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595 } 645 }
596} 646}
597 647
598int 648int
599Mix_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)
613#ifndef _WIN32 663#ifndef _WIN32
614 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
615#endif 665#endif
616 666
617void 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
618add_font (char *file) 697add_font (char *file)
619 CODE: 698 CODE:
620 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 699 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621#ifdef _WIN32
622 // cairo... sigh... requires win2000
623 AddFontResourceEx (file, FR_PRIVATE, 0);
624#endif
625 700
626void 701void
627load_image_inline (SV *image_) 702load_image_inline (SV *image_)
628 ALIAS: 703 ALIAS:
629 load_image_file = 1 704 load_image_file = 1
671 746
672 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 747 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673 748
674 assert (surface2->pitch == surface2->w * 4); 749 assert (surface2->pitch == surface2->w * 4);
675 750
751 SDL_LockSurface (surface2);
676 EXTEND (SP, 5); 752 EXTEND (SP, 6);
677 PUSHs (sv_2mortal (newSViv (surface2->w))); 753 PUSHs (sv_2mortal (newSViv (surface2->w)));
678 PUSHs (sv_2mortal (newSViv (surface2->h))); 754 PUSHs (sv_2mortal (newSViv (surface2->h)));
679 SDL_LockSurface (surface2);
680 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 755 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681 SDL_UnlockSurface (surface2);
682 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)));
683 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 757 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 758 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
759 SDL_UnlockSurface (surface2);
685 760
686 SDL_FreeSurface (surface); 761 SDL_FreeSurface (surface);
687 SDL_FreeSurface (surface2); 762 SDL_FreeSurface (surface2);
688} 763}
689 764
728 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
729#endif 804#endif
730 _exit (1); 805 _exit (1);
731 806
732void 807void
733_exit (int retval) 808_exit (int retval = 0)
734 CODE: 809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
812#else
735 _exit (retval); 813 _exit (retval);
814#endif
736 815
737MODULE = CFClient PACKAGE = CFClient::Font 816MODULE = CFPlus PACKAGE = CFPlus::Font
738 817
739CFClient::Font 818CFPlus::Font
740new_from_file (SV *class, char *path, int id = 0) 819new_from_file (SV *class, char *path, int id = 0)
741 CODE: 820 CODE:
742{ 821{
743 int count; 822 int count;
744 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 823 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
747} 826}
748 OUTPUT: 827 OUTPUT:
749 RETVAL 828 RETVAL
750 829
751void 830void
752DESTROY (CFClient::Font self) 831DESTROY (CFPlus::Font self)
753 CODE: 832 CODE:
754 pango_font_description_free (self); 833 pango_font_description_free (self);
755 834
756void 835void
757make_default (CFClient::Font self) 836make_default (CFPlus::Font self)
758 CODE: 837 CODE:
759 default_font = self; 838 default_font = self;
760 839
761MODULE = CFClient PACKAGE = CFClient::Layout 840MODULE = CFPlus PACKAGE = CFPlus::Layout
762 841
763CFClient::Layout 842void
764new (SV *class, int rgba = 0) 843reset_glyph_cache ()
844 CODE:
845 tc_clear ();
846
847CFPlus::Layout
848new (SV *class)
765 CODE: 849 CODE:
766 New (0, RETVAL, 1, struct cf_layout); 850 New (0, RETVAL, 1, struct cf_layout);
767 851
768 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 852 RETVAL->pl = pango_layout_new (opengl_context);
769 RETVAL->rgba = rgba;
770 RETVAL->r = 1.; 853 RETVAL->r = 1.;
771 RETVAL->g = 1.; 854 RETVAL->g = 1.;
772 RETVAL->b = 1.; 855 RETVAL->b = 1.;
773 RETVAL->a = 1.; 856 RETVAL->a = 1.;
774 RETVAL->base_height = MIN_FONT_HEIGHT; 857 RETVAL->base_height = MIN_FONT_HEIGHT;
778 layout_update_font (RETVAL); 861 layout_update_font (RETVAL);
779 OUTPUT: 862 OUTPUT:
780 RETVAL 863 RETVAL
781 864
782void 865void
783DESTROY (CFClient::Layout self) 866DESTROY (CFPlus::Layout self)
784 CODE: 867 CODE:
785 g_object_unref (self->pl); 868 g_object_unref (self->pl);
786 Safefree (self); 869 Safefree (self);
787 870
788int
789is_rgba (CFClient::Layout self)
790 CODE:
791 RETVAL = self->rgba;
792 OUTPUT:
793 RETVAL
794
795void 871void
796set_text (CFClient::Layout self, SV *text_) 872set_text (CFPlus::Layout self, SV *text_)
797 CODE: 873 CODE:
798{ 874{
799 STRLEN textlen; 875 STRLEN textlen;
800 char *text = SvPVutf8 (text_, textlen); 876 char *text = SvPVutf8 (text_, textlen);
801 877
802 pango_layout_set_text (self->pl, text, textlen); 878 pango_layout_set_text (self->pl, text, textlen);
803} 879}
804 880
805void 881void
806set_markup (CFClient::Layout self, SV *text_) 882set_markup (CFPlus::Layout self, SV *text_)
807 CODE: 883 CODE:
808{ 884{
809 STRLEN textlen; 885 STRLEN textlen;
810 char *text = SvPVutf8 (text_, textlen); 886 char *text = SvPVutf8 (text_, textlen);
811 887
812 pango_layout_set_markup (self->pl, text, textlen); 888 pango_layout_set_markup (self->pl, text, textlen);
813} 889}
814 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
815SV * 976SV *
816get_text (CFClient::Layout self) 977get_text (CFPlus::Layout self)
817 CODE: 978 CODE:
818 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 979 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819 sv_utf8_decode (RETVAL); 980 sv_utf8_decode (RETVAL);
820 OUTPUT: 981 OUTPUT:
821 RETVAL 982 RETVAL
822 983
823void 984void
824set_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.)
825 CODE: 986 CODE:
826 self->r = r; 987 self->r = r;
827 self->g = g; 988 self->g = g;
828 self->b = b; 989 self->b = b;
829 self->a = a; 990 self->a = a;
830 991
831void 992void
832set_font (CFClient::Layout self, CFClient::Font font = 0) 993set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833 CODE: 994 CODE:
834 if (self->font != font) 995 if (self->font != font)
835 { 996 {
836 self->font = font; 997 self->font = font;
837 layout_update_font (self); 998 layout_update_font (self);
838 } 999 }
839 1000
840void 1001void
841set_height (CFClient::Layout self, int base_height) 1002set_height (CFPlus::Layout self, int base_height)
842 CODE: 1003 CODE:
843 if (self->base_height != base_height) 1004 if (self->base_height != base_height)
844 { 1005 {
845 self->base_height = base_height; 1006 self->base_height = base_height;
846 layout_update_font (self); 1007 layout_update_font (self);
847 } 1008 }
848 1009
849void 1010void
850set_width (CFClient::Layout self, int max_width = -1) 1011set_width (CFPlus::Layout self, int max_width = -1)
851 CODE: 1012 CODE:
852 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);
853 1014
854void 1015void
855set_indent (CFClient::Layout self, int indent) 1016set_indent (CFPlus::Layout self, int indent)
856 CODE: 1017 CODE:
857 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1018 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858 1019
859void 1020void
860set_spacing (CFClient::Layout self, int spacing) 1021set_spacing (CFPlus::Layout self, int spacing)
861 CODE: 1022 CODE:
862 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1023 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863 1024
864void 1025void
865set_ellipsise (CFClient::Layout self, int ellipsise) 1026set_ellipsise (CFPlus::Layout self, int ellipsise)
866 CODE: 1027 CODE:
867 pango_layout_set_ellipsize (self->pl, 1028 pango_layout_set_ellipsize (self->pl,
868 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1029 ellipsise == 1 ? PANGO_ELLIPSIZE_START
869 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1030 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1031 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
871 : PANGO_ELLIPSIZE_NONE 1032 : PANGO_ELLIPSIZE_NONE
872 ); 1033 );
873 1034
874void 1035void
875set_single_paragraph_mode (CFClient::Layout self, int spm) 1036set_single_paragraph_mode (CFPlus::Layout self, int spm)
876 CODE: 1037 CODE:
877 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1038 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878 1039
879void 1040void
880size (CFClient::Layout self) 1041size (CFPlus::Layout self)
881 PPCODE: 1042 PPCODE:
882{ 1043{
883 int w, h; 1044 int w, h;
884 1045
885 layout_get_pixel_size (self, &w, &h); 1046 layout_get_pixel_size (self, &w, &h);
888 PUSHs (sv_2mortal (newSViv (w))); 1049 PUSHs (sv_2mortal (newSViv (w)));
889 PUSHs (sv_2mortal (newSViv (h))); 1050 PUSHs (sv_2mortal (newSViv (h)));
890} 1051}
891 1052
892int 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
893xy_to_index (CFClient::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
894 CODE: 1067 CODE:
895{ 1068{
896 int index, trailing; 1069 int index, trailing;
897 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);
898 RETVAL = index; 1071 RETVAL = index + trailing;
899} 1072}
900 OUTPUT: 1073 OUTPUT:
901 RETVAL 1074 RETVAL
902 1075
903void 1076void
904cursor_pos (CFClient::Layout self, int index) 1077cursor_pos (CFPlus::Layout self, int index)
905 PPCODE: 1078 PPCODE:
906{ 1079{
907 PangoRectangle strong_pos; 1080 PangoRectangle strong_pos;
908 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1081 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909 1082
912 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914} 1087}
915 1088
916void 1089void
917render (CFClient::Layout self) 1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
918 PPCODE: 1091 PPCODE:
919{ 1092{
920 SV *retval; 1093 int line, x;
921 int w, h;
922 1094
923 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 */
924 1097
925 if (self->rgba)
926 {
927 cairo_surface_t *surface;
928 cairo_t *cairo;
929
930 retval = newSV (w * h * 4);
931 SvPOK_only (retval);
932 SvCUR_set (retval, w * h * 4);
933
934 memset (SvPVX (retval), 0, w * h * 4);
935
936 surface = cairo_image_surface_create_for_data (
937 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
938 cairo = cairo_create (surface);
939 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941 pango_cairo_show_layout (cairo, self->pl);
942
943 cairo_destroy (cairo);
944 cairo_surface_destroy (surface);
945
946 // what a mess, and its premultiplied, too :(
947 {
948 uint32_t *p = (uint32_t *)SvPVX (retval);
949 uint32_t *e = p + w * h;
950
951 while (p < e)
952 {
953 uint32_t rgba = *p;
954 rgba = (rgba >> 24) | (rgba << 8);
955#if 0
956#ifdef _WIN32
957 {//D
958 uint8_t r = rgba >> 24;
959 uint8_t g = rgba >> 16;
960 uint8_t b = rgba >> 8;
961 uint8_t a = rgba >> 0;
962
963 rgba = (rgba & 0xffffff00) | a;
964 }
965#endif
966#endif
967 rgba = SDL_SwapBE32 (rgba);
968 *p++ = rgba;
969 }
970 }
971
972 EXTEND (SP, 5); 1098 EXTEND (SP, 2);
973 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)
974 PUSHs (sv_2mortal (newSViv (h))); 1120 PUSHs (sv_2mortal (newSViv (index + trailing)));
975 PUSHs (sv_2mortal (retval));
976 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978 }
979 else 1121 else
980 { 1122 {
981 FT_Bitmap bitmap;
982
983 retval = newSV (w * h);
984 SvPOK_only (retval);
985 SvCUR_set (retval, w * h);
986
987 bitmap.rows = h;
988 bitmap.width = w;
989 bitmap.pitch = w;
990 bitmap.buffer = (unsigned char*)SvPVX (retval);
991 bitmap.num_grays = 256;
992 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994 memset (bitmap.buffer, 0, w * h);
995
996 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998 EXTEND (SP, 5);
999 PUSHs (sv_2mortal (newSViv (w))); 1123 PUSHs (sv_2mortal (newSViv (index)));
1000 PUSHs (sv_2mortal (newSViv (h))); 1124 PUSHs (sv_2mortal (newSViv (trailing)));
1001 PUSHs (sv_2mortal (retval));
1002 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004 } 1125 }
1005} 1126}
1006 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
1007MODULE = CFClient PACKAGE = CFClient::Texture 1138MODULE = CFPlus PACKAGE = CFPlus::Texture
1008 1139
1009void 1140void
1010pad2pot (SV *data_, SV *w_, SV *h_) 1141pad2pot (SV *data_, SV *w_, SV *h_)
1011 CODE: 1142 CODE:
1012{ 1143{
1090 glDisable (GL_ALPHA_TEST); 1221 glDisable (GL_ALPHA_TEST);
1091 glDisable (GL_BLEND); 1222 glDisable (GL_BLEND);
1092 } 1223 }
1093} 1224}
1094 1225
1095MODULE = CFClient PACKAGE = CFClient::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1096 1227
1097CFClient::Map 1228CFPlus::Map
1098new (SV *class, int map_width, int map_height) 1229new (SV *class)
1099 CODE: 1230 CODE:
1100 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1101 RETVAL->x = 0; 1232 RETVAL->x = 0;
1102 RETVAL->y = 0; 1233 RETVAL->y = 0;
1103 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1104 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1105 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1106 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1107 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1108 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1109 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
1112 RETVAL->row = 0; 1243 RETVAL->row = 0;
1113 OUTPUT: 1244 OUTPUT:
1114 RETVAL 1245 RETVAL
1115 1246
1116void 1247void
1117DESTROY (CFClient::Map self) 1248DESTROY (CFPlus::Map self)
1118 CODE: 1249 CODE:
1119{ 1250{
1120 map_clear (self); 1251 map_clear (self);
1121 Safefree (self->face); 1252 Safefree (self->face);
1122 Safefree (self->tex); 1253 Safefree (self->tex);
1123 Safefree (self); 1254 Safefree (self);
1124} 1255}
1125 1256
1126void 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
1127clear (CFClient::Map self) 1264clear (CFPlus::Map self)
1128 CODE: 1265 CODE:
1129 map_clear (self); 1266 map_clear (self);
1130 1267
1131void 1268void
1132set_face (CFClient::Map self, int face, int texid) 1269set_face (CFPlus::Map self, int face, int texid)
1133 CODE: 1270 CODE:
1134{ 1271{
1135 while (self->faces <= face) 1272 while (self->faces <= face)
1136 { 1273 {
1137 Append (mapface, self->face, self->faces, self->faces); 1274 Append (mapface, self->face, self->faces, self->faces);
1140 1277
1141 self->face [face] = texid; 1278 self->face [face] = texid;
1142} 1279}
1143 1280
1144void 1281void
1145set_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)
1146 CODE: 1283 CODE:
1147{ 1284{
1148 while (self->texs <= texid) 1285 while (self->texs <= texid)
1149 { 1286 {
1150 Append (maptex, self->tex, self->texs, self->texs); 1287 Append (maptex, self->tex, self->texs, self->texs);
1174 // from transparent color bleeding and ugly wrapping effects. 1311 // from transparent color bleeding and ugly wrapping effects.
1175 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1312 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176} 1313}
1177 1314
1178int 1315int
1179ox (CFClient::Map self) 1316ox (CFPlus::Map self)
1180 ALIAS: 1317 ALIAS:
1181 oy = 1 1318 oy = 1
1182 x = 2 1319 x = 2
1183 y = 3 1320 y = 3
1184 w = 4 1321 w = 4
1195 } 1332 }
1196 OUTPUT: 1333 OUTPUT:
1197 RETVAL 1334 RETVAL
1198 1335
1199void 1336void
1200scroll (CFClient::Map self, int dx, int dy) 1337scroll (CFPlus::Map self, int dx, int dy)
1201 CODE: 1338 CODE:
1202{ 1339{
1203 if (dx > 0) 1340 if (dx > 0)
1204 map_blank (self, self->x, self->y, dx - 1, self->h); 1341 map_blank (self, self->x, self->y, dx, self->h);
1205 else if (dx < 0) 1342 else if (dx < 0)
1206 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);
1207 1344
1208 if (dy > 0) 1345 if (dy > 0)
1209 map_blank (self, self->x, self->y, self->w, dy - 1); 1346 map_blank (self, self->x, self->y, self->w, dy);
1210 else if (dy < 0) 1347 else if (dy < 0)
1211 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);
1212 1349
1213 self->ox += dx; self->x += dx; 1350 self->ox += dx; self->x += dx;
1214 self->oy += dy; self->y += dy; 1351 self->oy += dy; self->y += dy;
1215 1352
1216 while (self->y < 0) 1353 while (self->y < 0)
1221 self->y += MAP_EXTEND_Y; 1358 self->y += MAP_EXTEND_Y;
1222 } 1359 }
1223} 1360}
1224 1361
1225void 1362void
1226map1a_update (CFClient::Map self, SV *data_) 1363map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227 CODE: 1364 CODE:
1228{ 1365{
1229 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1366 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1230 uint8_t *data_end = (uint8_t *)SvEND (data_); 1367 uint8_t *data_end = (uint8_t *)SvEND (data_);
1231 mapcell *cell; 1368 mapcell *cell;
1232 int x, y, flags; 1369 int x, y, flags;
1233 1370
1234 while (data < data_end) 1371 while (data < data_end - 1)
1235 { 1372 {
1236 flags = (data [0] << 8) + data [1]; data += 2; 1373 flags = (data [0] << 8) + data [1]; data += 2;
1237 1374
1238 x = ((flags >> 10) & 63) + self->x; 1375 x = self->x + ((flags >> 10) & 63);
1239 y = ((flags >> 4) & 63) + self->y; 1376 y = self->y + ((flags >> 4) & 63);
1240 1377
1241 cell = map_get_cell (self, x, y); 1378 cell = map_get_cell (self, x, y);
1242 1379
1243 if (flags & 15) 1380 if (flags & 15)
1244 { 1381 {
1245 if (cell->darkness < 0) 1382 if (!cell->darkness)
1246 { 1383 {
1384 memset (cell, 0, sizeof (*cell));
1247 cell->darkness = 0; 1385 cell->darkness = 256;
1248 cell->face [0] = 0;
1249 cell->face [1] = 0;
1250 cell->face [2] = 0;
1251 } 1386 }
1252 1387
1253 cell->darkness = flags & 8 ? *data++ : 255;
1254
1255 //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 }
1256 1429
1257 if (flags & 4) 1430 if (flags & 4)
1258 { 1431 {
1259 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;
1260 } 1433 }
1268 { 1441 {
1269 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;
1270 } 1443 }
1271 } 1444 }
1272 else 1445 else
1273 cell->darkness = -1; 1446 cell->darkness = 0;
1274 } 1447 }
1275} 1448}
1276 1449
1277SV * 1450SV *
1278mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279 CODE: 1452 CODE:
1280{ 1453{
1281 int x1, x; 1454 int x1, x;
1282 int y1, y; 1455 int y1, y;
1283 int z; 1456 int z;
1333} 1506}
1334 OUTPUT: 1507 OUTPUT:
1335 RETVAL 1508 RETVAL
1336 1509
1337void 1510void
1338draw (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)
1339 CODE: 1512 CODE:
1340{ 1513{
1341 int vx, vy;
1342 int x, y, z; 1514 int x, y, z;
1343 int last_name; 1515 int last_name;
1344 mapface face; 1516 mapface face;
1345 1517
1346 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1347 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1348
1349 /*
1350 int vx = self->vx = self->w >= sw
1351 ? self->x + (self->w - sw) / 2
1352 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1353
1354 int vy = self->vy = self->h >= sh
1355 ? self->y + (self->h - sh) / 2
1356 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1357 */
1358
1359 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1360 1519
1520 glEnable (GL_BLEND);
1361 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1362 glEnable (GL_BLEND);
1363 glEnable (GL_TEXTURE_2D); 1522 glEnable (GL_TEXTURE_2D);
1364 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1523 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1365 1524
1366 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1367 1526
1368 last_name = 0; 1527 last_name = 0;
1369 1528
1529 mx += self->x;
1530 my += self->y;
1531
1370 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1371 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1372 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1373 { 1535 {
1374 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1375 1537
1376 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1377 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1378 { 1540 {
1379 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1380 1542
1381 face = cell->face [z]; 1543 face = cell->face [z];
1382 1544
1383 if (face) 1545 if (face && face < self->texs)
1384 { 1546 {
1385 maptex tex = self->tex [face]; 1547 maptex tex = self->tex [face];
1386
1387 int px = (x + 1) * 32 - tex.w; 1548 int px = (x + 1) * 32 - tex.w;
1388 int py = (y + 1) * 32 - tex.h; 1549 int py = (y + 1) * 32 - tex.h;
1389 1550
1390 if (last_name != tex.name) 1551 if (last_name != tex.name)
1391 { 1552 {
1392 glEnd (); 1553 glEnd ();
1393 last_name = tex.name;
1394 glBindTexture (GL_TEXTURE_2D, last_name); 1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1395 glBegin (GL_QUADS); 1555 glBegin (GL_QUADS);
1396 } 1556 }
1397 1557
1398 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1399 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1400 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);
1401 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1402 } 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 }
1403 } 1582 }
1404 } 1583 }
1405 1584
1406 glEnd (); 1585 glEnd ();
1407 1586
1408 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1409 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1410}
1411 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
1412void 1622void
1413fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 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)
1414 PPCODE: 1684 PPCODE:
1415{ 1685{
1416 int vx, vy;
1417 int x, y; 1686 int x, y;
1418 int sw4 = (sw + 3) & ~3; 1687 int sw4 = (sw + 3) & ~3;
1419 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1420 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1421 1690
1422 memset (darkness, 255, sw4 * sh); 1691 memset (darkness, 255, sw4 * sh);
1423 SvPOK_only (darkness_sv); 1692 SvPOK_only (darkness_sv);
1424 SvCUR_set (darkness_sv, sw4 * sh); 1693 SvCUR_set (darkness_sv, sw4 * sh);
1425 1694
1426 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1695 mx += self->x;
1427 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1696 my += self->y;
1428 1697
1429 for (y = 0; y < sh; y++) 1698 for (y = 0; y < sh; y++)
1430 if (0 <= y + vy && y + vy < self->rows) 1699 if (0 <= y + my && y + my < self->rows)
1431 { 1700 {
1432 maprow *row = self->row + (y + vy); 1701 maprow *row = self->row + (y + my);
1433 1702
1434 for (x = 0; x < sw; x++) 1703 for (x = 0; x < sw; x++)
1435 if (row->c0 <= x + vx && x + vx < row->c1) 1704 if (row->c0 <= x + mx && x + mx < row->c1)
1436 { 1705 {
1437 mapcell *cell = row->col + (x + vx - row->c0); 1706 mapcell *cell = row->col + (x + mx - row->c0);
1438 1707
1439 darkness[y * sw4 + x] = cell->darkness < 0 1708 darkness[y * sw4 + x] = cell->darkness
1709 ? 255 - (cell->darkness - 1)
1440 ? 255 - FOW_DARKNESS 1710 : 255 - FOW_DARKNESS;
1441 : 255 - cell->darkness;
1442 } 1711 }
1443 } 1712 }
1444 1713
1445 EXTEND (SP, 3); 1714 EXTEND (SP, 3);
1446 PUSHs (sv_2mortal (newSViv (sw4))); 1715 PUSHs (sv_2mortal (newSViv (sw4)));
1447 PUSHs (sv_2mortal (newSViv (sh))); 1716 PUSHs (sv_2mortal (newSViv (sh)));
1448 PUSHs (darkness_sv); 1717 PUSHs (darkness_sv);
1449} 1718}
1450 1719
1451SV * 1720SV *
1452get_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)
1453 CODE: 1722 CODE:
1454{ 1723{
1455 int x, y, x1, y1; 1724 int x, y, x1, y1;
1456 SV *data_sv = newSV (w * h * 7 + 5); 1725 SV *data_sv = newSV (w * h * 7 + 5);
1457 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1726 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1519} 1788}
1520 OUTPUT: 1789 OUTPUT:
1521 RETVAL 1790 RETVAL
1522 1791
1523void 1792void
1524set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1793set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1525 PPCODE: 1794 PPCODE:
1526{ 1795{
1527 int x, y, z; 1796 int x, y, z;
1528 int w, h; 1797 int w, h;
1529 int x1, y1; 1798 int x1, y1;
1561 1830
1562 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1831 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1563 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1832 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1564 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1833 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1565 1834
1566 if (cell->darkness <= 0) 1835 if (cell->darkness == 0)
1567 { 1836 {
1568 cell->darkness = -1; 1837 cell->darkness = 0;
1569 1838
1570 for (z = 0; z <= 2; z++) 1839 for (z = 0; z <= 2; z++)
1571 { 1840 {
1572 cell->face[z] = face[z]; 1841 cell->face[z] = face[z];
1573 1842
1578 } 1847 }
1579 } 1848 }
1580 } 1849 }
1581} 1850}
1582 1851
1583MODULE = CFClient PACKAGE = CFClient::MixChunk 1852MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1584 1853
1585CFClient::MixChunk 1854CFPlus::MixChunk
1586new_from_file (SV *class, char *path) 1855new_from_file (SV *class, char *path)
1587 CODE: 1856 CODE:
1588 RETVAL = Mix_LoadWAV (path); 1857 RETVAL = Mix_LoadWAV (path);
1589 OUTPUT: 1858 OUTPUT:
1590 RETVAL 1859 RETVAL
1591 1860
1592void 1861void
1593DESTROY (CFClient::MixChunk self) 1862DESTROY (CFPlus::MixChunk self)
1594 CODE: 1863 CODE:
1595 Mix_FreeChunk (self); 1864 Mix_FreeChunk (self);
1596 1865
1597int 1866int
1598volume (CFClient::MixChunk self, int volume = -1) 1867volume (CFPlus::MixChunk self, int volume = -1)
1599 CODE: 1868 CODE:
1600 RETVAL = Mix_VolumeChunk (self, volume); 1869 RETVAL = Mix_VolumeChunk (self, volume);
1601 OUTPUT: 1870 OUTPUT:
1602 RETVAL 1871 RETVAL
1603 1872
1604int 1873int
1605play (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)
1606 CODE: 1875 CODE:
1607 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1876 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1608 OUTPUT: 1877 OUTPUT:
1609 RETVAL 1878 RETVAL
1610 1879
1611MODULE = CFClient PACKAGE = CFClient::MixMusic 1880MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1612 1881
1613int 1882int
1614volume (int volume = -1) 1883volume (int volume = -1)
1615 CODE: 1884 CODE:
1616 RETVAL = Mix_VolumeMusic (volume); 1885 RETVAL = Mix_VolumeMusic (volume);
1617 OUTPUT: 1886 OUTPUT:
1618 RETVAL 1887 RETVAL
1619 1888
1620CFClient::MixMusic 1889CFPlus::MixMusic
1621new_from_file (SV *class, char *path) 1890new_from_file (SV *class, char *path)
1622 CODE: 1891 CODE:
1623 RETVAL = Mix_LoadMUS (path); 1892 RETVAL = Mix_LoadMUS (path);
1624 OUTPUT: 1893 OUTPUT:
1625 RETVAL 1894 RETVAL
1626 1895
1627void 1896void
1628DESTROY (CFClient::MixMusic self) 1897DESTROY (CFPlus::MixMusic self)
1629 CODE: 1898 CODE:
1630 Mix_FreeMusic (self); 1899 Mix_FreeMusic (self);
1631 1900
1632int 1901int
1633play (CFClient::MixMusic self, int loops = -1) 1902play (CFPlus::MixMusic self, int loops = -1)
1634 CODE: 1903 CODE:
1635 RETVAL = Mix_PlayMusic (self, loops); 1904 RETVAL = Mix_PlayMusic (self, loops);
1636 OUTPUT: 1905 OUTPUT:
1637 RETVAL 1906 RETVAL
1638 1907
1639MODULE = CFClient PACKAGE = CFClient::OpenGL 1908MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1640 1909
1641BOOT: 1910BOOT:
1642{ 1911{
1643 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1912 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1644 static const struct { 1913 static const struct {
1645 const char *name; 1914 const char *name;
1646 IV iv; 1915 IV iv;
1647 } *civ, const_iv[] = { 1916 } *civ, const_iv[] = {
1648# define const_iv(name) { # name, (IV)name } 1917# define const_iv(name) { # name, (IV)name }
1655 const_iv (GL_SCISSOR_TEST), 1924 const_iv (GL_SCISSOR_TEST),
1656 const_iv (GL_DEPTH_TEST), 1925 const_iv (GL_DEPTH_TEST),
1657 const_iv (GL_ALPHA_TEST), 1926 const_iv (GL_ALPHA_TEST),
1658 const_iv (GL_NORMALIZE), 1927 const_iv (GL_NORMALIZE),
1659 const_iv (GL_RESCALE_NORMAL), 1928 const_iv (GL_RESCALE_NORMAL),
1929 const_iv (GL_FRONT),
1930 const_iv (GL_BACK),
1660 const_iv (GL_AND), 1931 const_iv (GL_AND),
1661 const_iv (GL_ONE), 1932 const_iv (GL_ONE),
1662 const_iv (GL_ZERO), 1933 const_iv (GL_ZERO),
1663 const_iv (GL_SRC_ALPHA), 1934 const_iv (GL_SRC_ALPHA),
1664 const_iv (GL_DST_ALPHA), 1935 const_iv (GL_DST_ALPHA),
1709 const_iv (GL_SEPARABLE_2D), 1980 const_iv (GL_SEPARABLE_2D),
1710 const_iv (GL_CONVOLUTION_2D), 1981 const_iv (GL_CONVOLUTION_2D),
1711 const_iv (GL_CONVOLUTION_BORDER_MODE), 1982 const_iv (GL_CONVOLUTION_BORDER_MODE),
1712 const_iv (GL_CONSTANT_BORDER), 1983 const_iv (GL_CONSTANT_BORDER),
1713 const_iv (GL_LINES), 1984 const_iv (GL_LINES),
1985 const_iv (GL_LINE_STRIP),
1714 const_iv (GL_LINE_LOOP), 1986 const_iv (GL_LINE_LOOP),
1715 const_iv (GL_QUADS), 1987 const_iv (GL_QUADS),
1716 const_iv (GL_QUAD_STRIP), 1988 const_iv (GL_QUAD_STRIP),
1717 const_iv (GL_TRIANGLES), 1989 const_iv (GL_TRIANGLES),
1718 const_iv (GL_TRIANGLE_STRIP), 1990 const_iv (GL_TRIANGLE_STRIP),
1786 2058
1787void glPopMatrix () 2059void glPopMatrix ()
1788 2060
1789void glLoadIdentity () 2061void glLoadIdentity ()
1790 2062
2063void glDrawBuffer (int buffer)
2064
2065void glReadBuffer (int buffer)
2066
1791# near_ and far_ are due to microsofts buggy "c" compiler 2067# near_ and far_ are due to microsofts buggy "c" compiler
1792void 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_)
1793 2069
1794# near_ and far_ are due to microsofts buggy "c" compiler 2070# near_ and far_ are due to microsofts buggy "c" compiler
1795void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2071void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1824 r *= a; 2100 r *= a;
1825 g *= a; 2101 g *= a;
1826 b *= a; 2102 b *= a;
1827 } 2103 }
1828 // microsoft visual "c" rounds instead of truncating... 2104 // microsoft visual "c" rounds instead of truncating...
1829 glColor4ub (MIN ((int)(r * 256.f), 255), 2105 glColor4f (r, g, b, a);
1830 MIN ((int)(g * 256.f), 255),
1831 MIN ((int)(b * 256.f), 255),
1832 MIN ((int)(a * 256.f), 255));
1833 2106
1834void glInterleavedArrays (int format, int stride, char *data) 2107void glInterleavedArrays (int format, int stride, char *data)
1835 2108
1836void glDrawElements (int mode, int count, int type, char *indices) 2109void glDrawElements (int mode, int count, int type, char *indices)
1837 2110
1914 2187
1915void glEndList () 2188void glEndList ()
1916 2189
1917void glCallList (int list) 2190void glCallList (int list)
1918 2191
1919

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines