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.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.256 by root, Mon Mar 24 00:24:46 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
63#define MAP_EXTEND_X 32 74#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 75#define MAP_EXTEND_Y 512
65 76
66#define MIN_FONT_HEIGHT 10 77#define MIN_FONT_HEIGHT 10
67 78
79/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
68#if 0 82#if 0
69# define PARACHUTE SDL_INIT_NOPARACHUTE 83# define PARACHUTE SDL_INIT_NOPARACHUTE
70#else 84#else
71# define PARACHUTE 0 85# define PARACHUTE 0
72#endif 86#endif
120 134
121#include "pango-font.c" 135#include "pango-font.c"
122#include "pango-fontmap.c" 136#include "pango-fontmap.c"
123#include "pango-render.c" 137#include "pango-render.c"
124 138
125typedef IV CFPlus__Channel; 139typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 140typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 141typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 142typedef Mix_Music *DC__MixMusic;
129 143
130typedef PangoFontDescription *CFPlus__Font; 144typedef PangoFontDescription *DC__Font;
131 145
132static int 146static int
133shape_attr_p (PangoLayoutRun *run) 147shape_attr_p (PangoLayoutRun *run)
134{ 148{
135 GSList *attrs = run->item->analysis.extra_attrs; 149 GSList *attrs = run->item->analysis.extra_attrs;
149 163
150typedef struct cf_layout { 164typedef struct cf_layout {
151 PangoLayout *pl; 165 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 166 float r, g, b, a; // default color for rgba mode
153 int base_height; 167 int base_height;
154 CFPlus__Font font; 168 DC__Font font;
155 rc_t *rc; 169 rc_t *rc;
156} *CFPlus__Layout; 170} *DC__Layout;
157 171
158static CFPlus__Font default_font; 172static DC__Font default_font;
159static PangoContext *opengl_context; 173static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 174static PangoFontMap *opengl_fontmap;
161 175
162static void 176static void
163substitute_func (FcPattern *pattern, gpointer data) 177substitute_func (FcPattern *pattern, gpointer data)
168#endif 182#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 183 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 184}
171 185
172static void 186static void
173layout_update_font (CFPlus__Layout self) 187layout_update_font (DC__Layout self)
174{ 188{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 189 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 190 * reasonably well with bitstream vera
177 */ 191 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
182 196
183 pango_layout_set_font_description (self->pl, font); 197 pango_layout_set_font_description (self->pl, font);
184} 198}
185 199
186static void 200static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 201layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 202{
189 PangoRectangle rect; 203 PangoRectangle rect;
190 204
191 // get_pixel_* wrongly rounds down 205 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 206 pango_layout_get_extents (self->pl, 0, &rect);
203 217
204typedef uint16_t tileid; 218typedef uint16_t tileid;
205typedef uint16_t faceid; 219typedef uint16_t faceid;
206 220
207typedef struct { 221typedef struct {
208 int name; 222 GLuint name;
209 int w, h; 223 int w, h;
210 float s, t; 224 float s, t;
211 uint8_t r, g, b, a; 225 uint8_t r, g, b, a;
212 tileid smoothtile; 226 tileid smoothtile;
213 uint8_t smoothlevel; 227 uint8_t smoothlevel;
231 int faces; tileid *face2tile; // [faceid] 245 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 246 int texs; maptex *tex; // [tileid]
233 247
234 int32_t rows; 248 int32_t rows;
235 maprow *row; 249 maprow *row;
236} *CFPlus__Map; 250} *DC__Map;
237 251
238static char * 252static char *
239prepend (char *ptr, int sze, int inc) 253prepend (char *ptr, int sze, int inc)
240{ 254{
241 char *p; 255 char *p;
279 self->texs *= 2; 293 self->texs *= 2;
280 } 294 }
281} 295}
282 296
283static maprow * 297static maprow *
284map_get_row (CFPlus__Map self, int y) 298map_get_row (DC__Map self, int y)
285{ 299{
286 if (0 > y) 300 if (0 > y)
287 { 301 {
288 int extend = - y + MAP_EXTEND_Y; 302 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 303 Prepend (maprow, self->row, self->rows, extend);
327 341
328 return row->col + (x - row->c0); 342 return row->col + (x - row->c0);
329} 343}
330 344
331static mapcell * 345static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 346map_get_cell (DC__Map self, int x, int y)
333{ 347{
334 return row_get_cell (map_get_row (self, y), x); 348 return row_get_cell (map_get_row (self, y), x);
335} 349}
336 350
337static void 351static void
338map_clear (CFPlus__Map self) 352map_clear (DC__Map self)
339{ 353{
340 int r; 354 int r;
341 355
342 for (r = 0; r < self->rows; r++) 356 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 357 Safefree (self->row[r].col);
351 self->row = 0; 365 self->row = 0;
352 self->rows = 0; 366 self->rows = 0;
353} 367}
354 368
355static void 369static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 370map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 371{
358 int x, y; 372 int x, y;
359 maprow *row; 373 maprow *row;
360 mapcell *cell; 374 mapcell *cell;
361 375
440 n |= n >> 16; 454 n |= n >> 16;
441 455
442 return n + 1; 456 return n + 1;
443} 457}
444 458
459static unsigned int
460popcount (unsigned int n)
461{
462 n -= (n >> 1) & 0x55555555U;
463 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
464 n = ((n >> 4) + n) & 0x0f0f0f0fU;
465 n *= 0x01010101U;
466
467 return n >> 24;
468}
469
445/* SDL should provide this, really. */ 470/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 471#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 472#define SDLK_MODIFIER_MAX 314
448 473
449/******************************************************************************/ 474/******************************************************************************/
487 return 0; 512 return 0;
488 513
489 return 1; 514 return 1;
490} 515}
491 516
492MODULE = CFPlus PACKAGE = CFPlus 517MODULE = Deliantra::Client PACKAGE = DC
493 518
494PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
495 520
496BOOT: 521BOOT:
497{ 522{
498 HV *stash = gv_stashpv ("CFPlus", 1); 523 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 524 static const struct {
500 const char *name; 525 const char *name;
501 IV iv; 526 IV iv;
502 } *civ, const_iv[] = { 527 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 528# define const_iv(name) { # name, (IV)name }
525 550
526 const_iv (SDL_APPINPUTFOCUS), 551 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 552 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 553 const_iv (SDL_APPACTIVE),
529 554
555 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 557 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 558 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 559 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 560 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 561 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 633 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 634 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 635 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 636 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 637 const_iv (KMOD_MODE),
638
639 const_iv (MIX_DEFAULT_FORMAT),
611# undef const_iv 640# undef const_iv
612 }; 641 };
613 642
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 662
634NV floor (NV x) 663NV floor (NV x)
635 664
636NV ceil (NV x) 665NV ceil (NV x)
637 666
667IV minpot (UV n)
668
669IV popcount (UV n)
670
638void 671void
639pango_init () 672pango_init ()
640 CODE: 673 CODE:
641{ 674{
642 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
678#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif
645} 682}
646 683
647char * 684char *
648SDL_GetError () 685SDL_GetError ()
649 686
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 719
683 if (m && m != (SDL_Rect **)-1) 720 if (m && m != (SDL_Rect **)-1)
684 while (*m) 721 while (*m)
685 { 722 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 723 if ((*m)->w >= 800 && (*m)->h >= 480)
687 { 724 {
688 AV *av = newAV (); 725 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 726 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 727 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 728 av_push (av, newSViv (rgb));
715 752
716 if (RETVAL) 753 if (RETVAL)
717 { 754 {
718 av_clear (texture_av); 755 av_clear (texture_av);
719 756
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 758#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 759#include "glfunc.h"
723#undef GL_FUNC 760#undef GL_FUNC
724 } 761 }
725} 762}
732char * 769char *
733SDL_GetKeyName (int sym) 770SDL_GetKeyName (int sym)
734 771
735int 772int
736SDL_GetAppState () 773SDL_GetAppState ()
774
775int
776SDL_GetModState ()
737 777
738void 778void
739poll_events () 779poll_events ()
740 PPCODE: 780 PPCODE:
741{ 781{
751 { 791 {
752 case SDL_KEYDOWN: 792 case SDL_KEYDOWN:
753 case SDL_KEYUP: 793 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 796 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
757 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 797 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 799 break;
760 800
761 case SDL_ACTIVEEVENT: 801 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 820 x = ev.motion.x;
781 y = ev.motion.y; 821 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 823 }
784 824
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 826 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 827 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 828 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 829 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 830 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 831 }
792 break; 832 break;
793 833
794 case SDL_MOUSEBUTTONDOWN: 834 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 835 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 837
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 838 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 839 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 840 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 841 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 846 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 847 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 848 break;
809 } 849 }
810 850
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 851 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 852 }
813} 853}
814 854
815int 855int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 856Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 857 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 858 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 859 Mix_ChannelFinished (channel_finished);
860
861void
862Mix_QuerySpec ()
863 PPCODE:
864{
865 int freq, channels;
866 Uint16 format;
867
868 if (Mix_QuerySpec (&freq, &format, &channels))
869 {
870 EXTEND (SP, 3);
871 PUSHs (sv_2mortal (newSViv (freq)));
872 PUSHs (sv_2mortal (newSViv (format)));
873 PUSHs (sv_2mortal (newSViv (channels)));
874 }
875}
820 876
821void 877void
822Mix_CloseAudio () 878Mix_CloseAudio ()
823 879
824int 880int
958void 1014void
959error (char *message) 1015error (char *message)
960 CODE: 1016 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1017 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1018#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1019 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1020#endif
965 1021
966void 1022void
967fatal (char *message) 1023fatal (char *message)
968 CODE: 1024 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1025 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1026#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1027 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1028#endif
973 _exit (1); 1029 _exit (1);
974 1030
975void 1031void
976_exit (int retval = 0) 1032_exit (int retval = 0)
988#if DEBUG 1044#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1045 VALGRIND_DO_LEAK_CHECK;
990#endif 1046#endif
991} 1047}
992 1048
993MODULE = CFPlus PACKAGE = CFPlus::Font 1049MODULE = Deliantra::Client PACKAGE = DC::Font
994 1050
995PROTOTYPES: DISABLE 1051PROTOTYPES: DISABLE
996 1052
997CFPlus::Font 1053DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1054new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1055 CODE:
1000{ 1056{
1001 int count; 1057 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1058 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1061}
1006 OUTPUT: 1062 OUTPUT:
1007 RETVAL 1063 RETVAL
1008 1064
1009void 1065void
1010DESTROY (CFPlus::Font self) 1066DESTROY (DC::Font self)
1011 CODE: 1067 CODE:
1012 pango_font_description_free (self); 1068 pango_font_description_free (self);
1013 1069
1014void 1070void
1015make_default (CFPlus::Font self) 1071make_default (DC::Font self)
1016 PROTOTYPE: $ 1072 PROTOTYPE: $
1017 CODE: 1073 CODE:
1018 default_font = self; 1074 default_font = self;
1019 1075
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1076MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1077
1022PROTOTYPES: DISABLE 1078PROTOTYPES: DISABLE
1023 1079
1024void 1080void
1025reset_glyph_cache () 1081glyph_cache_backup ()
1026 PROTOTYPE: 1082 PROTOTYPE:
1027 CODE: 1083 CODE:
1084 tc_backup ();
1085
1086void
1087glyph_cache_restore ()
1088 PROTOTYPE:
1089 CODE:
1028 tc_clear (); 1090 tc_restore ();
1029 1091
1030CFPlus::Layout 1092DC::Layout
1031new (SV *class) 1093new (SV *class)
1032 CODE: 1094 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1095 New (0, RETVAL, 1, struct cf_layout);
1034 1096
1035 RETVAL->pl = pango_layout_new (opengl_context); 1097 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1107 layout_update_font (RETVAL);
1046 OUTPUT: 1108 OUTPUT:
1047 RETVAL 1109 RETVAL
1048 1110
1049void 1111void
1050DESTROY (CFPlus::Layout self) 1112DESTROY (DC::Layout self)
1051 CODE: 1113 CODE:
1052 g_object_unref (self->pl); 1114 g_object_unref (self->pl);
1053 rc_free (self->rc); 1115 rc_free (self->rc);
1054 Safefree (self); 1116 Safefree (self);
1055 1117
1056void 1118void
1057set_text (CFPlus::Layout self, SV *text_) 1119set_text (DC::Layout self, SV *text_)
1058 CODE: 1120 CODE:
1059{ 1121{
1060 STRLEN textlen; 1122 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
1062 1124
1063 pango_layout_set_text (self->pl, text, textlen); 1125 pango_layout_set_text (self->pl, text, textlen);
1064} 1126}
1065 1127
1066void 1128void
1067set_markup (CFPlus::Layout self, SV *text_) 1129set_markup (DC::Layout self, SV *text_)
1068 CODE: 1130 CODE:
1069{ 1131{
1070 STRLEN textlen; 1132 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1133 char *text = SvPVutf8 (text_, textlen);
1072 1134
1073 pango_layout_set_markup (self->pl, text, textlen); 1135 pango_layout_set_markup (self->pl, text, textlen);
1074} 1136}
1075 1137
1076void 1138void
1077set_shapes (CFPlus::Layout self, ...) 1139set_shapes (DC::Layout self, ...)
1078 CODE: 1140 CODE:
1079{ 1141{
1080 PangoAttrList *attrs = 0; 1142 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1143 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1144 const char *pos = text;
1117 if (attrs) 1179 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1180 pango_layout_set_attributes (self->pl, attrs);
1119} 1181}
1120 1182
1121void 1183void
1122get_shapes (CFPlus::Layout self) 1184get_shapes (DC::Layout self)
1123 PPCODE: 1185 PPCODE:
1124{ 1186{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1187 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1188
1127 do 1189 do
1128 { 1190 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1191 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1192
1131 if (run && shape_attr_p (run)) 1193 if (run && shape_attr_p (run))
1132 { 1194 {
1133 PangoRectangle extents; 1195 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1196 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1204
1143 pango_layout_iter_free (iter); 1205 pango_layout_iter_free (iter);
1144} 1206}
1145 1207
1146int 1208int
1147has_wrapped (CFPlus::Layout self) 1209has_wrapped (DC::Layout self)
1148 CODE: 1210 CODE:
1149{ 1211{
1150 int lines = 1; 1212 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1213 const char *text = pango_layout_get_text (self->pl);
1152 1214
1157} 1219}
1158 OUTPUT: 1220 OUTPUT:
1159 RETVAL 1221 RETVAL
1160 1222
1161SV * 1223SV *
1162get_text (CFPlus::Layout self) 1224get_text (DC::Layout self)
1163 CODE: 1225 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1226 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1227 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1228 OUTPUT:
1167 RETVAL 1229 RETVAL
1168 1230
1169void 1231void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1232set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1233 CODE:
1172 self->r = r; 1234 self->r = r;
1173 self->g = g; 1235 self->g = g;
1174 self->b = b; 1236 self->b = b;
1175 self->a = a; 1237 self->a = a;
1176 1238
1177void 1239void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1240set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1241 CODE:
1180 if (self->font != font) 1242 if (self->font != font)
1181 { 1243 {
1182 self->font = font; 1244 self->font = font;
1183 layout_update_font (self); 1245 layout_update_font (self);
1184 } 1246 }
1185 1247
1186void 1248void
1187set_height (CFPlus::Layout self, int base_height) 1249set_height (DC::Layout self, int base_height)
1188 CODE: 1250 CODE:
1189 if (self->base_height != base_height) 1251 if (self->base_height != base_height)
1190 { 1252 {
1191 self->base_height = base_height; 1253 self->base_height = base_height;
1192 layout_update_font (self); 1254 layout_update_font (self);
1193 } 1255 }
1194 1256
1195void 1257void
1196set_width (CFPlus::Layout self, int max_width = -1) 1258set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1259 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1260 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1261
1200void 1262void
1201set_indent (CFPlus::Layout self, int indent) 1263set_indent (DC::Layout self, int indent)
1202 CODE: 1264 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1265 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1266
1205void 1267void
1206set_spacing (CFPlus::Layout self, int spacing) 1268set_spacing (DC::Layout self, int spacing)
1207 CODE: 1269 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1270 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1271
1210void 1272void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1273set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1274 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1275 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1276 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1277 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1278 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1279 : PANGO_ELLIPSIZE_NONE
1218 ); 1280 );
1219 1281
1220void 1282void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1283set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1284 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1285 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1286
1225void 1287void
1226size (CFPlus::Layout self) 1288size (DC::Layout self)
1227 PPCODE: 1289 PPCODE:
1228{ 1290{
1229 int w, h; 1291 int w, h;
1230 1292
1231 layout_get_pixel_size (self, &w, &h); 1293 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1296 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1297 PUSHs (sv_2mortal (newSViv (h)));
1236} 1298}
1237 1299
1238int 1300int
1239descent (CFPlus::Layout self) 1301descent (DC::Layout self)
1240 CODE: 1302 CODE:
1241{ 1303{
1242 PangoRectangle rect; 1304 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1305 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1306 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1307 RETVAL = PANGO_DESCENT (rect);
1246} 1308}
1247 OUTPUT: 1309 OUTPUT:
1248 RETVAL 1310 RETVAL
1249 1311
1250int 1312int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1313xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1314 CODE:
1253{ 1315{
1254 int index, trailing; 1316 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1317 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1318 RETVAL = index + trailing;
1257} 1319}
1258 OUTPUT: 1320 OUTPUT:
1259 RETVAL 1321 RETVAL
1260 1322
1261void 1323void
1262cursor_pos (CFPlus::Layout self, int index) 1324cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1325 PPCODE:
1264{ 1326{
1265 PangoRectangle strong_pos; 1327 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1328 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1329
1268 EXTEND (SP, 3); 1330 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1331 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1332 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1333 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1334}
1273 1335
1274void 1336void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1337index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1338 PPCODE:
1277{ 1339{
1278 int line, x; 1340 int line, x;
1279 1341
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1342 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1343#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1344 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1345 --line;
1346#endif
1283 EXTEND (SP, 2); 1347 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1348 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1349 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1350}
1287 1351
1288void 1352void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1353line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1354 PPCODE:
1291{ 1355{
1292 PangoLayoutLine *lp; 1356 PangoLayoutLine *lp;
1293 int index, trailing; 1357 int index, trailing;
1294 1358
1295 if (line < 0) 1359 if (line < 0)
1296 XSRETURN_EMPTY; 1360 XSRETURN_EMPTY;
1297 1361
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1362 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1363 XSRETURN_EMPTY; /* do better */
1300 1364
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1365 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1366
1303 EXTEND (SP, 2); 1367 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1373 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1374 }
1311} 1375}
1312 1376
1313void 1377void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1378render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1379 CODE:
1316 rc_clear (self->rc); 1380 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1381 pango_opengl_render_layout_subpixel (
1318 self->pl, 1382 self->pl,
1319 self->rc, 1383 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1388 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1389 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1390 pango_layout_context_changed (self->pl);
1327 1391
1328void 1392void
1329draw (CFPlus::Layout self) 1393draw (DC::Layout self)
1330 CODE: 1394 CODE:
1331{ 1395{
1332 glEnable (GL_TEXTURE_2D); 1396 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1397 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1398 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1406 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1407 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1408 glDisable (GL_TEXTURE_2D);
1345} 1409}
1346 1410
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1411MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1412
1349PROTOTYPES: ENABLE 1413PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1414
1353void 1415void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1416pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1417 CODE:
1356{ 1418{
1433 RETVAL = width > 0; 1495 RETVAL = width > 0;
1434} 1496}
1435 OUTPUT: 1497 OUTPUT:
1436 RETVAL 1498 RETVAL
1437 1499
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1500MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1501
1440PROTOTYPES: DISABLE 1502PROTOTYPES: DISABLE
1441 1503
1442CFPlus::Map 1504DC::Map
1443new (SV *class) 1505new (SV *class)
1444 CODE: 1506 CODE:
1445 New (0, RETVAL, 1, struct map); 1507 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1508 RETVAL->x = 0;
1447 RETVAL->y = 0; 1509 RETVAL->y = 0;
1455 RETVAL->row = 0; 1517 RETVAL->row = 0;
1456 OUTPUT: 1518 OUTPUT:
1457 RETVAL 1519 RETVAL
1458 1520
1459void 1521void
1460DESTROY (CFPlus::Map self) 1522DESTROY (DC::Map self)
1461 CODE: 1523 CODE:
1462{ 1524{
1463 map_clear (self); 1525 map_clear (self);
1464 Safefree (self->face2tile); 1526 Safefree (self->face2tile);
1465 Safefree (self->tex); 1527 Safefree (self->tex);
1466 Safefree (self); 1528 Safefree (self);
1467} 1529}
1468 1530
1469void 1531void
1470resize (CFPlus::Map self, int map_width, int map_height) 1532resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1533 CODE:
1472 self->w = map_width; 1534 self->w = map_width;
1473 self->h = map_height; 1535 self->h = map_height;
1474 1536
1475void 1537void
1476clear (CFPlus::Map self) 1538clear (DC::Map self)
1477 CODE: 1539 CODE:
1478 map_clear (self); 1540 map_clear (self);
1479 1541
1480void 1542void
1481set_tileid (CFPlus::Map self, int face, int tile) 1543set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1544 CODE:
1483{ 1545{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1546 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1547 need_texid (self, tile);
1486} 1548}
1487 1549
1488void 1550void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1551set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1552 CODE:
1491{ 1553{
1492 tileid texid; 1554 tileid texid;
1493 maptex *tex; 1555 maptex *tex;
1494 1556
1507 tex->smoothtile = self->face2tile [smooth]; 1569 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1570 tex->smoothlevel = level;
1509} 1571}
1510 1572
1511void 1573void
1512set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1574set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1513 CODE: 1575 CODE:
1514{ 1576{
1515 need_texid (self, texid); 1577 need_texid (self, texid);
1516 1578
1517 { 1579 {
1537 // from transparent color bleeding and ugly wrapping effects. 1599 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1601}
1540 1602
1541int 1603int
1542ox (CFPlus::Map self) 1604ox (DC::Map self)
1543 ALIAS: 1605 ALIAS:
1544 oy = 1 1606 oy = 1
1545 x = 2 1607 x = 2
1546 y = 3 1608 y = 3
1547 w = 4 1609 w = 4
1558 } 1620 }
1559 OUTPUT: 1621 OUTPUT:
1560 RETVAL 1622 RETVAL
1561 1623
1562void 1624void
1563scroll (CFPlus::Map self, int dx, int dy) 1625scroll (DC::Map self, int dx, int dy)
1564 CODE: 1626 CODE:
1565{ 1627{
1566 if (dx > 0) 1628 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1629 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1630 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1646 self->y += MAP_EXTEND_Y;
1585 } 1647 }
1586} 1648}
1587 1649
1588SV * 1650SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1651map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1652 CODE:
1591{ 1653{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1654 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1655 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1656 mapcell *cell;
1683} 1745}
1684 OUTPUT: 1746 OUTPUT:
1685 RETVAL 1747 RETVAL
1686 1748
1687SV * 1749SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1750mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1751 CODE:
1690{ 1752{
1691 int x1, x; 1753 int x1, x;
1692 int y1, y; 1754 int y1, y;
1693 int z; 1755 int z;
1738} 1800}
1739 OUTPUT: 1801 OUTPUT:
1740 RETVAL 1802 RETVAL
1741 1803
1742void 1804void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1805draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1744 CODE: 1806 CODE:
1745{ 1807{
1746 int x, y, z; 1808 int x, y, z;
1747 1809
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1811 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1812 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 1813 smooth_key skey;
1752 1814
1753 rc_t *rc = rc_alloc (); 1815 rc_t *rc = rc_alloc ();
1754 rc_key_t key; 1816 rc_key_t key;
1755 rc_array_t *arr; 1817 rc_array_t *arr;
1817 if (tile) 1879 if (tile)
1818 { 1880 {
1819 maptex tex = self->tex [tile]; 1881 maptex tex = self->tex [tile];
1820 int px, py; 1882 int px, py;
1821 1883
1822 // suppressing texture state switches here
1823 // is only moderately effective, but worth the extra effort
1824 if (key.texname != tex.name) 1884 if (key.texname != tex.name)
1825 { 1885 {
1826 if (!tex.name) 1886 if (!tex.name)
1827 tex = self->tex [2]; /* missing, replace by noface */ 1887 tex = self->tex [2]; /* missing, replace by noface */
1828 1888
1911 // go through all smoothlevels, lowest to highest, then draw. 1971 // go through all smoothlevels, lowest to highest, then draw.
1912 // this is basically counting sort 1972 // this is basically counting sort
1913 { 1973 {
1914 int w, b; 1974 int w, b;
1915 1975
1976 glEnable (GL_TEXTURE_2D);
1977 glBegin (GL_QUADS);
1916 for (w = 0; w < 256 / 32; ++w) 1978 for (w = 0; w < 256 / 32; ++w)
1917 { 1979 {
1918 uint32_t smask = smooth_level [w]; 1980 uint32_t smask = smooth_level [w];
1919 if (smask) 1981 if (smask)
1920 for (b = 0; b < 32; ++b) 1982 for (b = 0; b < 32; ++b)
1945 { 2007 {
1946 // this time avoiding texture state changes 2008 // this time avoiding texture state changes
1947 // save gobs of state changes. 2009 // save gobs of state changes.
1948 if (key.texname != tex.name) 2010 if (key.texname != tex.name)
1949 { 2011 {
2012 glEnd ();
1950 key.texname = tex.name; 2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1951 arr = rc_array (rc, &key); 2014 glBegin (GL_QUADS);
1952 } 2015 }
1953 2016
1954 if (border) 2017 if (border)
1955 { 2018 {
1956 float ox = border * dx; 2019 float ox = border * dx;
1957 2020
1958 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2021 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1959 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2022 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1960 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2023 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1961 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2024 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1962 } 2025 }
1963 2026
1964 if (corner) 2027 if (corner)
1965 { 2028 {
1966 float ox = corner * dx; 2029 float ox = corner * dx;
1967 2030
1968 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2031 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1969 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2032 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1970 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2033 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1971 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2034 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1972 } 2035 }
1973 } 2036 }
1974 } 2037 }
1975 } 2038 }
1976 } 2039 }
1977 } 2040 }
2041
2042 glEnd ();
2043 glDisable (GL_TEXTURE_2D);
2044 key.texname = -1;
1978 } 2045 }
1979 2046
1980 hv_clear (smooth); 2047 hv_clear (smooth);
1981 rc_draw (rc);
1982 rc_clear (rc);
1983 } 2048 }
1984 2049
1985 glDisable (GL_BLEND); 2050 glDisable (GL_BLEND);
1986 rc_free (rc); 2051 rc_free (rc);
1987 2052
2016 } 2081 }
2017 } 2082 }
2018} 2083}
2019 2084
2020void 2085void
2021draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2086draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2022 CODE: 2087 CODE:
2023{ 2088{
2024 static float color[16][3] = { 2089 static float color[16][3] = {
2025 { 0.00F, 0.00F, 0.00F }, 2090 { 0.00F, 0.00F, 0.00F },
2026 { 1.00F, 1.00F, 1.00F }, 2091 { 1.00F, 1.00F, 1.00F },
2076 glDisable (GL_BLEND); 2141 glDisable (GL_BLEND);
2077 glDisable (GL_TEXTURE_2D); 2142 glDisable (GL_TEXTURE_2D);
2078} 2143}
2079 2144
2080void 2145void
2081fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2146fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2082 PPCODE: 2147 PPCODE:
2083{ 2148{
2084 int x, y; 2149 int x, y;
2085 int sw1 = sw + 2; 2150 int sw1 = sw + 2;
2086 int sh1 = sh + 2; 2151 int sh1 = sh + 2;
2157 PUSHs (sv_2mortal (newSViv (sh3))); 2222 PUSHs (sv_2mortal (newSViv (sh3)));
2158 PUSHs (darkness3_sv); 2223 PUSHs (darkness3_sv);
2159} 2224}
2160 2225
2161SV * 2226SV *
2162get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2227get_rect (DC::Map self, int x0, int y0, int w, int h)
2163 CODE: 2228 CODE:
2164{ 2229{
2165 int x, y, x1, y1; 2230 int x, y, x1, y1;
2166 SV *data_sv = newSV (w * h * 7 + 5); 2231 SV *data_sv = newSV (w * h * 7 + 5);
2167 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2232 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2232} 2297}
2233 OUTPUT: 2298 OUTPUT:
2234 RETVAL 2299 RETVAL
2235 2300
2236void 2301void
2237set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2302set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2238 PPCODE: 2303 PPCODE:
2239{ 2304{
2240 int x, y, z; 2305 int x, y, z;
2241 int w, h; 2306 int w, h;
2242 int x1, y1; 2307 int x1, y1;
2243 2308
2244 if (*data++ != 0) 2309 if (*data++ != 0)
2245 return; /* version mismatch */ 2310 XSRETURN_EMPTY; /* version mismatch */
2246 2311
2247 w = *data++ << 8; w |= *data++; 2312 w = *data++ << 8; w |= *data++;
2248 h = *data++ << 8; h |= *data++; 2313 h = *data++ << 8; h |= *data++;
2249 2314
2250 // we need to do this 'cause we don't keep an absolute coord system for rows 2315 // we need to do this 'cause we don't keep an absolute coord system for rows
2295 } 2360 }
2296 } 2361 }
2297 } 2362 }
2298} 2363}
2299 2364
2300MODULE = CFPlus PACKAGE = CFPlus::RW 2365MODULE = Deliantra::Client PACKAGE = DC::RW
2301 2366
2302CFPlus::RW 2367DC::RW
2303new (SV *class, SV *data_sv) 2368new (SV *class, SV *data_sv)
2304 CODE: 2369 CODE:
2305{ 2370{
2306 STRLEN datalen; 2371 STRLEN datalen;
2307 char *data = SvPVbyte (data_sv, datalen); 2372 char *data = SvPVbyte (data_sv, datalen);
2309 RETVAL = SDL_RWFromConstMem (data, datalen); 2374 RETVAL = SDL_RWFromConstMem (data, datalen);
2310} 2375}
2311 OUTPUT: 2376 OUTPUT:
2312 RETVAL 2377 RETVAL
2313 2378
2314CFPlus::RW 2379DC::RW
2315new_from_file (SV *class, const char *path, const char *mode = "rb") 2380new_from_file (SV *class, const char *path, const char *mode = "rb")
2316 CODE: 2381 CODE:
2317 RETVAL = SDL_RWFromFile (path, mode); 2382 RETVAL = SDL_RWFromFile (path, mode);
2318 OUTPUT: 2383 OUTPUT:
2319 RETVAL 2384 RETVAL
2320 2385
2321# fails on win32: 2386# fails on win32:
2322# CFPlus.xs(2268) : error C2059: syntax error : '(' 2387# dc.xs(2268) : error C2059: syntax error : '('
2323#void 2388#void
2324#close (CFPlus::RW self) 2389#close (DC::RW self)
2325# CODE: 2390# CODE:
2326# (self->(close)) (self); 2391# (self->(close)) (self);
2327 2392
2328MODULE = CFPlus PACKAGE = CFPlus::Channel 2393MODULE = Deliantra::Client PACKAGE = DC::Channel
2329 2394
2330PROTOTYPES: DISABLE 2395PROTOTYPES: DISABLE
2331 2396
2332CFPlus::Channel 2397DC::Channel
2333find () 2398find ()
2334 CODE: 2399 CODE:
2335{ 2400{
2336 RETVAL = Mix_GroupAvailable (-1); 2401 RETVAL = Mix_GroupAvailable (-1);
2337 2402
2350} 2415}
2351 OUTPUT: 2416 OUTPUT:
2352 RETVAL 2417 RETVAL
2353 2418
2354void 2419void
2355halt (CFPlus::Channel self) 2420halt (DC::Channel self)
2356 CODE: 2421 CODE:
2357 Mix_HaltChannel (self); 2422 Mix_HaltChannel (self);
2358 2423
2359void 2424void
2360expire (CFPlus::Channel self, int ticks = -1) 2425expire (DC::Channel self, int ticks = -1)
2361 CODE: 2426 CODE:
2362 Mix_ExpireChannel (self, ticks); 2427 Mix_ExpireChannel (self, ticks);
2363 2428
2364void 2429void
2365fade_out (CFPlus::Channel self, int ticks = -1) 2430fade_out (DC::Channel self, int ticks = -1)
2366 CODE: 2431 CODE:
2367 Mix_FadeOutChannel (self, ticks); 2432 Mix_FadeOutChannel (self, ticks);
2368 2433
2369int 2434int
2370volume (CFPlus::Channel self, int volume) 2435volume (DC::Channel self, int volume)
2371 CODE: 2436 CODE:
2372 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2437 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373 OUTPUT: 2438 OUTPUT:
2374 RETVAL 2439 RETVAL
2375 2440
2376void 2441void
2377unregister_all_effects (CFPlus::Channel self) 2442unregister_all_effects (DC::Channel self)
2378 CODE: 2443 CODE:
2379 Mix_UnregisterAllEffects (self); 2444 Mix_UnregisterAllEffects (self);
2380 2445
2381void 2446void
2382set_panning (CFPlus::Channel self, int left, int right) 2447set_panning (DC::Channel self, int left, int right)
2383 CODE: 2448 CODE:
2384 left = CLAMP (left , 0, 255); 2449 left = CLAMP (left , 0, 255);
2385 right = CLAMP (right, 0, 255); 2450 right = CLAMP (right, 0, 255);
2386 Mix_SetPanning (self, left, right); 2451 Mix_SetPanning (self, left, right);
2387 2452
2388void 2453void
2389set_distance (CFPlus::Channel self, int distance) 2454set_distance (DC::Channel self, int distance)
2390 CODE: 2455 CODE:
2391 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2456 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392 2457
2393void 2458void
2394set_position (CFPlus::Channel self, int angle, int distance) 2459set_position (DC::Channel self, int angle, int distance)
2395 CODE: 2460 CODE:
2396 2461
2397void 2462void
2398set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399 CODE: 2464 CODE:
2400{ 2465{
2401 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2466 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2467 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2403 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404} 2469}
2405 2470
2406void 2471void
2407set_reverse_stereo (CFPlus::Channel self, int flip) 2472set_reverse_stereo (DC::Channel self, int flip)
2408 CODE: 2473 CODE:
2409 Mix_SetReverseStereo (self, flip); 2474 Mix_SetReverseStereo (self, flip);
2410 2475
2411MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2476MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412 2477
2413PROTOTYPES: DISABLE 2478PROTOTYPES: DISABLE
2414 2479
2415CFPlus::MixChunk 2480DC::MixChunk
2416new (SV *class, CFPlus::RW rwops) 2481new (SV *class, DC::RW rwops)
2417 CODE: 2482 CODE:
2418 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2483 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419 OUTPUT: 2484 OUTPUT:
2420 RETVAL 2485 RETVAL
2421 2486
2422void 2487void
2423DESTROY (CFPlus::MixChunk self) 2488DESTROY (DC::MixChunk self)
2424 CODE: 2489 CODE:
2425 Mix_FreeChunk (self); 2490 Mix_FreeChunk (self);
2426 2491
2427int 2492int
2428volume (CFPlus::MixChunk self, int volume = -1) 2493volume (DC::MixChunk self, int volume = -1)
2429 CODE: 2494 CODE:
2430 if (items > 1) 2495 if (items > 1)
2431 volume = CLAMP (volume, 0, 128); 2496 volume = CLAMP (volume, 0, 128);
2432 RETVAL = Mix_VolumeChunk (self, volume); 2497 RETVAL = Mix_VolumeChunk (self, volume);
2433 OUTPUT: 2498 OUTPUT:
2434 RETVAL 2499 RETVAL
2435 2500
2436CFPlus::Channel 2501DC::Channel
2437play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2502play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2438 CODE: 2503 CODE:
2439{ 2504{
2440 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441 2506
2442 if (RETVAL < 0) 2507 if (RETVAL < 0)
2449 } 2514 }
2450} 2515}
2451 OUTPUT: 2516 OUTPUT:
2452 RETVAL 2517 RETVAL
2453 2518
2454MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2519MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2455 2520
2456int 2521int
2457volume (int volume = -1) 2522volume (int volume = -1)
2458 PROTOTYPE: ;$ 2523 PROTOTYPE: ;$
2459 CODE: 2524 CODE:
2471void 2536void
2472halt () 2537halt ()
2473 CODE: 2538 CODE:
2474 Mix_HaltMusic (); 2539 Mix_HaltMusic ();
2475 2540
2476CFPlus::MixMusic 2541DC::MixMusic
2477new (SV *class, CFPlus::RW rwops) 2542new (SV *class, DC::RW rwops)
2478 CODE: 2543 CODE:
2479 RETVAL = Mix_LoadMUS_RW (rwops); 2544 RETVAL = Mix_LoadMUS_RW (rwops);
2480 OUTPUT: 2545 OUTPUT:
2481 RETVAL 2546 RETVAL
2482 2547
2483void 2548void
2484DESTROY (CFPlus::MixMusic self) 2549DESTROY (DC::MixMusic self)
2485 CODE: 2550 CODE:
2486 Mix_FreeMusic (self); 2551 Mix_FreeMusic (self);
2487 2552
2488int 2553int
2489play (CFPlus::MixMusic self, int loops = -1) 2554play (DC::MixMusic self, int loops = -1)
2490 CODE: 2555 CODE:
2491 RETVAL = Mix_PlayMusic (self, loops); 2556 RETVAL = Mix_PlayMusic (self, loops);
2492 OUTPUT: 2557 OUTPUT:
2493 RETVAL 2558 RETVAL
2494 2559
2495void 2560void
2496fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2561fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497 CODE: 2562 CODE:
2498 Mix_FadeInMusicPos (self, loops, ms, position); 2563 Mix_FadeInMusicPos (self, loops, ms, position);
2499 2564
2500MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2565MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501 2566
2502PROTOTYPES: ENABLE 2567PROTOTYPES: ENABLE
2503 2568
2504BOOT: 2569BOOT:
2505{ 2570{
2506 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2571 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507 static const struct { 2572 static const struct {
2508 const char *name; 2573 const char *name;
2509 IV iv; 2574 IV iv;
2510 } *civ, const_iv[] = { 2575 } *civ, const_iv[] = {
2511# define const_iv(name) { # name, (IV)name } 2576# define const_iv(name) { # name, (IV)name }
2546 const_iv (GL_INTENSITY), 2611 const_iv (GL_INTENSITY),
2547 const_iv (GL_LUMINANCE), 2612 const_iv (GL_LUMINANCE),
2548 const_iv (GL_LUMINANCE_ALPHA), 2613 const_iv (GL_LUMINANCE_ALPHA),
2549 const_iv (GL_FLOAT), 2614 const_iv (GL_FLOAT),
2550 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2615 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2616 const_iv (GL_COMPRESSED_ALPHA_ARB),
2617 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2618 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2619 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2620 const_iv (GL_COMPRESSED_RGB_ARB),
2621 const_iv (GL_COMPRESSED_RGBA_ARB),
2551 const_iv (GL_COMPILE), 2622 const_iv (GL_COMPILE),
2552 const_iv (GL_PROXY_TEXTURE_1D), 2623 const_iv (GL_PROXY_TEXTURE_1D),
2553 const_iv (GL_PROXY_TEXTURE_2D), 2624 const_iv (GL_PROXY_TEXTURE_2D),
2554 const_iv (GL_TEXTURE_1D), 2625 const_iv (GL_TEXTURE_1D),
2555 const_iv (GL_TEXTURE_2D), 2626 const_iv (GL_TEXTURE_2D),
2594 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2665 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595 const_iv (GL_POINT_SMOOTH_HINT), 2666 const_iv (GL_POINT_SMOOTH_HINT),
2596 const_iv (GL_LINE_SMOOTH_HINT), 2667 const_iv (GL_LINE_SMOOTH_HINT),
2597 const_iv (GL_POLYGON_SMOOTH_HINT), 2668 const_iv (GL_POLYGON_SMOOTH_HINT),
2598 const_iv (GL_GENERATE_MIPMAP_HINT), 2669 const_iv (GL_GENERATE_MIPMAP_HINT),
2670 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599 const_iv (GL_FASTEST), 2671 const_iv (GL_FASTEST),
2600 const_iv (GL_DONT_CARE), 2672 const_iv (GL_DONT_CARE),
2601 const_iv (GL_NICEST), 2673 const_iv (GL_NICEST),
2602 const_iv (GL_V2F), 2674 const_iv (GL_V2F),
2603 const_iv (GL_V3F), 2675 const_iv (GL_V3F),
2611 2683
2612 texture_av = newAV (); 2684 texture_av = newAV ();
2613 AvREAL_off (texture_av); 2685 AvREAL_off (texture_av);
2614} 2686}
2615 2687
2688void
2689disable_GL_EXT_blend_func_separate ()
2690 CODE:
2691 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0;
2693
2616char * 2694char *
2617gl_vendor () 2695gl_vendor ()
2618 CODE: 2696 CODE:
2619 RETVAL = (char *)glGetString (GL_VENDOR); 2697 RETVAL = (char *)glGetString (GL_VENDOR);
2620 OUTPUT: 2698 OUTPUT:
2741 2819
2742void glRect (float x1, float y1, float x2, float y2) 2820void glRect (float x1, float y1, float x2, float y2)
2743 CODE: 2821 CODE:
2744 glRectf (x1, y1, x2, y2); 2822 glRectf (x1, y1, x2, y2);
2745 2823
2824void glRect_lineloop (float x1, float y1, float x2, float y2)
2825 CODE:
2826 glBegin (GL_LINE_LOOP);
2827 glVertex2f (x1, y1);
2828 glVertex2f (x2, y1);
2829 glVertex2f (x2, y2);
2830 glVertex2f (x1, y2);
2831 glEnd ();
2832
2746PROTOTYPES: ENABLE 2833PROTOTYPES: ENABLE
2747 2834
2748void glBegin (int mode) 2835void glBegin (int mode)
2749 2836
2750void glEnd () 2837void glEnd ()
2782void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2869void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2783 CODE: 2870 CODE:
2784 if (gl.SeparableFilter2D) 2871 if (gl.SeparableFilter2D)
2785 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2872 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786 2873
2787void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2874void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2788 2875
2789void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2876void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2790 2877
2791void glDrawPixels (int width, int height, int format, int type, char *pixels) 2878void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792 2879
2818 2905
2819void glEndList () 2906void glEndList ()
2820 2907
2821void glCallList (int list) 2908void glCallList (int list)
2822 2909
2823MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2910MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2824 2911
2825PROTOTYPES: DISABLE 2912PROTOTYPES: DISABLE
2826 2913
2827void 2914void
2828find_widget (SV *self, NV x, NV y) 2915find_widget (SV *self, NV x, NV y)
2832 XPUSHs (self); 2919 XPUSHs (self);
2833} 2920}
2834 2921
2835BOOT: 2922BOOT:
2836{ 2923{
2837 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2924 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838 2925
2839 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2926 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2840 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2927 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2841 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2928 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2842 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2929 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2843} 2930}
2844 2931
2845void 2932void
2846draw (SV *self) 2933draw (SV *self)
2847 CODE: 2934 CODE:
2851 NV x, y, w, h; 2938 NV x, y, w, h;
2852 SV *draw_x_sv = GvSV (draw_x_gv); 2939 SV *draw_x_sv = GvSV (draw_x_gv);
2853 SV *draw_y_sv = GvSV (draw_y_gv); 2940 SV *draw_y_sv = GvSV (draw_y_gv);
2854 SV *draw_w_sv = GvSV (draw_w_gv); 2941 SV *draw_w_sv = GvSV (draw_w_gv);
2855 SV *draw_h_sv = GvSV (draw_h_gv); 2942 SV *draw_h_sv = GvSV (draw_h_gv);
2856 SV *hover;
2857 double draw_x, draw_y, draw_w, draw_h; 2943 double draw_x, draw_y;
2858 2944
2859 if (!SvROK (self)) 2945 if (!SvROK (self))
2860 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2946 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861 2947
2862 hv = (HV *)SvRV (self); 2948 hv = (HV *)SvRV (self);
2863 2949
2864 if (SvTYPE (hv) != SVt_PVHV) 2950 if (SvTYPE (hv) != SVt_PVHV)
2865 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2951 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866 2952
2867 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2953 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2868 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2954 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2869 2955
2870 if (!h || !w) 2956 if (!h || !w)
2890 { 2976 {
2891 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2977 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892 2978
2893 if (svp && SvTRUE (*svp)) 2979 if (svp && SvTRUE (*svp))
2894 { 2980 {
2895 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2981 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2896 glEnable (GL_BLEND); 2982 glEnable (GL_BLEND);
2897 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2983 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898 glBegin (GL_QUADS); 2984 glBegin (GL_QUADS);
2899 glVertex2f (0, 0); 2985 glVertex2f (0, 0);
2900 glVertex2f (w, 0); 2986 glVertex2f (w, 0);
2903 glEnd (); 2989 glEnd ();
2904 glDisable (GL_BLEND); 2990 glDisable (GL_BLEND);
2905 } 2991 }
2906 } 2992 }
2907#if 0 2993#if 0
2908 if ($ENV{CFPLUS_DEBUG} & 1) { 2994 // draw borders, for debugging
2909 glPushMatrix; 2995 glPushMatrix ();
2910 glColor 1, 1, 0, 1; 2996 glColor4f (1., 1., 0., 1.);
2911 glTranslate 0.375, 0.375; 2997 glTranslatef (.5, .5, 0.);
2912 glBegin GL_LINE_LOOP; 2998 glBegin (GL_LINE_LOOP);
2913 glVertex 0 , 0; 2999 glVertex2f (0 , 0);
2914 glVertex $self->{w} - 1, 0; 3000 glVertex2f (w - 1, 0);
2915 glVertex $self->{w} - 1, $self->{h} - 1; 3001 glVertex2f (w - 1, h - 1);
2916 glVertex 0 , $self->{h} - 1; 3002 glVertex2f (0 , h - 1);
2917 glEnd; 3003 glEnd ();
2918 glPopMatrix; 3004 glPopMatrix ();
2919 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920 }
2921#endif 3005#endif
2922 PUSHMARK (SP); 3006 PUSHMARK (SP);
2923 XPUSHs (self); 3007 XPUSHs (self);
2924 PUTBACK; 3008 PUTBACK;
2925 call_method ("_draw", G_VOID | G_DISCARD); 3009 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines