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.119 by root, Sat Jun 17 15:07:52 2006 UTC vs.
Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
14
15#ifdef _WIN32
16# undef pipe
17#endif
11 18
12#include <math.h> 19#include <math.h>
13#include <string.h> 20#include <string.h>
14#include <stdio.h> 21#include <stdio.h>
15#include <stdlib.h> 22#include <stdlib.h>
… …
18#include <SDL_endian.h> 25#include <SDL_endian.h>
19#include <SDL_image.h> 26#include <SDL_image.h>
20#include <SDL_mixer.h> 27#include <SDL_mixer.h>
21#include <SDL_opengl.h> 28#include <SDL_opengl.h>
22 29
30#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS
32
23#include <glib/gmacros.h> 33#include <glib/gmacros.h>
24 34
25#include <pango/pango.h> 35#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 36
30#ifndef _WIN32 37#ifndef _WIN32
31# include <sys/types.h> 38# include <sys/types.h>
32# include <sys/socket.h> 39# include <sys/socket.h>
33# include <netinet/in.h> 40# include <netinet/in.h>
34# include <netinet/tcp.h> 41# include <netinet/tcp.h>
35# include <inttypes.h> 42# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 43#endif
44 44
45#include "glext.h" 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 46
47#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
48 48
49#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
51 51
52#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
53
54#if 0
55# define PARACHUTE SDL_INIT_NOPARACHUTE
56#else
57# define PARACHUTE 0
58#endif
53 59
54static struct 60static struct
55{ 61{
56#define GL_FUNC(ptr,name) ptr name; 62#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 63#include "glfunc.h"
… …
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 72 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 73 else
68 glBlendFunc (sa, da); 74 glBlendFunc (sa, da);
69} 75}
70 76
77#include "texcache.c"
78
79#include "pango-font.c"
80#include "pango-fontmap.c"
81#include "pango-render.c"
82
71typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
73 85
74typedef PangoFontDescription *CFClient__Font; 86typedef PangoFontDescription *CFPlus__Font;
87
88static int
89shape_attr_p (PangoLayoutRun *run)
90{
91 GSList *attrs = run->item->analysis.extra_attrs;
92
93 while (attrs)
94 {
95 PangoAttribute *attr = attrs->data;
96
97 if (attr->klass->type == PANGO_ATTR_SHAPE)
98 return 1;
99
100 attrs = attrs->next;
101 }
102
103 return 0;
104}
75 105
76typedef struct cf_layout { 106typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 107 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
80 int base_height; 109 int base_height;
81 CFClient__Font font; 110 CFPlus__Font font;
82} *CFClient__Layout; 111} *CFPlus__Layout;
83 112
84static CFClient__Font default_font; 113static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 114static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 115static PangoFontMap *opengl_fontmap;
87 116
88static void 117static void
89substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
90{ 119{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 120 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 121#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 122 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 123#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 125}
101 126
102static void 127static void
103layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
104{ 129{
105 /* use a random scale factor to account for unknown descenders, 0.8 works 130 /* use a random scale factor to account for unknown descenders, 0.8 works
106 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
107 */ 132 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
… …
112 137
113 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
114} 139}
115 140
116static void 141static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
120 148
121 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 151
124 *w = (*w + 3) & ~3; 152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
125} 157}
126 158
127typedef uint16_t mapface; 159typedef uint16_t mapface;
128 160
129typedef struct { 161typedef struct {
… …
132 float s, t; 164 float s, t;
133 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
134} maptex; 166} maptex;
135 167
136typedef struct { 168typedef struct {
137 int16_t darkness; 169 uint32_t player;
138 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
139} mapcell; 173} mapcell;
140 174
141typedef struct { 175typedef struct {
142 int32_t c0, c1; 176 int32_t c0, c1;
143 mapcell *col; 177 mapcell *col;
… …
152 int texs; 186 int texs;
153 maptex *tex; 187 maptex *tex;
154 188
155 int32_t rows; 189 int32_t rows;
156 maprow *row; 190 maprow *row;
157} *CFClient__Map; 191} *CFPlus__Map;
158 192
159static char * 193static char *
160prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
161{ 195{
162 char *p; 196 char *p;
… …
180 214
181#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183 217
184static maprow * 218static maprow *
185map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
186{ 220{
187 if (0 > y) 221 if (0 > y)
188 { 222 {
189 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
… …
228 262
229 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
230} 264}
231 265
232static mapcell * 266static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
234{ 268{
235 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
236} 270}
237 271
238static void 272static void
239map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
240{ 274{
241 int r; 275 int r;
242 276
243 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
… …
252 self->row = 0; 286 self->row = 0;
253 self->rows = 0; 287 self->rows = 0;
254} 288}
255 289
256static void 290static void
257map_blank (CFClient__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258{ 292{
259 int x, y; 293 int x, y;
260 maprow *row; 294 maprow *row;
295 mapcell *cell;
261 296
262 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 298 if (y >= 0)
264 { 299 {
265 if (y >= self->rows) 300 if (y >= self->rows)
… …
271 if (x >= row->c0) 306 if (x >= row->c0)
272 { 307 {
273 if (x >= row->c1) 308 if (x >= row->c1)
274 break; 309 break;
275 310
276 row->col[x - row->c0].darkness = -1; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
277 } 317 }
278 } 318 }
279} 319}
280 320
281static void 321static void
… …
319 n |= n >> 16; 359 n |= n >> 16;
320 360
321 return n + 1; 361 return n + 1;
322} 362}
323 363
324MODULE = CFClient PACKAGE = CFClient 364MODULE = CFPlus PACKAGE = CFPlus
325 365
326PROTOTYPES: ENABLE 366PROTOTYPES: ENABLE
327 367
328BOOT: 368BOOT:
329{ 369{
330 HV *stash = gv_stashpv ("CFClient", 1); 370 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 371 static const struct {
332 const char *name; 372 const char *name;
333 IV iv; 373 IV iv;
334 } *civ, const_iv[] = { 374 } *civ, const_iv[] = {
335# define const_iv(name) { # name, (IV)name } 375# define const_iv(name) { # name, (IV)name }
… …
436 476
437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439} 479}
440 480
481int
482in_destruct ()
483 CODE:
484 RETVAL = PL_main_cv == Nullcv;
485 OUTPUT:
486 RETVAL
487
441NV floor (NV x) 488NV floor (NV x)
442 489
443NV ceil (NV x) 490NV ceil (NV x)
444 491
445void 492void
446pango_init () 493pango_init ()
447 CODE: 494 CODE:
448 // delayed, so it can pick up new fonts added by AddFontResourceEx
449{ 495{
450 {
451 ft2_fontmap = pango_ft2_font_map_new (); 496 opengl_fontmap = pango_opengl_font_map_new ();
452 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 497 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 498 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454 }
455 {
456 cairo_font_options_t *fopt = cairo_font_options_create ();
457 cairo_fontmap = pango_cairo_font_map_get_default ();
458 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459#ifdef _WIN32
460 // cairo looks like shit eaten twice on windows
461 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462#else
463 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464#endif
465 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467 pango_cairo_context_set_font_options (cairo_context, fopt);
468 cairo_font_options_destroy (fopt);
469 }
470} 499}
471 500
472int 501int
473SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 502SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
474 503
475void 504void
476SDL_Quit () 505SDL_Quit ()
477 506
478void 507void
… …
493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496 525
497 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10)
528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif
498 531
499 SDL_EnableUNICODE (1); 532 SDL_EnableUNICODE (1);
500 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501 534
502 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
589 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591 break; 624 break;
592 } 625 }
593 626
594 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595 } 628 }
596} 629}
597 630
598int 631int
599Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 632Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
613#ifndef _WIN32 646#ifndef _WIN32
614 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
615#endif 648#endif
616 649
617void 650void
651win32_proxy_info ()
652 PPCODE:
653{
654#ifdef _WIN32
655 char buffer[2048];
656 DWORD buflen;
657
658 EXTEND (SP, 3);
659
660 buflen = sizeof (buffer);
661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
663 {
664 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
668 {
669 PUSHs (newSVpv (buffer, 0));
670
671 buflen = sizeof (buffer);
672 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
673 PUSHs (newSVpv (buffer, 0));
674 }
675 }
676#endif
677}
678
679void
618add_font (char *file) 680add_font (char *file)
619 CODE: 681 CODE:
620 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621#ifdef _WIN32
622 // cairo... sigh... requires win2000
623 AddFontResourceEx (file, FR_PRIVATE, 0);
624#endif
625 683
626void 684void
627load_image_inline (SV *image_) 685load_image_inline (SV *image_)
628 ALIAS: 686 ALIAS:
629 load_image_file = 1 687 load_image_file = 1
… …
671 729
672 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 730 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673 731
674 assert (surface2->pitch == surface2->w * 4); 732 assert (surface2->pitch == surface2->w * 4);
675 733
734 SDL_LockSurface (surface2);
676 EXTEND (SP, 5); 735 EXTEND (SP, 6);
677 PUSHs (sv_2mortal (newSViv (surface2->w))); 736 PUSHs (sv_2mortal (newSViv (surface2->w)));
678 PUSHs (sv_2mortal (newSViv (surface2->h))); 737 PUSHs (sv_2mortal (newSViv (surface2->h)));
679 SDL_LockSurface (surface2);
680 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 738 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681 SDL_UnlockSurface (surface2);
682 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 739 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 740 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 741 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
742 SDL_UnlockSurface (surface2);
685 743
686 SDL_FreeSurface (surface); 744 SDL_FreeSurface (surface);
687 SDL_FreeSurface (surface2); 745 SDL_FreeSurface (surface2);
688} 746}
689 747
… …
728 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
729#endif 787#endif
730 _exit (1); 788 _exit (1);
731 789
732void 790void
733_exit (int retval) 791_exit (int retval = 0)
734 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
735 _exit (retval); 796 _exit (retval);
797#endif
736 798
737MODULE = CFClient PACKAGE = CFClient::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
738 800
739CFClient::Font 801CFPlus::Font
740new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
741 CODE: 803 CODE:
742{ 804{
743 int count; 805 int count;
744 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
747} 809}
748 OUTPUT: 810 OUTPUT:
749 RETVAL 811 RETVAL
750 812
751void 813void
752DESTROY (CFClient::Font self) 814DESTROY (CFPlus::Font self)
753 CODE: 815 CODE:
754 pango_font_description_free (self); 816 pango_font_description_free (self);
755 817
756void 818void
757make_default (CFClient::Font self) 819make_default (CFPlus::Font self)
758 CODE: 820 CODE:
759 default_font = self; 821 default_font = self;
760 822
761MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
762 824
763CFClient::Layout 825void
764new (SV *class, int rgba = 0) 826reset_glyph_cache ()
827 CODE:
828 tc_clear ();
829
830CFPlus::Layout
831new (SV *class)
765 CODE: 832 CODE:
766 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
767 834
768 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 835 RETVAL->pl = pango_layout_new (opengl_context);
769 RETVAL->rgba = rgba;
770 RETVAL->r = 1.; 836 RETVAL->r = 1.;
771 RETVAL->g = 1.; 837 RETVAL->g = 1.;
772 RETVAL->b = 1.; 838 RETVAL->b = 1.;
773 RETVAL->a = 1.; 839 RETVAL->a = 1.;
774 RETVAL->base_height = MIN_FONT_HEIGHT; 840 RETVAL->base_height = MIN_FONT_HEIGHT;
… …
778 layout_update_font (RETVAL); 844 layout_update_font (RETVAL);
779 OUTPUT: 845 OUTPUT:
780 RETVAL 846 RETVAL
781 847
782void 848void
783DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
784 CODE: 850 CODE:
785 g_object_unref (self->pl); 851 g_object_unref (self->pl);
786 Safefree (self); 852 Safefree (self);
787 853
788int
789is_rgba (CFClient::Layout self)
790 CODE:
791 RETVAL = self->rgba;
792 OUTPUT:
793 RETVAL
794
795void 854void
796set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
797 CODE: 856 CODE:
798{ 857{
799 STRLEN textlen; 858 STRLEN textlen;
800 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
801 860
802 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
803} 862}
804 863
805void 864void
806set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
807 CODE: 866 CODE:
808{ 867{
809 STRLEN textlen; 868 STRLEN textlen;
810 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
811 870
812 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
813} 872}
814 873
874void
875set_shapes (CFPlus::Layout self, ...)
876 CODE:
877{
878 PangoAttrList *attrs = 0;
879 const char *text = pango_layout_get_text (self->pl);
880 const char *pos = text;
881 int arg = 4;
882
883 while (arg < items && (pos = strstr (pos, OBJ_STR)))
884 {
885 PangoRectangle inkrect, rect;
886 PangoAttribute *attr;
887
888 int x = SvIV (ST (arg - 3));
889 int y = SvIV (ST (arg - 2));
890 int w = SvIV (ST (arg - 1));
891 int h = SvIV (ST (arg ));
892
893 inkrect.x = 0;
894 inkrect.y = 0;
895 inkrect.width = 0;
896 inkrect.height = 0;
897
898 rect.x = x * PANGO_SCALE;
899 rect.y = y * PANGO_SCALE;
900 rect.width = w * PANGO_SCALE;
901 rect.height = h * PANGO_SCALE;
902
903 if (!attrs)
904 attrs = pango_layout_get_attributes (self->pl);
905
906 attr = pango_attr_shape_new (&inkrect, &rect);
907 attr->start_index = pos - text;
908 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
909 pango_attr_list_insert (attrs, attr);
910
911 arg += 4;
912 pos += sizeof (OBJ_STR) - 1;
913 }
914
915 if (attrs)
916 pango_layout_set_attributes (self->pl, attrs);
917}
918
919void
920get_shapes (CFPlus::Layout self)
921 PPCODE:
922{
923 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
924
925 do
926 {
927 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
928
929 if (run && shape_attr_p (run))
930 {
931 PangoRectangle extents;
932 pango_layout_iter_get_run_extents (iter, 0, &extents);
933
934 EXTEND (SP, 2);
935 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
936 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
937 }
938 }
939 while (pango_layout_iter_next_run (iter));
940
941 pango_layout_iter_free (iter);
942}
943
944int
945has_wrapped (CFPlus::Layout self)
946 CODE:
947{
948 int lines = 1;
949 const char *text = pango_layout_get_text (self->pl);
950
951 while (*text)
952 lines += *text++ == '\n';
953
954 RETVAL = lines < pango_layout_get_line_count (self->pl);
955}
956 OUTPUT:
957 RETVAL
958
815SV * 959SV *
816get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
817 CODE: 961 CODE:
818 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819 sv_utf8_decode (RETVAL); 963 sv_utf8_decode (RETVAL);
820 OUTPUT: 964 OUTPUT:
821 RETVAL 965 RETVAL
822 966
823void 967void
824set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 968set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825 CODE: 969 CODE:
826 self->r = r; 970 self->r = r;
827 self->g = g; 971 self->g = g;
828 self->b = b; 972 self->b = b;
829 self->a = a; 973 self->a = a;
830 974
831void 975void
832set_font (CFClient::Layout self, CFClient::Font font = 0) 976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833 CODE: 977 CODE:
834 if (self->font != font) 978 if (self->font != font)
835 { 979 {
836 self->font = font; 980 self->font = font;
837 layout_update_font (self); 981 layout_update_font (self);
838 } 982 }
839 983
840void 984void
841set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
842 CODE: 986 CODE:
843 if (self->base_height != base_height) 987 if (self->base_height != base_height)
844 { 988 {
845 self->base_height = base_height; 989 self->base_height = base_height;
846 layout_update_font (self); 990 layout_update_font (self);
847 } 991 }
848 992
849void 993void
850set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
851 CODE: 995 CODE:
852 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 996 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853 997
854void 998void
855set_indent (CFClient::Layout self, int indent) 999set_indent (CFPlus::Layout self, int indent)
856 CODE: 1000 CODE:
857 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858 1002
859void 1003void
860set_spacing (CFClient::Layout self, int spacing) 1004set_spacing (CFPlus::Layout self, int spacing)
861 CODE: 1005 CODE:
862 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863 1007
864void 1008void
865set_ellipsise (CFClient::Layout self, int ellipsise) 1009set_ellipsise (CFPlus::Layout self, int ellipsise)
866 CODE: 1010 CODE:
867 pango_layout_set_ellipsize (self->pl, 1011 pango_layout_set_ellipsize (self->pl,
868 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START
869 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
871 : PANGO_ELLIPSIZE_NONE 1015 : PANGO_ELLIPSIZE_NONE
872 ); 1016 );
873 1017
874void 1018void
875set_single_paragraph_mode (CFClient::Layout self, int spm) 1019set_single_paragraph_mode (CFPlus::Layout self, int spm)
876 CODE: 1020 CODE:
877 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878 1022
879void 1023void
880size (CFClient::Layout self) 1024size (CFPlus::Layout self)
881 PPCODE: 1025 PPCODE:
882{ 1026{
883 int w, h; 1027 int w, h;
884 1028
885 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
… …
888 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
889 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
890} 1034}
891 1035
892int 1036int
1037descent (CFPlus::Layout self)
1038 CODE:
1039{
1040 PangoRectangle rect;
1041 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1042 pango_layout_line_get_pixel_extents (line, 0, &rect);
1043 RETVAL = PANGO_DESCENT (rect);
1044}
1045 OUTPUT:
1046 RETVAL
1047
1048int
893xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
894 CODE: 1050 CODE:
895{ 1051{
896 int index, trailing; 1052 int index, trailing;
897 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898 RETVAL = index; 1054 RETVAL = index + trailing;
899} 1055}
900 OUTPUT: 1056 OUTPUT:
901 RETVAL 1057 RETVAL
902 1058
903void 1059void
904cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
905 PPCODE: 1061 PPCODE:
906{ 1062{
907 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
908 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909 1065
… …
912 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914} 1070}
915 1071
916void 1072void
917render (CFClient::Layout self) 1073index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
918 PPCODE: 1074 PPCODE:
919{ 1075{
920 SV *retval; 1076 int line, x;
921 int w, h;
922 1077
923 layout_get_pixel_size (self, &w, &h); 1078 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1079 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
924 1080
925 if (self->rgba)
926 {
927 cairo_surface_t *surface;
928 cairo_t *cairo;
929
930 retval = newSV (w * h * 4);
931 SvPOK_only (retval);
932 SvCUR_set (retval, w * h * 4);
933
934 memset (SvPVX (retval), 0, w * h * 4);
935
936 surface = cairo_image_surface_create_for_data (
937 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
938 cairo = cairo_create (surface);
939 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941 pango_cairo_show_layout (cairo, self->pl);
942
943 cairo_destroy (cairo);
944 cairo_surface_destroy (surface);
945
946 // what a mess, and its premultiplied, too :(
947 {
948 uint32_t *p = (uint32_t *)SvPVX (retval);
949 uint32_t *e = p + w * h;
950
951 while (p < e)
952 {
953 uint32_t rgba = *p;
954 rgba = (rgba >> 24) | (rgba << 8);
955#if 0
956#ifdef _WIN32
957 {//D
958 uint8_t r = rgba >> 24;
959 uint8_t g = rgba >> 16;
960 uint8_t b = rgba >> 8;
961 uint8_t a = rgba >> 0;
962
963 rgba = (rgba & 0xffffff00) | a;
964 }
965#endif
966#endif
967 rgba = SDL_SwapBE32 (rgba);
968 *p++ = rgba;
969 }
970 }
971
972 EXTEND (SP, 5); 1081 EXTEND (SP, 2);
973 PUSHs (sv_2mortal (newSViv (w))); 1082 PUSHs (sv_2mortal (newSViv (line - 1)));
1083 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1084}
1085
1086void
1087line_x_to_index (CFPlus::Layout self, int line, int x)
1088 PPCODE:
1089{
1090 PangoLayoutLine *lp;
1091 int index, trailing;
1092
1093 if (line < 0)
1094 XSRETURN_EMPTY;
1095
1096 if (!(lp = pango_layout_get_line (self->pl, line)))
1097 XSRETURN_EMPTY; /* do better */
1098
1099 if (!pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing))
1100 XSRETURN_EMPTY; /* do better */
1101
1102 EXTEND (SP, 2);
1103 if (GIMME_V == G_SCALAR)
974 PUSHs (sv_2mortal (newSViv (h))); 1104 PUSHs (sv_2mortal (newSViv (index + trailing)));
975 PUSHs (sv_2mortal (retval));
976 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978 }
979 else 1105 else
980 { 1106 {
981 FT_Bitmap bitmap;
982
983 retval = newSV (w * h);
984 SvPOK_only (retval);
985 SvCUR_set (retval, w * h);
986
987 bitmap.rows = h;
988 bitmap.width = w;
989 bitmap.pitch = w;
990 bitmap.buffer = (unsigned char*)SvPVX (retval);
991 bitmap.num_grays = 256;
992 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994 memset (bitmap.buffer, 0, w * h);
995
996 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998 EXTEND (SP, 5);
999 PUSHs (sv_2mortal (newSViv (w))); 1107 PUSHs (sv_2mortal (newSViv (index)));
1000 PUSHs (sv_2mortal (newSViv (h))); 1108 PUSHs (sv_2mortal (newSViv (trailing)));
1001 PUSHs (sv_2mortal (retval));
1002 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004 } 1109 }
1005} 1110}
1006 1111
1112void
1113render (CFPlus::Layout self, float x, float y, int flags = 0)
1114 PPCODE:
1115 pango_opengl_render_layout_subpixel (
1116 self->pl,
1117 x * PANGO_SCALE, y * PANGO_SCALE,
1118 self->r, self->g, self->b, self->a,
1119 flags
1120 );
1121
1007MODULE = CFClient PACKAGE = CFClient::Texture 1122MODULE = CFPlus PACKAGE = CFPlus::Texture
1008 1123
1009void 1124void
1010pad2pot (SV *data_, SV *w_, SV *h_) 1125pad2pot (SV *data_, SV *w_, SV *h_)
1011 CODE: 1126 CODE:
1012{ 1127{
… …
1090 glDisable (GL_ALPHA_TEST); 1205 glDisable (GL_ALPHA_TEST);
1091 glDisable (GL_BLEND); 1206 glDisable (GL_BLEND);
1092 } 1207 }
1093} 1208}
1094 1209
1095MODULE = CFClient PACKAGE = CFClient::Map 1210MODULE = CFPlus PACKAGE = CFPlus::Map
1096 1211
1097CFClient::Map 1212CFPlus::Map
1098new (SV *class, int map_width, int map_height) 1213new (SV *class)
1099 CODE: 1214 CODE:
1100 New (0, RETVAL, 1, struct map); 1215 New (0, RETVAL, 1, struct map);
1101 RETVAL->x = 0; 1216 RETVAL->x = 0;
1102 RETVAL->y = 0; 1217 RETVAL->y = 0;
1103 RETVAL->w = map_width; 1218 RETVAL->w = 0;
1104 RETVAL->h = map_height; 1219 RETVAL->h = 0;
1105 RETVAL->ox = 0; 1220 RETVAL->ox = 0;
1106 RETVAL->oy = 0; 1221 RETVAL->oy = 0;
1107 RETVAL->faces = 8192; 1222 RETVAL->faces = 8192;
1108 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1223 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1109 RETVAL->texs = 8192; 1224 RETVAL->texs = 8192;
… …
1112 RETVAL->row = 0; 1227 RETVAL->row = 0;
1113 OUTPUT: 1228 OUTPUT:
1114 RETVAL 1229 RETVAL
1115 1230
1116void 1231void
1117DESTROY (CFClient::Map self) 1232DESTROY (CFPlus::Map self)
1118 CODE: 1233 CODE:
1119{ 1234{
1120 map_clear (self); 1235 map_clear (self);
1121 Safefree (self->face); 1236 Safefree (self->face);
1122 Safefree (self->tex); 1237 Safefree (self->tex);
1123 Safefree (self); 1238 Safefree (self);
1124} 1239}
1125 1240
1126void 1241void
1242resize (CFPlus::Map self, int map_width, int map_height)
1243 CODE:
1244 self->w = map_width;
1245 self->h = map_height;
1246
1247void
1127clear (CFClient::Map self) 1248clear (CFPlus::Map self)
1128 CODE: 1249 CODE:
1129 map_clear (self); 1250 map_clear (self);
1130 1251
1131void 1252void
1132set_face (CFClient::Map self, int face, int texid) 1253set_face (CFPlus::Map self, int face, int texid)
1133 CODE: 1254 CODE:
1134{ 1255{
1135 while (self->faces <= face) 1256 while (self->faces <= face)
1136 { 1257 {
1137 Append (mapface, self->face, self->faces, self->faces); 1258 Append (mapface, self->face, self->faces, self->faces);
… …
1140 1261
1141 self->face [face] = texid; 1262 self->face [face] = texid;
1142} 1263}
1143 1264
1144void 1265void
1145set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1266set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1146 CODE: 1267 CODE:
1147{ 1268{
1148 while (self->texs <= texid) 1269 while (self->texs <= texid)
1149 { 1270 {
1150 Append (maptex, self->tex, self->texs, self->texs); 1271 Append (maptex, self->tex, self->texs, self->texs);
… …
1174 // from transparent color bleeding and ugly wrapping effects. 1295 // from transparent color bleeding and ugly wrapping effects.
1175 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1296 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176} 1297}
1177 1298
1178int 1299int
1179ox (CFClient::Map self) 1300ox (CFPlus::Map self)
1180 ALIAS: 1301 ALIAS:
1181 oy = 1 1302 oy = 1
1182 x = 2 1303 x = 2
1183 y = 3 1304 y = 3
1184 w = 4 1305 w = 4
… …
1195 } 1316 }
1196 OUTPUT: 1317 OUTPUT:
1197 RETVAL 1318 RETVAL
1198 1319
1199void 1320void
1200scroll (CFClient::Map self, int dx, int dy) 1321scroll (CFPlus::Map self, int dx, int dy)
1201 CODE: 1322 CODE:
1202{ 1323{
1203 if (dx > 0) 1324 if (dx > 0)
1204 map_blank (self, self->x, self->y, dx - 1, self->h); 1325 map_blank (self, self->x, self->y, dx, self->h);
1205 else if (dx < 0) 1326 else if (dx < 0)
1206 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1327 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1207 1328
1208 if (dy > 0) 1329 if (dy > 0)
1209 map_blank (self, self->x, self->y, self->w, dy - 1); 1330 map_blank (self, self->x, self->y, self->w, dy);
1210 else if (dy < 0) 1331 else if (dy < 0)
1211 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1332 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1212 1333
1213 self->ox += dx; self->x += dx; 1334 self->ox += dx; self->x += dx;
1214 self->oy += dy; self->y += dy; 1335 self->oy += dy; self->y += dy;
1215 1336
1216 while (self->y < 0) 1337 while (self->y < 0)
… …
1221 self->y += MAP_EXTEND_Y; 1342 self->y += MAP_EXTEND_Y;
1222 } 1343 }
1223} 1344}
1224 1345
1225void 1346void
1226map1a_update (CFClient::Map self, SV *data_) 1347map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227 CODE: 1348 CODE:
1228{ 1349{
1229 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1350 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1230 uint8_t *data_end = (uint8_t *)SvEND (data_); 1351 uint8_t *data_end = (uint8_t *)SvEND (data_);
1231 mapcell *cell; 1352 mapcell *cell;
1232 int x, y, flags; 1353 int x, y, flags;
1233 1354
1234 while (data < data_end) 1355 while (data < data_end - 1)
1235 { 1356 {
1236 flags = (data [0] << 8) + data [1]; data += 2; 1357 flags = (data [0] << 8) + data [1]; data += 2;
1237 1358
1238 x = ((flags >> 10) & 63) + self->x; 1359 x = self->x + ((flags >> 10) & 63);
1239 y = ((flags >> 4) & 63) + self->y; 1360 y = self->y + ((flags >> 4) & 63);
1240 1361
1241 cell = map_get_cell (self, x, y); 1362 cell = map_get_cell (self, x, y);
1242 1363
1243 if (flags & 15) 1364 if (flags & 15)
1244 { 1365 {
1245 if (cell->darkness < 0) 1366 if (!cell->darkness)
1246 { 1367 {
1368 memset (cell, 0, sizeof (*cell));
1247 cell->darkness = 0; 1369 cell->darkness = 256;
1248 cell->face [0] = 0;
1249 cell->face [1] = 0;
1250 cell->face [2] = 0;
1251 } 1370 }
1252 1371
1253 cell->darkness = flags & 8 ? *data++ : 255;
1254
1255 //TODO: don't trust server data to be in-range(!) 1372 //TODO: don't trust server data to be in-range(!)
1373
1374 if (flags & 8)
1375 {
1376 if (extmap)
1377 {
1378 uint8_t ext, cmd;
1379
1380 do
1381 {
1382 ext = *data++;
1383 cmd = ext & 0x3f;
1384
1385 if (cmd < 4)
1386 cell->darkness = 255 - ext * 64 + 1;
1387 else if (cmd == 5) // health
1388 {
1389 cell->stat_width = 1;
1390 cell->stat_hp = *data++;
1391 }
1392 else if (cmd == 6) // monster width
1393 cell->stat_width = *data++ + 1;
1394 else if (cmd == 0x47) // monster width
1395 {
1396 if (*data == 4)
1397 ; // decode player tag
1398
1399 data += *data + 1;
1400 }
1401 else if (cmd == 8) // cell flags
1402 cell->flags = *data++;
1403 else if (ext & 0x40) // unknown, multibyte => skip
1404 data += *data + 1;
1405 else
1406 data++;
1407 }
1408 while (ext & 0x80);
1409 }
1410 else
1411 cell->darkness = *data++ + 1;
1412 }
1256 1413
1257 if (flags & 4) 1414 if (flags & 4)
1258 { 1415 {
1259 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1416 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1260 } 1417 }
… …
1268 { 1425 {
1269 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1426 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1270 } 1427 }
1271 } 1428 }
1272 else 1429 else
1273 cell->darkness = -1; 1430 cell->darkness = 0;
1274 } 1431 }
1275} 1432}
1276 1433
1277SV * 1434SV *
1278mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1435mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279 CODE: 1436 CODE:
1280{ 1437{
1281 int x1, x; 1438 int x1, x;
1282 int y1, y; 1439 int y1, y;
1283 int z; 1440 int z;
… …
1333} 1490}
1334 OUTPUT: 1491 OUTPUT:
1335 RETVAL 1492 RETVAL
1336 1493
1337void 1494void
1338draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1495draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1339 CODE: 1496 CODE:
1340{ 1497{
1341 int vx, vy;
1342 int x, y, z; 1498 int x, y, z;
1343 int last_name; 1499 int last_name;
1344 mapface face; 1500 mapface face;
1345
1346 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1347 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1348
1349 /*
1350 int vx = self->vx = self->w >= sw
1351 ? self->x + (self->w - sw) / 2
1352 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1353
1354 int vy = self->vy = self->h >= sh
1355 ? self->y + (self->h - sh) / 2
1356 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1357 */
1358 1501
1359 glColor4ub (255, 255, 255, 255); 1502 glColor4ub (255, 255, 255, 255);
1360 1503
1361 glEnable (GL_BLEND); 1504 glEnable (GL_BLEND);
1362 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1505 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1365 1508
1366 glBegin (GL_QUADS); 1509 glBegin (GL_QUADS);
1367 1510
1368 last_name = 0; 1511 last_name = 0;
1369 1512
1513 mx += self->x;
1514 my += self->y;
1515
1370 for (z = 0; z < 3; z++) 1516 for (z = 0; z < 3; z++)
1371 for (y = 0; y < sh; y++) 1517 for (y = 0; y < sh; y++)
1372 if (0 <= y + vy && y + vy < self->rows) 1518 if (0 <= y + my && y + my < self->rows)
1373 { 1519 {
1374 maprow *row = self->row + (y + vy); 1520 maprow *row = self->row + (y + my);
1375 1521
1376 for (x = 0; x < sw; x++) 1522 for (x = 0; x < sw; x++)
1377 if (row->c0 <= x + vx && x + vx < row->c1) 1523 if (row->c0 <= x + mx && x + mx < row->c1)
1378 { 1524 {
1379 mapcell *cell = row->col + (x + vx - row->c0); 1525 mapcell *cell = row->col + (x + mx - row->c0);
1380 1526
1381 face = cell->face [z]; 1527 face = cell->face [z];
1382 1528
1383 if (face) 1529 if (face && face < self->texs)
1384 { 1530 {
1385 maptex tex = self->tex [face]; 1531 maptex tex = self->tex [face];
1386
1387 int px = (x + 1) * 32 - tex.w; 1532 int px = (x + 1) * 32 - tex.w;
1388 int py = (y + 1) * 32 - tex.h; 1533 int py = (y + 1) * 32 - tex.h;
1389 1534
1390 if (last_name != tex.name) 1535 if (last_name != tex.name)
1391 { 1536 {
1392 glEnd (); 1537 glEnd ();
1393 last_name = tex.name;
1394 glBindTexture (GL_TEXTURE_2D, last_name); 1538 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1395 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1396 } 1540 }
1397 1541
1398 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1542 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1399 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1543 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1400 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1544 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1401 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1545 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1402 } 1546 }
1547
1548 if (cell->flags && z == 2)
1549 {
1550 if (cell->flags & 1)
1551 {
1552 maptex tex = self->tex [1];
1553 int px = (x + 1) * 32 - tex.w + 2;
1554 int py = (y + 1) * 32 - tex.h - 6;
1555
1556 glEnd ();
1557 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1558 glBegin (GL_QUADS);
1559
1560 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1561 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1562 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1563 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1564 }
1565 }
1403 } 1566 }
1404 } 1567 }
1405 1568
1406 glEnd (); 1569 glEnd ();
1407 1570
1408 glDisable (GL_TEXTURE_2D); 1571 glDisable (GL_TEXTURE_2D);
1409 glDisable (GL_BLEND); 1572 glDisable (GL_BLEND);
1410}
1411 1573
1574 // top layer: overlays such as the health bar
1575 for (y = 0; y < sh; y++)
1576 if (0 <= y + my && y + my < self->rows)
1577 {
1578 maprow *row = self->row + (y + my);
1579
1580 for (x = 0; x < sw; x++)
1581 if (row->c0 <= x + mx && x + mx < row->c1)
1582 {
1583 mapcell *cell = row->col + (x + mx - row->c0);
1584
1585 int px = x * 32;
1586 int py = y * 32;
1587
1588 if (cell->stat_hp)
1589 {
1590 int width = cell->stat_width * 32;
1591 int thick = sh / 28 + 1 + cell->stat_width;
1592
1593 glColor3ub (0, 0, 0);
1594 glRectf (px + 1, py - thick - 2,
1595 px + width - 1, py);
1596
1597 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1598 glRectf (px + 2,
1599 py - thick - 1,
1600 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1601 }
1602 }
1603 }
1604}
1605
1412void 1606void
1413draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1607draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414 CODE: 1608 CODE:
1415{ 1609{
1416 static float color[16][3] = { 1610 static float color[16][3] = {
1417 { 0.00, 0.00, 0.00 }, 1611 { 0.00F, 0.00F, 0.00F },
1418 { 1.00, 1.00, 1.00 }, 1612 { 1.00F, 1.00F, 1.00F },
1419 { 0.00, 0.00, 0.55 }, 1613 { 0.00F, 0.00F, 0.55F },
1420 { 1.00, 0.00, 0.00 }, 1614 { 1.00F, 0.00F, 0.00F },
1421 1615
1422 { 1.00, 0.54, 0.00 }, 1616 { 1.00F, 0.54F, 0.00F },
1423 { 0.11, 0.56, 1.00 }, 1617 { 0.11F, 0.56F, 1.00F },
1424 { 0.93, 0.46, 0.00 }, 1618 { 0.93F, 0.46F, 0.00F },
1425 { 0.18, 0.54, 0.34 }, 1619 { 0.18F, 0.54F, 0.34F },
1426 1620
1427 { 0.56, 0.73, 0.56 }, 1621 { 0.56F, 0.73F, 0.56F },
1428 { 0.80, 0.80, 0.80 }, 1622 { 0.80F, 0.80F, 0.80F },
1429 { 0.55, 0.41, 0.13 }, 1623 { 0.55F, 0.41F, 0.13F },
1430 { 0.99, 0.77, 0.26 }, 1624 { 0.99F, 0.77F, 0.26F },
1431 1625
1432 { 0.74, 0.65, 0.41 }, 1626 { 0.74F, 0.65F, 0.41F },
1433 1627
1434 { 0.00, 1.00, 1.00 }, 1628 { 0.00F, 1.00F, 1.00F },
1435 { 1.00, 0.00, 1.00 }, 1629 { 1.00F, 0.00F, 1.00F },
1436 { 1.00, 1.00, 0.00 }, 1630 { 1.00F, 1.00F, 0.00F },
1437 }; 1631 };
1438 1632
1439 int x, y; 1633 int x, y;
1440 1634
1441 glEnable (GL_TEXTURE_2D); 1635 glEnable (GL_TEXTURE_2D);
… …
1468 glDisable (GL_BLEND); 1662 glDisable (GL_BLEND);
1469 glDisable (GL_TEXTURE_2D); 1663 glDisable (GL_TEXTURE_2D);
1470} 1664}
1471 1665
1472void 1666void
1473fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1667fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1474 PPCODE: 1668 PPCODE:
1475{ 1669{
1476 int vx, vy;
1477 int x, y; 1670 int x, y;
1478 int sw4 = (sw + 3) & ~3; 1671 int sw4 = (sw + 3) & ~3;
1479 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1672 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1480 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1673 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1481 1674
1482 memset (darkness, 255, sw4 * sh); 1675 memset (darkness, 255, sw4 * sh);
1483 SvPOK_only (darkness_sv); 1676 SvPOK_only (darkness_sv);
1484 SvCUR_set (darkness_sv, sw4 * sh); 1677 SvCUR_set (darkness_sv, sw4 * sh);
1485 1678
1486 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1679 mx += self->x;
1487 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1680 my += self->y;
1488 1681
1489 for (y = 0; y < sh; y++) 1682 for (y = 0; y < sh; y++)
1490 if (0 <= y + vy && y + vy < self->rows) 1683 if (0 <= y + my && y + my < self->rows)
1491 { 1684 {
1492 maprow *row = self->row + (y + vy); 1685 maprow *row = self->row + (y + my);
1493 1686
1494 for (x = 0; x < sw; x++) 1687 for (x = 0; x < sw; x++)
1495 if (row->c0 <= x + vx && x + vx < row->c1) 1688 if (row->c0 <= x + mx && x + mx < row->c1)
1496 { 1689 {
1497 mapcell *cell = row->col + (x + vx - row->c0); 1690 mapcell *cell = row->col + (x + mx - row->c0);
1498 1691
1499 darkness[y * sw4 + x] = cell->darkness < 0 1692 darkness[y * sw4 + x] = cell->darkness
1693 ? 255 - (cell->darkness - 1)
1500 ? 255 - FOW_DARKNESS 1694 : 255 - FOW_DARKNESS;
1501 : 255 - cell->darkness;
1502 } 1695 }
1503 } 1696 }
1504 1697
1505 EXTEND (SP, 3); 1698 EXTEND (SP, 3);
1506 PUSHs (sv_2mortal (newSViv (sw4))); 1699 PUSHs (sv_2mortal (newSViv (sw4)));
1507 PUSHs (sv_2mortal (newSViv (sh))); 1700 PUSHs (sv_2mortal (newSViv (sh)));
1508 PUSHs (darkness_sv); 1701 PUSHs (darkness_sv);
1509} 1702}
1510 1703
1511SV * 1704SV *
1512get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1705get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1513 CODE: 1706 CODE:
1514{ 1707{
1515 int x, y, x1, y1; 1708 int x, y, x1, y1;
1516 SV *data_sv = newSV (w * h * 7 + 5); 1709 SV *data_sv = newSV (w * h * 7 + 5);
1517 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1710 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1579} 1772}
1580 OUTPUT: 1773 OUTPUT:
1581 RETVAL 1774 RETVAL
1582 1775
1583void 1776void
1584set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1777set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1585 PPCODE: 1778 PPCODE:
1586{ 1779{
1587 int x, y, z; 1780 int x, y, z;
1588 int w, h; 1781 int w, h;
1589 int x1, y1; 1782 int x1, y1;
… …
1621 1814
1622 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1815 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1623 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1816 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1624 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1817 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1625 1818
1626 if (cell->darkness <= 0) 1819 if (cell->darkness == 0)
1627 { 1820 {
1628 cell->darkness = -1; 1821 cell->darkness = 0;
1629 1822
1630 for (z = 0; z <= 2; z++) 1823 for (z = 0; z <= 2; z++)
1631 { 1824 {
1632 cell->face[z] = face[z]; 1825 cell->face[z] = face[z];
1633 1826
… …
1638 } 1831 }
1639 } 1832 }
1640 } 1833 }
1641} 1834}
1642 1835
1643MODULE = CFClient PACKAGE = CFClient::MixChunk 1836MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644 1837
1645CFClient::MixChunk 1838CFPlus::MixChunk
1646new_from_file (SV *class, char *path) 1839new_from_file (SV *class, char *path)
1647 CODE: 1840 CODE:
1648 RETVAL = Mix_LoadWAV (path); 1841 RETVAL = Mix_LoadWAV (path);
1649 OUTPUT: 1842 OUTPUT:
1650 RETVAL 1843 RETVAL
1651 1844
1652void 1845void
1653DESTROY (CFClient::MixChunk self) 1846DESTROY (CFPlus::MixChunk self)
1654 CODE: 1847 CODE:
1655 Mix_FreeChunk (self); 1848 Mix_FreeChunk (self);
1656 1849
1657int 1850int
1658volume (CFClient::MixChunk self, int volume = -1) 1851volume (CFPlus::MixChunk self, int volume = -1)
1659 CODE: 1852 CODE:
1660 RETVAL = Mix_VolumeChunk (self, volume); 1853 RETVAL = Mix_VolumeChunk (self, volume);
1661 OUTPUT: 1854 OUTPUT:
1662 RETVAL 1855 RETVAL
1663 1856
1664int 1857int
1665play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1858play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1666 CODE: 1859 CODE:
1667 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1860 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668 OUTPUT: 1861 OUTPUT:
1669 RETVAL 1862 RETVAL
1670 1863
1671MODULE = CFClient PACKAGE = CFClient::MixMusic 1864MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672 1865
1673int 1866int
1674volume (int volume = -1) 1867volume (int volume = -1)
1675 CODE: 1868 CODE:
1676 RETVAL = Mix_VolumeMusic (volume); 1869 RETVAL = Mix_VolumeMusic (volume);
1677 OUTPUT: 1870 OUTPUT:
1678 RETVAL 1871 RETVAL
1679 1872
1680CFClient::MixMusic 1873CFPlus::MixMusic
1681new_from_file (SV *class, char *path) 1874new_from_file (SV *class, char *path)
1682 CODE: 1875 CODE:
1683 RETVAL = Mix_LoadMUS (path); 1876 RETVAL = Mix_LoadMUS (path);
1684 OUTPUT: 1877 OUTPUT:
1685 RETVAL 1878 RETVAL
1686 1879
1687void 1880void
1688DESTROY (CFClient::MixMusic self) 1881DESTROY (CFPlus::MixMusic self)
1689 CODE: 1882 CODE:
1690 Mix_FreeMusic (self); 1883 Mix_FreeMusic (self);
1691 1884
1692int 1885int
1693play (CFClient::MixMusic self, int loops = -1) 1886play (CFPlus::MixMusic self, int loops = -1)
1694 CODE: 1887 CODE:
1695 RETVAL = Mix_PlayMusic (self, loops); 1888 RETVAL = Mix_PlayMusic (self, loops);
1696 OUTPUT: 1889 OUTPUT:
1697 RETVAL 1890 RETVAL
1698 1891
1699MODULE = CFClient PACKAGE = CFClient::OpenGL 1892MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1700 1893
1701BOOT: 1894BOOT:
1702{ 1895{
1703 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1896 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704 static const struct { 1897 static const struct {
1705 const char *name; 1898 const char *name;
1706 IV iv; 1899 IV iv;
1707 } *civ, const_iv[] = { 1900 } *civ, const_iv[] = {
1708# define const_iv(name) { # name, (IV)name } 1901# define const_iv(name) { # name, (IV)name }
… …
1771 const_iv (GL_SEPARABLE_2D), 1964 const_iv (GL_SEPARABLE_2D),
1772 const_iv (GL_CONVOLUTION_2D), 1965 const_iv (GL_CONVOLUTION_2D),
1773 const_iv (GL_CONVOLUTION_BORDER_MODE), 1966 const_iv (GL_CONVOLUTION_BORDER_MODE),
1774 const_iv (GL_CONSTANT_BORDER), 1967 const_iv (GL_CONSTANT_BORDER),
1775 const_iv (GL_LINES), 1968 const_iv (GL_LINES),
1969 const_iv (GL_LINE_STRIP),
1776 const_iv (GL_LINE_LOOP), 1970 const_iv (GL_LINE_LOOP),
1777 const_iv (GL_QUADS), 1971 const_iv (GL_QUADS),
1778 const_iv (GL_QUAD_STRIP), 1972 const_iv (GL_QUAD_STRIP),
1779 const_iv (GL_TRIANGLES), 1973 const_iv (GL_TRIANGLES),
1780 const_iv (GL_TRIANGLE_STRIP), 1974 const_iv (GL_TRIANGLE_STRIP),
… …
1890 r *= a; 2084 r *= a;
1891 g *= a; 2085 g *= a;
1892 b *= a; 2086 b *= a;
1893 } 2087 }
1894 // microsoft visual "c" rounds instead of truncating... 2088 // microsoft visual "c" rounds instead of truncating...
1895 glColor4ub (MIN ((int)(r * 256.f), 255), 2089 glColor4f (r, g, b, a);
1896 MIN ((int)(g * 256.f), 255),
1897 MIN ((int)(b * 256.f), 255),
1898 MIN ((int)(a * 256.f), 255));
1899 2090
1900void glInterleavedArrays (int format, int stride, char *data) 2091void glInterleavedArrays (int format, int stride, char *data)
1901 2092
1902void glDrawElements (int mode, int count, int type, char *indices) 2093void glDrawElements (int mode, int count, int type, char *indices)
1903 2094
… …
1980 2171
1981void glEndList () 2172void glEndList ()
1982 2173
1983void glCallList (int list) 2174void glCallList (int list)
1984 2175
1985

Diff Legend

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