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.124 by root, Tue Jul 4 23:23:31 2006 UTC vs.
Revision 1.173 by root, Wed Apr 4 02:43:29 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // 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
19#include <assert.h>
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
15#include <stdlib.h> 23#include <stdlib.h>
16 24
… …
31# include <sys/types.h> 39# include <sys/types.h>
32# include <sys/socket.h> 40# include <sys/socket.h>
33# include <netinet/in.h> 41# include <netinet/in.h>
34# include <netinet/tcp.h> 42# include <netinet/tcp.h>
35# include <inttypes.h> 43# 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 44#endif
44 45
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 47
49#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
50 49
51#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
53 52
54#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
55 54
56#if 1 55#if 0
57# define PARACHUTE SDL_INIT_NOPARACHUTE 56# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 57#else
59# define PARACHUTE 0 58# define PARACHUTE 0
60#endif 59#endif
61 60
… …
80 79
81#include "pango-font.c" 80#include "pango-font.c"
82#include "pango-fontmap.c" 81#include "pango-fontmap.c"
83#include "pango-render.c" 82#include "pango-render.c"
84 83
85typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
87 86
88typedef PangoFontDescription *CFClient__Font; 87typedef PangoFontDescription *CFPlus__Font;
89 88
90static int 89static int
91shape_attr_p (PangoLayoutRun *run) 90shape_attr_p (PangoLayoutRun *run)
92{ 91{
93 GSList *attrs = run->item->analysis.extra_attrs; 92 GSList *attrs = run->item->analysis.extra_attrs;
… …
107 106
108typedef struct cf_layout { 107typedef struct cf_layout {
109 PangoLayout *pl; 108 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
111 int base_height; 110 int base_height;
112 CFClient__Font font; 111 CFPlus__Font font;
113} *CFClient__Layout; 112} *CFPlus__Layout;
114 113
115static CFClient__Font default_font; 114static CFPlus__Font default_font;
116static PangoContext *opengl_context; 115static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 116static PangoFontMap *opengl_fontmap;
118 117
119static void 118static void
120substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
121{ 120{
122 FcPatternAddBool (pattern, FC_HINTING, 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
123#ifdef FC_HINT_STYLE 122#ifdef FC_HINT_STYLE
124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
125#endif 124#endif
126#ifdef _WIN32
127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
128#else
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130#endif
131} 126}
132 127
133static void 128static void
134layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
135{ 130{
136 /* use a random scale factor to account for unknown descenders, 0.8 works 131 /* use a random scale factor to account for unknown descenders, 0.8 works
137 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
138 */ 133 */
139 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
… …
143 138
144 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
145} 140}
146 141
147static void 142static void
148layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
149{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
150 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
151 149
152 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
153 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
154 152
155 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
154 if (!rect.height) rect.height = 1;
155
156 *w = rect.width;
157 *h = rect.height;
156} 158}
157 159
158typedef uint16_t mapface; 160typedef uint16_t mapface;
159 161
160typedef struct { 162typedef struct {
… …
163 float s, t; 165 float s, t;
164 uint8_t r, g, b, a; 166 uint8_t r, g, b, a;
165} maptex; 167} maptex;
166 168
167typedef struct { 169typedef struct {
168 int16_t darkness; 170 uint32_t player;
169 mapface face[3]; 171 mapface face[3];
172 uint16_t darkness;
173 uint8_t stat_width, stat_hp, flags;
170} mapcell; 174} mapcell;
171 175
172typedef struct { 176typedef struct {
173 int32_t c0, c1; 177 int32_t c0, c1;
174 mapcell *col; 178 mapcell *col;
… …
183 int texs; 187 int texs;
184 maptex *tex; 188 maptex *tex;
185 189
186 int32_t rows; 190 int32_t rows;
187 maprow *row; 191 maprow *row;
188} *CFClient__Map; 192} *CFPlus__Map;
189 193
190static char * 194static char *
191prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
192{ 196{
193 char *p; 197 char *p;
… …
211 215
212#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 217#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
214 218
215static maprow * 219static maprow *
216map_get_row (CFClient__Map self, int y) 220map_get_row (CFPlus__Map self, int y)
217{ 221{
218 if (0 > y) 222 if (0 > y)
219 { 223 {
220 int extend = - y + MAP_EXTEND_Y; 224 int extend = - y + MAP_EXTEND_Y;
221 Prepend (maprow, self->row, self->rows, extend); 225 Prepend (maprow, self->row, self->rows, extend);
… …
259 263
260 return row->col + (x - row->c0); 264 return row->col + (x - row->c0);
261} 265}
262 266
263static mapcell * 267static mapcell *
264map_get_cell (CFClient__Map self, int x, int y) 268map_get_cell (CFPlus__Map self, int x, int y)
265{ 269{
266 return row_get_cell (map_get_row (self, y), x); 270 return row_get_cell (map_get_row (self, y), x);
267} 271}
268 272
269static void 273static void
270map_clear (CFClient__Map self) 274map_clear (CFPlus__Map self)
271{ 275{
272 int r; 276 int r;
273 277
274 for (r = 0; r < self->rows; r++) 278 for (r = 0; r < self->rows; r++)
275 Safefree (self->row[r].col); 279 Safefree (self->row[r].col);
… …
283 self->row = 0; 287 self->row = 0;
284 self->rows = 0; 288 self->rows = 0;
285} 289}
286 290
287static void 291static void
288map_blank (CFClient__Map self, int x0, int y0, int w, int h) 292map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
289{ 293{
290 int x, y; 294 int x, y;
291 maprow *row; 295 maprow *row;
296 mapcell *cell;
292 297
293 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
294 if (y >= 0) 299 if (y >= 0)
295 { 300 {
296 if (y >= self->rows) 301 if (y >= self->rows)
… …
302 if (x >= row->c0) 307 if (x >= row->c0)
303 { 308 {
304 if (x >= row->c1) 309 if (x >= row->c1)
305 break; 310 break;
306 311
307 row->col[x - row->c0].darkness = -1; 312 cell = row->col + x - row->c0;
313
314 cell->darkness = 0;
315 cell->stat_hp = 0;
316 cell->flags = 0;
317 cell->player = 0;
308 } 318 }
309 } 319 }
310} 320}
311 321
312static void 322static void
… …
350 n |= n >> 16; 360 n |= n >> 16;
351 361
352 return n + 1; 362 return n + 1;
353} 363}
354 364
365/* SDL should provide this, really. */
366#define SDLK_MODIFIER_MIN 300
367#define SDLK_MODIFIER_MAX 314
368
355MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
356 370
357PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
358 372
359BOOT: 373BOOT:
360{ 374{
361 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
362 static const struct { 376 static const struct {
363 const char *name; 377 const char *name;
364 IV iv; 378 IV iv;
365 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
366# define const_iv(name) { # name, (IV)name } 380# define const_iv(name) { # name, (IV)name }
381 const_iv (SDLK_MODIFIER_MIN),
382 const_iv (SDLK_MODIFIER_MAX),
383
367 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
368 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
369 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
370 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
371 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
… …
380 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
381 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
382 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
383 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
384 const_iv (SDL_USEREVENT), 401 const_iv (SDL_USEREVENT),
402
403 const_iv (SDL_APPINPUTFOCUS),
404 const_iv (SDL_APPMOUSEFOCUS),
405 const_iv (SDL_APPACTIVE),
406
385 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
386 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
387 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
388 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
389 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
… …
444 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
445 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
446 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
447 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
448 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
449 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
450 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
451 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
452 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
453 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
454 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
455 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
456 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
457 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
458 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
459 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
460 const_iv (KMOD_MODE), 487 const_iv (KMOD_MODE),
461 const_iv (KMOD_CTRL),
462 const_iv (KMOD_SHIFT),
463 const_iv (KMOD_ALT),
464 const_iv (KMOD_META)
465# undef const_iv 488# undef const_iv
466 }; 489 };
467 490
468 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 491 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 492 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
493
494 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
495 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
470} 496}
497
498void
499weaken (SV *rv)
500 PROTOTYPE: $
501 CODE:
502 sv_rvweaken (rv);
503
504int
505in_destruct ()
506 CODE:
507 RETVAL = PL_main_cv == Nullcv;
508 OUTPUT:
509 RETVAL
471 510
472NV floor (NV x) 511NV floor (NV x)
473 512
474NV ceil (NV x) 513NV ceil (NV x)
475 514
… …
506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 546 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 547 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
509 548
510 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 549 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550#if SDL_VERSION_ATLEAST(1,2,10)
551 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
552 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553#endif
511 554
512 SDL_EnableUNICODE (1); 555 SDL_EnableUNICODE (1);
513 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 556 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
514 557
515 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 558 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
567 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
568 case SDL_KEYUP: 611 case SDL_KEYUP:
569 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
570 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
571 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 614 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
615 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
572 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
573 break; 617 break;
574 618
575 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
576 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
602 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 646 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
603 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 647 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
604 break; 648 break;
605 } 649 }
606 650
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 651 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
608 } 652 }
609} 653}
610 654
611int 655int
612Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 656Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
626#ifndef _WIN32 670#ifndef _WIN32
627 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
628#endif 672#endif
629 673
630void 674void
675win32_proxy_info ()
676 PPCODE:
677{
678#ifdef _WIN32
679 char buffer[2048];
680 DWORD buflen;
681
682 EXTEND (SP, 3);
683
684 buflen = sizeof (buffer);
685 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
686 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
687 {
688 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
689
690 buflen = sizeof (buffer);
691 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
692 {
693 PUSHs (newSVpv (buffer, 0));
694
695 buflen = sizeof (buffer);
696 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
697 PUSHs (newSVpv (buffer, 0));
698 }
699 }
700#endif
701}
702
703void
631add_font (char *file) 704add_font (char *file)
632 CODE: 705 CODE:
633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
634 707
635void 708void
636load_image_inline (SV *image_) 709load_image_inline (SV *image_)
637 ALIAS: 710 ALIAS:
638 load_image_file = 1 711 load_image_file = 1
… …
680 753
681 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 754 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
682 755
683 assert (surface2->pitch == surface2->w * 4); 756 assert (surface2->pitch == surface2->w * 4);
684 757
758 SDL_LockSurface (surface2);
685 EXTEND (SP, 5); 759 EXTEND (SP, 6);
686 PUSHs (sv_2mortal (newSViv (surface2->w))); 760 PUSHs (sv_2mortal (newSViv (surface2->w)));
687 PUSHs (sv_2mortal (newSViv (surface2->h))); 761 PUSHs (sv_2mortal (newSViv (surface2->h)));
688 SDL_LockSurface (surface2);
689 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 762 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
690 SDL_UnlockSurface (surface2);
691 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 763 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
692 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 764 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
693 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 765 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
766 SDL_UnlockSurface (surface2);
694 767
695 SDL_FreeSurface (surface); 768 SDL_FreeSurface (surface);
696 SDL_FreeSurface (surface2); 769 SDL_FreeSurface (surface2);
697} 770}
698 771
… …
737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 810 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
738#endif 811#endif
739 _exit (1); 812 _exit (1);
740 813
741void 814void
742_exit (int retval) 815_exit (int retval = 0)
743 CODE: 816 CODE:
817#ifdef WIN32
818 ExitThread (retval); // unclean, please beam me up
819#else
744 _exit (retval); 820 _exit (retval);
821#endif
745 822
746MODULE = CFClient PACKAGE = CFClient::Font 823MODULE = CFPlus PACKAGE = CFPlus::Font
747 824
748CFClient::Font 825CFPlus::Font
749new_from_file (SV *class, char *path, int id = 0) 826new_from_file (SV *class, char *path, int id = 0)
750 CODE: 827 CODE:
751{ 828{
752 int count; 829 int count;
753 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 830 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
756} 833}
757 OUTPUT: 834 OUTPUT:
758 RETVAL 835 RETVAL
759 836
760void 837void
761DESTROY (CFClient::Font self) 838DESTROY (CFPlus::Font self)
762 CODE: 839 CODE:
763 pango_font_description_free (self); 840 pango_font_description_free (self);
764 841
765void 842void
766make_default (CFClient::Font self) 843make_default (CFPlus::Font self)
767 CODE: 844 CODE:
768 default_font = self; 845 default_font = self;
769 846
770MODULE = CFClient PACKAGE = CFClient::Layout 847MODULE = CFPlus PACKAGE = CFPlus::Layout
771 848
772void 849void
773clear_font_cache () 850reset_glyph_cache ()
774 CODE: 851 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear (); 852 tc_clear ();
777 853
778CFClient::Layout 854CFPlus::Layout
779new (SV *class, int type = 0) 855new (SV *class)
780 CODE: 856 CODE:
781 New (0, RETVAL, 1, struct cf_layout); 857 New (0, RETVAL, 1, struct cf_layout);
782 858
783 RETVAL->pl = pango_layout_new (opengl_context); 859 RETVAL->pl = pango_layout_new (opengl_context);
784 RETVAL->r = 1.; 860 RETVAL->r = 1.;
… …
792 layout_update_font (RETVAL); 868 layout_update_font (RETVAL);
793 OUTPUT: 869 OUTPUT:
794 RETVAL 870 RETVAL
795 871
796void 872void
797DESTROY (CFClient::Layout self) 873DESTROY (CFPlus::Layout self)
798 CODE: 874 CODE:
799 g_object_unref (self->pl); 875 g_object_unref (self->pl);
800 Safefree (self); 876 Safefree (self);
801 877
802void 878void
803set_text (CFClient::Layout self, SV *text_) 879set_text (CFPlus::Layout self, SV *text_)
804 CODE: 880 CODE:
805{ 881{
806 STRLEN textlen; 882 STRLEN textlen;
807 char *text = SvPVutf8 (text_, textlen); 883 char *text = SvPVutf8 (text_, textlen);
808 884
809 pango_layout_set_text (self->pl, text, textlen); 885 pango_layout_set_text (self->pl, text, textlen);
810} 886}
811 887
812void 888void
813set_markup (CFClient::Layout self, SV *text_) 889set_markup (CFPlus::Layout self, SV *text_)
814 CODE: 890 CODE:
815{ 891{
816 STRLEN textlen; 892 STRLEN textlen;
817 char *text = SvPVutf8 (text_, textlen); 893 char *text = SvPVutf8 (text_, textlen);
818 894
819 pango_layout_set_markup (self->pl, text, textlen); 895 pango_layout_set_markup (self->pl, text, textlen);
820} 896}
821 897
822void 898void
823set_shapes (CFClient::Layout self, ...) 899set_shapes (CFPlus::Layout self, ...)
824 CODE: 900 CODE:
825{ 901{
826 PangoAttrList *attrs = 0; 902 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl); 903 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text; 904 const char *pos = text;
… …
863 if (attrs) 939 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs); 940 pango_layout_set_attributes (self->pl, attrs);
865} 941}
866 942
867void 943void
868get_shapes (CFClient::Layout self) 944get_shapes (CFPlus::Layout self)
869 PPCODE: 945 PPCODE:
870{ 946{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 947 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872 948
873 do 949 do
… …
877 if (run && shape_attr_p (run)) 953 if (run && shape_attr_p (run))
878 { 954 {
879 PangoRectangle extents; 955 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents); 956 pango_layout_iter_get_run_extents (iter, 0, &extents);
881 957
958 EXTEND (SP, 2);
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 959 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 960 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 } 961 }
885 } 962 }
886 while (pango_layout_iter_next_run (iter)); 963 while (pango_layout_iter_next_run (iter));
887 964
888 pango_layout_iter_free (iter); 965 pango_layout_iter_free (iter);
889} 966}
890 967
891int 968int
892has_wrapped (CFClient::Layout self) 969has_wrapped (CFPlus::Layout self)
893 CODE: 970 CODE:
894{ 971{
895 int lines = 1; 972 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl); 973 const char *text = pango_layout_get_text (self->pl);
897 974
… …
902} 979}
903 OUTPUT: 980 OUTPUT:
904 RETVAL 981 RETVAL
905 982
906SV * 983SV *
907get_text (CFClient::Layout self) 984get_text (CFPlus::Layout self)
908 CODE: 985 CODE:
909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 986 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
910 sv_utf8_decode (RETVAL); 987 sv_utf8_decode (RETVAL);
911 OUTPUT: 988 OUTPUT:
912 RETVAL 989 RETVAL
913 990
914void 991void
915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 992set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
916 CODE: 993 CODE:
917 self->r = r; 994 self->r = r;
918 self->g = g; 995 self->g = g;
919 self->b = b; 996 self->b = b;
920 self->a = a; 997 self->a = a;
921 998
922void 999void
923set_font (CFClient::Layout self, CFClient::Font font = 0) 1000set_font (CFPlus::Layout self, CFPlus::Font font = 0)
924 CODE: 1001 CODE:
925 if (self->font != font) 1002 if (self->font != font)
926 { 1003 {
927 self->font = font; 1004 self->font = font;
928 layout_update_font (self); 1005 layout_update_font (self);
929 } 1006 }
930 1007
931void 1008void
932set_height (CFClient::Layout self, int base_height) 1009set_height (CFPlus::Layout self, int base_height)
933 CODE: 1010 CODE:
934 if (self->base_height != base_height) 1011 if (self->base_height != base_height)
935 { 1012 {
936 self->base_height = base_height; 1013 self->base_height = base_height;
937 layout_update_font (self); 1014 layout_update_font (self);
938 } 1015 }
939 1016
940void 1017void
941set_width (CFClient::Layout self, int max_width = -1) 1018set_width (CFPlus::Layout self, int max_width = -1)
942 CODE: 1019 CODE:
943 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1020 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
944 1021
945void 1022void
946set_indent (CFClient::Layout self, int indent) 1023set_indent (CFPlus::Layout self, int indent)
947 CODE: 1024 CODE:
948 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1025 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
949 1026
950void 1027void
951set_spacing (CFClient::Layout self, int spacing) 1028set_spacing (CFPlus::Layout self, int spacing)
952 CODE: 1029 CODE:
953 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1030 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
954 1031
955void 1032void
956set_ellipsise (CFClient::Layout self, int ellipsise) 1033set_ellipsise (CFPlus::Layout self, int ellipsise)
957 CODE: 1034 CODE:
958 pango_layout_set_ellipsize (self->pl, 1035 pango_layout_set_ellipsize (self->pl,
959 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1036 ellipsise == 1 ? PANGO_ELLIPSIZE_START
960 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1037 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
961 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1038 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
962 : PANGO_ELLIPSIZE_NONE 1039 : PANGO_ELLIPSIZE_NONE
963 ); 1040 );
964 1041
965void 1042void
966set_single_paragraph_mode (CFClient::Layout self, int spm) 1043set_single_paragraph_mode (CFPlus::Layout self, int spm)
967 CODE: 1044 CODE:
968 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1045 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
969 1046
970void 1047void
971size (CFClient::Layout self) 1048size (CFPlus::Layout self)
972 PPCODE: 1049 PPCODE:
973{ 1050{
974 int w, h; 1051 int w, h;
975 1052
976 layout_get_pixel_size (self, &w, &h); 1053 layout_get_pixel_size (self, &w, &h);
… …
979 PUSHs (sv_2mortal (newSViv (w))); 1056 PUSHs (sv_2mortal (newSViv (w)));
980 PUSHs (sv_2mortal (newSViv (h))); 1057 PUSHs (sv_2mortal (newSViv (h)));
981} 1058}
982 1059
983int 1060int
984descent (CFClient::Layout self) 1061descent (CFPlus::Layout self)
985 CODE: 1062 CODE:
986{ 1063{
987 PangoRectangle rect; 1064 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1065 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect); 1066 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
991} 1068}
992 OUTPUT: 1069 OUTPUT:
993 RETVAL 1070 RETVAL
994 1071
995int 1072int
996xy_to_index (CFClient::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
997 CODE: 1074 CODE:
998{ 1075{
999 int index, trailing; 1076 int index, trailing;
1000 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1077 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1001 RETVAL = index; 1078 RETVAL = index + trailing;
1002} 1079}
1003 OUTPUT: 1080 OUTPUT:
1004 RETVAL 1081 RETVAL
1005 1082
1006void 1083void
1007cursor_pos (CFClient::Layout self, int index) 1084cursor_pos (CFPlus::Layout self, int index)
1008 PPCODE: 1085 PPCODE:
1009{ 1086{
1010 PangoRectangle strong_pos; 1087 PangoRectangle strong_pos;
1011 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1088 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1012 1089
… …
1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1017} 1094}
1018 1095
1019void 1096void
1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1098 PPCODE:
1099{
1100 int line, x;
1101
1102 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1103 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1104
1105 EXTEND (SP, 2);
1106 PUSHs (sv_2mortal (newSViv (line - 1)));
1107 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1108}
1109
1110void
1111line_x_to_index (CFPlus::Layout self, int line, int x)
1112 PPCODE:
1113{
1114 PangoLayoutLine *lp;
1115 int index, trailing;
1116
1117 if (line < 0)
1118 XSRETURN_EMPTY;
1119
1120 if (!(lp = pango_layout_get_line (self->pl, line)))
1121 XSRETURN_EMPTY; /* do better */
1122
1123 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1124
1125 EXTEND (SP, 2);
1126 if (GIMME_V == G_SCALAR)
1127 PUSHs (sv_2mortal (newSViv (index + trailing)));
1128 else
1129 {
1130 PUSHs (sv_2mortal (newSViv (index)));
1131 PUSHs (sv_2mortal (newSViv (trailing)));
1132 }
1133}
1134
1135void
1020render (CFClient::Layout self, float x, float y) 1136render (CFPlus::Layout self, float x, float y, int flags = 0)
1021 PPCODE: 1137 PPCODE:
1022 pango_opengl_render_layout_subpixel ( 1138 pango_opengl_render_layout_subpixel (
1023 self->pl, 1139 self->pl,
1024 x * PANGO_SCALE, y * PANGO_SCALE, 1140 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a 1141 self->r, self->g, self->b, self->a,
1142 flags
1026 ); 1143 );
1027 1144
1028MODULE = CFClient PACKAGE = CFClient::Texture 1145MODULE = CFPlus PACKAGE = CFPlus::Texture
1029 1146
1030void 1147void
1031pad2pot (SV *data_, SV *w_, SV *h_) 1148pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE: 1149 CODE:
1033{ 1150{
… …
1111 glDisable (GL_ALPHA_TEST); 1228 glDisable (GL_ALPHA_TEST);
1112 glDisable (GL_BLEND); 1229 glDisable (GL_BLEND);
1113 } 1230 }
1114} 1231}
1115 1232
1116MODULE = CFClient PACKAGE = CFClient::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
1117 1234
1118CFClient::Map 1235CFPlus::Map
1119new (SV *class, int map_width, int map_height) 1236new (SV *class)
1120 CODE: 1237 CODE:
1121 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
1122 RETVAL->x = 0; 1239 RETVAL->x = 0;
1123 RETVAL->y = 0; 1240 RETVAL->y = 0;
1124 RETVAL->w = map_width; 1241 RETVAL->w = 0;
1125 RETVAL->h = map_height; 1242 RETVAL->h = 0;
1126 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
1127 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
1128 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
1129 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1130 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
… …
1133 RETVAL->row = 0; 1250 RETVAL->row = 0;
1134 OUTPUT: 1251 OUTPUT:
1135 RETVAL 1252 RETVAL
1136 1253
1137void 1254void
1138DESTROY (CFClient::Map self) 1255DESTROY (CFPlus::Map self)
1139 CODE: 1256 CODE:
1140{ 1257{
1141 map_clear (self); 1258 map_clear (self);
1142 Safefree (self->face); 1259 Safefree (self->face);
1143 Safefree (self->tex); 1260 Safefree (self->tex);
1144 Safefree (self); 1261 Safefree (self);
1145} 1262}
1146 1263
1147void 1264void
1265resize (CFPlus::Map self, int map_width, int map_height)
1266 CODE:
1267 self->w = map_width;
1268 self->h = map_height;
1269
1270void
1148clear (CFClient::Map self) 1271clear (CFPlus::Map self)
1149 CODE: 1272 CODE:
1150 map_clear (self); 1273 map_clear (self);
1151 1274
1152void 1275void
1153set_face (CFClient::Map self, int face, int texid) 1276set_face (CFPlus::Map self, int face, int texid)
1154 CODE: 1277 CODE:
1155{ 1278{
1156 while (self->faces <= face) 1279 while (self->faces <= face)
1157 { 1280 {
1158 Append (mapface, self->face, self->faces, self->faces); 1281 Append (mapface, self->face, self->faces, self->faces);
… …
1161 1284
1162 self->face [face] = texid; 1285 self->face [face] = texid;
1163} 1286}
1164 1287
1165void 1288void
1166set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1289set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1167 CODE: 1290 CODE:
1168{ 1291{
1169 while (self->texs <= texid) 1292 while (self->texs <= texid)
1170 { 1293 {
1171 Append (maptex, self->tex, self->texs, self->texs); 1294 Append (maptex, self->tex, self->texs, self->texs);
… …
1195 // from transparent color bleeding and ugly wrapping effects. 1318 // from transparent color bleeding and ugly wrapping effects.
1196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1319 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1197} 1320}
1198 1321
1199int 1322int
1200ox (CFClient::Map self) 1323ox (CFPlus::Map self)
1201 ALIAS: 1324 ALIAS:
1202 oy = 1 1325 oy = 1
1203 x = 2 1326 x = 2
1204 y = 3 1327 y = 3
1205 w = 4 1328 w = 4
… …
1216 } 1339 }
1217 OUTPUT: 1340 OUTPUT:
1218 RETVAL 1341 RETVAL
1219 1342
1220void 1343void
1221scroll (CFClient::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
1222 CODE: 1345 CODE:
1223{ 1346{
1224 if (dx > 0) 1347 if (dx > 0)
1225 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
1226 else if (dx < 0) 1349 else if (dx < 0)
1227 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1350 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1228 1351
1229 if (dy > 0) 1352 if (dy > 0)
1230 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
1231 else if (dy < 0) 1354 else if (dy < 0)
1232 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1355 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1233 1356
1234 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
1235 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
1236 1359
1237 while (self->y < 0) 1360 while (self->y < 0)
… …
1242 self->y += MAP_EXTEND_Y; 1365 self->y += MAP_EXTEND_Y;
1243 } 1366 }
1244} 1367}
1245 1368
1246void 1369void
1247map1a_update (CFClient::Map self, SV *data_) 1370map1a_update (CFPlus::Map self, SV *data_, int extmap)
1248 CODE: 1371 CODE:
1249{ 1372{
1250 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1251 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
1252 mapcell *cell; 1375 mapcell *cell;
1253 int x, y, flags; 1376 int x, y, flags;
1254 1377
1255 while (data < data_end) 1378 while (data < data_end - 1)
1256 { 1379 {
1257 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
1258 1381
1259 x = self->x + ((flags >> 10) & 63); 1382 x = self->x + ((flags >> 10) & 63);
1260 y = self->y + ((flags >> 4) & 63); 1383 y = self->y + ((flags >> 4) & 63);
1261 1384
1262 cell = map_get_cell (self, x, y); 1385 cell = map_get_cell (self, x, y);
1263 1386
1264 if (flags & 15) 1387 if (flags & 15)
1265 { 1388 {
1266 if (cell->darkness < 0) 1389 if (!cell->darkness)
1267 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
1268 cell->darkness = 0; 1392 cell->darkness = 256;
1269 cell->face [0] = 0;
1270 cell->face [1] = 0;
1271 cell->face [2] = 0;
1272 } 1393 }
1273 1394
1274 cell->darkness = flags & 8 ? *data++ : 255;
1275
1276 //TODO: don't trust server data to be in-range(!) 1395 //TODO: don't trust server data to be in-range(!)
1396
1397 if (flags & 8)
1398 {
1399 if (extmap)
1400 {
1401 uint8_t ext, cmd;
1402
1403 do
1404 {
1405 ext = *data++;
1406 cmd = ext & 0x3f;
1407
1408 if (cmd < 4)
1409 cell->darkness = 255 - ext * 64 + 1;
1410 else if (cmd == 5) // health
1411 {
1412 cell->stat_width = 1;
1413 cell->stat_hp = *data++;
1414 }
1415 else if (cmd == 6) // monster width
1416 cell->stat_width = *data++ + 1;
1417 else if (cmd == 0x47)
1418 {
1419 if (*data == 8)
1420 ; // decode player uuid
1421
1422 data += *data + 1;
1423 }
1424 else if (cmd == 8) // cell flags
1425 cell->flags = *data++;
1426 else if (ext & 0x40) // unknown, multibyte => skip
1427 data += *data + 1;
1428 else
1429 data++;
1430 }
1431 while (ext & 0x80);
1432 }
1433 else
1434 cell->darkness = *data++ + 1;
1435 }
1277 1436
1278 if (flags & 4) 1437 if (flags & 4)
1279 { 1438 {
1280 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1439 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1281 } 1440 }
… …
1289 { 1448 {
1290 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1449 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1291 } 1450 }
1292 } 1451 }
1293 else 1452 else
1294 cell->darkness = -1; 1453 cell->darkness = 0;
1295 } 1454 }
1296} 1455}
1297 1456
1298SV * 1457SV *
1299mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1458mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1300 CODE: 1459 CODE:
1301{ 1460{
1302 int x1, x; 1461 int x1, x;
1303 int y1, y; 1462 int y1, y;
1304 int z; 1463 int z;
… …
1327 1486
1328 for (z = 0; z <= 0; z++) 1487 for (z = 0; z <= 0; z++)
1329 { 1488 {
1330 mapface face = cell->face [z]; 1489 mapface face = cell->face [z];
1331 1490
1332 if (face) 1491 if (face > 0 && face < self->texs)
1333 { 1492 {
1334 maptex tex = self->tex [face]; 1493 maptex tex = self->tex [face];
1335 int a0 = 255 - tex.a; 1494 int a0 = 255 - tex.a;
1336 int a1 = tex.a; 1495 int a1 = tex.a;
1337 1496
… …
1354} 1513}
1355 OUTPUT: 1514 OUTPUT:
1356 RETVAL 1515 RETVAL
1357 1516
1358void 1517void
1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1518draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1360 CODE: 1519 CODE:
1361{ 1520{
1362 int vx, vy;
1363 int x, y, z; 1521 int x, y, z;
1364 int last_name; 1522 int last_name;
1365 mapface face; 1523 mapface face;
1366
1367 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1368 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1369
1370 /*
1371 int vx = self->vx = self->w >= sw
1372 ? self->x + (self->w - sw) / 2
1373 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1374
1375 int vy = self->vy = self->h >= sh
1376 ? self->y + (self->h - sh) / 2
1377 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1378 */
1379 1524
1380 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1381 1526
1382 glEnable (GL_BLEND); 1527 glEnable (GL_BLEND);
1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1386 1531
1387 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1388 1533
1389 last_name = 0; 1534 last_name = 0;
1390 1535
1536 mx += self->x;
1537 my += self->y;
1538
1391 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1392 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1393 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1394 { 1542 {
1395 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1396 1544
1397 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1398 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1399 { 1547 {
1400 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1401 1549
1402 face = cell->face [z]; 1550 face = cell->face [z];
1403 1551
1404 if (face) 1552 if (face > 0 && face < self->texs)
1405 { 1553 {
1406 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1407
1408 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * T - tex.w;
1409 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * T - tex.h;
1410 1557
1411 if (last_name != tex.name) 1558 if (last_name != tex.name)
1412 { 1559 {
1413 glEnd (); 1560 glEnd ();
1414 last_name = tex.name;
1415 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1416 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1417 } 1563 }
1418 1564
1419 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1420 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1421 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1567 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1422 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1423 } 1569 }
1570
1571 if (cell->flags && z == 2)
1572 {
1573 if (cell->flags & 1)
1574 {
1575 maptex tex = self->tex [1];
1576 int px = (x + 1) * T - tex.w + 2;
1577 int py = (y + 1) * T - tex.h - 6;
1578
1579 glEnd ();
1580 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1581 glBegin (GL_QUADS);
1582
1583 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1584 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1585 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1586 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1587 }
1588 }
1424 } 1589 }
1425 } 1590 }
1426 1591
1427 glEnd (); 1592 glEnd ();
1428 1593
1429 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1430 glDisable (GL_BLEND); 1595 glDisable (GL_BLEND);
1431}
1432 1596
1597 // top layer: overlays such as the health bar
1598 for (y = 0; y < sh; y++)
1599 if (0 <= y + my && y + my < self->rows)
1600 {
1601 maprow *row = self->row + (y + my);
1602
1603 for (x = 0; x < sw; x++)
1604 if (row->c0 <= x + mx && x + mx < row->c1)
1605 {
1606 mapcell *cell = row->col + (x + mx - row->c0);
1607
1608 int px = x * T;
1609 int py = y * T;
1610
1611 if (cell->stat_hp)
1612 {
1613 int width = cell->stat_width * T;
1614 int thick = (sh * T / 32) / 28 + 1 + cell->stat_width;
1615
1616 glColor3ub (0, 0, 0);
1617 glRectf (px + 1, py - thick - 2,
1618 px + width - 1, py);
1619
1620 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1621 glRectf (px + 2,
1622 py - thick - 1,
1623 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1624 }
1625 }
1626 }
1627}
1628
1433void 1629void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1630draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE: 1631 CODE:
1436{ 1632{
1437 static float color[16][3] = { 1633 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F }, 1634 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F }, 1635 { 1.00F, 1.00F, 1.00F },
… …
1489 glDisable (GL_BLEND); 1685 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D); 1686 glDisable (GL_TEXTURE_2D);
1491} 1687}
1492 1688
1493void 1689void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1690fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1495 PPCODE: 1691 PPCODE:
1496{ 1692{
1497 int vx, vy;
1498 int x, y; 1693 int x, y;
1499 int sw4 = (sw + 3) & ~3; 1694 int sw4 = (sw + 3) & ~3;
1500 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1695 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1501 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1696 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1502 1697
1503 memset (darkness, 255, sw4 * sh); 1698 memset (darkness, 255, sw4 * sh);
1504 SvPOK_only (darkness_sv); 1699 SvPOK_only (darkness_sv);
1505 SvCUR_set (darkness_sv, sw4 * sh); 1700 SvCUR_set (darkness_sv, sw4 * sh);
1506 1701
1507 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1702 mx += self->x;
1508 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1703 my += self->y;
1509 1704
1510 for (y = 0; y < sh; y++) 1705 for (y = 0; y < sh; y++)
1511 if (0 <= y + vy && y + vy < self->rows) 1706 if (0 <= y + my && y + my < self->rows)
1512 { 1707 {
1513 maprow *row = self->row + (y + vy); 1708 maprow *row = self->row + (y + my);
1514 1709
1515 for (x = 0; x < sw; x++) 1710 for (x = 0; x < sw; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1) 1711 if (row->c0 <= x + mx && x + mx < row->c1)
1517 { 1712 {
1518 mapcell *cell = row->col + (x + vx - row->c0); 1713 mapcell *cell = row->col + (x + mx - row->c0);
1519 1714
1520 darkness[y * sw4 + x] = cell->darkness < 0 1715 darkness[y * sw4 + x] = cell->darkness
1716 ? 255 - (cell->darkness - 1)
1521 ? 255 - FOW_DARKNESS 1717 : 255 - FOW_DARKNESS;
1522 : 255 - cell->darkness;
1523 } 1718 }
1524 } 1719 }
1525 1720
1526 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
1527 PUSHs (sv_2mortal (newSViv (sw4))); 1722 PUSHs (sv_2mortal (newSViv (sw4)));
1528 PUSHs (sv_2mortal (newSViv (sh))); 1723 PUSHs (sv_2mortal (newSViv (sh)));
1529 PUSHs (darkness_sv); 1724 PUSHs (darkness_sv);
1530} 1725}
1531 1726
1532SV * 1727SV *
1533get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1728get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1534 CODE: 1729 CODE:
1535{ 1730{
1536 int x, y, x1, y1; 1731 int x, y, x1, y1;
1537 SV *data_sv = newSV (w * h * 7 + 5); 1732 SV *data_sv = newSV (w * h * 7 + 5);
1538 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1733 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1600} 1795}
1601 OUTPUT: 1796 OUTPUT:
1602 RETVAL 1797 RETVAL
1603 1798
1604void 1799void
1605set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1800set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1606 PPCODE: 1801 PPCODE:
1607{ 1802{
1608 int x, y, z; 1803 int x, y, z;
1609 int w, h; 1804 int w, h;
1610 int x1, y1; 1805 int x1, y1;
… …
1642 1837
1643 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1644 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1645 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1646 1841
1647 if (cell->darkness <= 0) 1842 if (cell->darkness == 0)
1648 { 1843 {
1649 cell->darkness = -1; 1844 cell->darkness = 0;
1650 1845
1651 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1652 { 1847 {
1653 cell->face[z] = face[z]; 1848 cell->face[z] = face[z];
1654 1849
… …
1659 } 1854 }
1660 } 1855 }
1661 } 1856 }
1662} 1857}
1663 1858
1664MODULE = CFClient PACKAGE = CFClient::MixChunk 1859MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1665 1860
1666CFClient::MixChunk 1861CFPlus::MixChunk
1667new_from_file (SV *class, char *path) 1862new_from_file (SV *class, char *path)
1668 CODE: 1863 CODE:
1669 RETVAL = Mix_LoadWAV (path); 1864 RETVAL = Mix_LoadWAV (path);
1670 OUTPUT: 1865 OUTPUT:
1671 RETVAL 1866 RETVAL
1672 1867
1673void 1868void
1674DESTROY (CFClient::MixChunk self) 1869DESTROY (CFPlus::MixChunk self)
1675 CODE: 1870 CODE:
1676 Mix_FreeChunk (self); 1871 Mix_FreeChunk (self);
1677 1872
1678int 1873int
1679volume (CFClient::MixChunk self, int volume = -1) 1874volume (CFPlus::MixChunk self, int volume = -1)
1680 CODE: 1875 CODE:
1681 RETVAL = Mix_VolumeChunk (self, volume); 1876 RETVAL = Mix_VolumeChunk (self, volume);
1682 OUTPUT: 1877 OUTPUT:
1683 RETVAL 1878 RETVAL
1684 1879
1685int 1880int
1686play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1881play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1687 CODE: 1882 CODE:
1688 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1689 OUTPUT: 1884 OUTPUT:
1690 RETVAL 1885 RETVAL
1691 1886
1692MODULE = CFClient PACKAGE = CFClient::MixMusic 1887MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1693 1888
1694int 1889int
1695volume (int volume = -1) 1890volume (int volume = -1)
1696 CODE: 1891 CODE:
1697 RETVAL = Mix_VolumeMusic (volume); 1892 RETVAL = Mix_VolumeMusic (volume);
1698 OUTPUT: 1893 OUTPUT:
1699 RETVAL 1894 RETVAL
1700 1895
1701CFClient::MixMusic 1896CFPlus::MixMusic
1702new_from_file (SV *class, char *path) 1897new_from_file (SV *class, char *path)
1703 CODE: 1898 CODE:
1704 RETVAL = Mix_LoadMUS (path); 1899 RETVAL = Mix_LoadMUS (path);
1705 OUTPUT: 1900 OUTPUT:
1706 RETVAL 1901 RETVAL
1707 1902
1708void 1903void
1709DESTROY (CFClient::MixMusic self) 1904DESTROY (CFPlus::MixMusic self)
1710 CODE: 1905 CODE:
1711 Mix_FreeMusic (self); 1906 Mix_FreeMusic (self);
1712 1907
1713int 1908int
1714play (CFClient::MixMusic self, int loops = -1) 1909play (CFPlus::MixMusic self, int loops = -1)
1715 CODE: 1910 CODE:
1716 RETVAL = Mix_PlayMusic (self, loops); 1911 RETVAL = Mix_PlayMusic (self, loops);
1717 OUTPUT: 1912 OUTPUT:
1718 RETVAL 1913 RETVAL
1719 1914
1720MODULE = CFClient PACKAGE = CFClient::OpenGL 1915MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1721 1916
1722BOOT: 1917BOOT:
1723{ 1918{
1724 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1919 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1725 static const struct { 1920 static const struct {
1726 const char *name; 1921 const char *name;
1727 IV iv; 1922 IV iv;
1728 } *civ, const_iv[] = { 1923 } *civ, const_iv[] = {
1729# define const_iv(name) { # name, (IV)name } 1924# define const_iv(name) { # name, (IV)name }
… …
1792 const_iv (GL_SEPARABLE_2D), 1987 const_iv (GL_SEPARABLE_2D),
1793 const_iv (GL_CONVOLUTION_2D), 1988 const_iv (GL_CONVOLUTION_2D),
1794 const_iv (GL_CONVOLUTION_BORDER_MODE), 1989 const_iv (GL_CONVOLUTION_BORDER_MODE),
1795 const_iv (GL_CONSTANT_BORDER), 1990 const_iv (GL_CONSTANT_BORDER),
1796 const_iv (GL_LINES), 1991 const_iv (GL_LINES),
1992 const_iv (GL_LINE_STRIP),
1797 const_iv (GL_LINE_LOOP), 1993 const_iv (GL_LINE_LOOP),
1798 const_iv (GL_QUADS), 1994 const_iv (GL_QUADS),
1799 const_iv (GL_QUAD_STRIP), 1995 const_iv (GL_QUAD_STRIP),
1800 const_iv (GL_TRIANGLES), 1996 const_iv (GL_TRIANGLES),
1801 const_iv (GL_TRIANGLE_STRIP), 1997 const_iv (GL_TRIANGLE_STRIP),
… …
1911 r *= a; 2107 r *= a;
1912 g *= a; 2108 g *= a;
1913 b *= a; 2109 b *= a;
1914 } 2110 }
1915 // microsoft visual "c" rounds instead of truncating... 2111 // microsoft visual "c" rounds instead of truncating...
1916 glColor4ub (MIN ((int)(r * 256.f), 255), 2112 glColor4f (r, g, b, a);
1917 MIN ((int)(g * 256.f), 255),
1918 MIN ((int)(b * 256.f), 255),
1919 MIN ((int)(a * 256.f), 255));
1920 2113
1921void glInterleavedArrays (int format, int stride, char *data) 2114void glInterleavedArrays (int format, int stride, char *data)
1922 2115
1923void glDrawElements (int mode, int count, int type, char *indices) 2116void glDrawElements (int mode, int count, int type, char *indices)
1924 2117
… …
2001 2194
2002void glEndList () 2195void glEndList ()
2003 2196
2004void glCallList (int list) 2197void glCallList (int list)
2005 2198
2006

Diff Legend

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