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

Diff Legend

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