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

Diff Legend

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