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.224 by root, Sat Aug 11 11:21:46 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;
169 rc_t *rc;
155} *CFPlus__Layout; 170} *DC__Layout;
156 171
157static CFPlus__Font default_font; 172static DC__Font default_font;
158static PangoContext *opengl_context; 173static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 174static PangoFontMap *opengl_fontmap;
160 175
161static void 176static void
162substitute_func (FcPattern *pattern, gpointer data) 177substitute_func (FcPattern *pattern, gpointer data)
167#endif 182#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 183 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 184}
170 185
171static void 186static void
172layout_update_font (CFPlus__Layout self) 187layout_update_font (DC__Layout self)
173{ 188{
174 /* 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
175 * reasonably well with bitstream vera 190 * reasonably well with bitstream vera
176 */ 191 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
181 196
182 pango_layout_set_font_description (self->pl, font); 197 pango_layout_set_font_description (self->pl, font);
183} 198}
184 199
185static void 200static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 201layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 202{
188 PangoRectangle rect; 203 PangoRectangle rect;
189 204
190 // get_pixel_* wrongly rounds down 205 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 206 pango_layout_get_extents (self->pl, 0, &rect);
202 217
203typedef uint16_t tileid; 218typedef uint16_t tileid;
204typedef uint16_t faceid; 219typedef uint16_t faceid;
205 220
206typedef struct { 221typedef struct {
207 int name; 222 GLuint name;
208 int w, h; 223 int w, h;
209 float s, t; 224 float s, t;
210 uint8_t r, g, b, a; 225 uint8_t r, g, b, a;
211 tileid smoothtile; 226 tileid smoothtile;
212 uint8_t smoothlevel; 227 uint8_t smoothlevel;
230 int faces; tileid *face2tile; // [faceid] 245 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 246 int texs; maptex *tex; // [tileid]
232 247
233 int32_t rows; 248 int32_t rows;
234 maprow *row; 249 maprow *row;
235} *CFPlus__Map; 250} *DC__Map;
236 251
237static char * 252static char *
238prepend (char *ptr, int sze, int inc) 253prepend (char *ptr, int sze, int inc)
239{ 254{
240 char *p; 255 char *p;
278 self->texs *= 2; 293 self->texs *= 2;
279 } 294 }
280} 295}
281 296
282static maprow * 297static maprow *
283map_get_row (CFPlus__Map self, int y) 298map_get_row (DC__Map self, int y)
284{ 299{
285 if (0 > y) 300 if (0 > y)
286 { 301 {
287 int extend = - y + MAP_EXTEND_Y; 302 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 303 Prepend (maprow, self->row, self->rows, extend);
326 341
327 return row->col + (x - row->c0); 342 return row->col + (x - row->c0);
328} 343}
329 344
330static mapcell * 345static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 346map_get_cell (DC__Map self, int x, int y)
332{ 347{
333 return row_get_cell (map_get_row (self, y), x); 348 return row_get_cell (map_get_row (self, y), x);
334} 349}
335 350
336static void 351static void
337map_clear (CFPlus__Map self) 352map_clear (DC__Map self)
338{ 353{
339 int r; 354 int r;
340 355
341 for (r = 0; r < self->rows; r++) 356 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 357 Safefree (self->row[r].col);
350 self->row = 0; 365 self->row = 0;
351 self->rows = 0; 366 self->rows = 0;
352} 367}
353 368
354static void 369static void
355map_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)
356{ 371{
357 int x, y; 372 int x, y;
358 maprow *row; 373 maprow *row;
359 mapcell *cell; 374 mapcell *cell;
360 375
439 n |= n >> 16; 454 n |= n >> 16;
440 455
441 return n + 1; 456 return n + 1;
442} 457}
443 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
444/* SDL should provide this, really. */ 470/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 471#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 472#define SDLK_MODIFIER_MAX 314
447 473
448/******************************************************************************/ 474/******************************************************************************/
486 return 0; 512 return 0;
487 513
488 return 1; 514 return 1;
489} 515}
490 516
491MODULE = CFPlus PACKAGE = CFPlus 517MODULE = Deliantra::Client PACKAGE = DC
492 518
493PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
494 520
495BOOT: 521BOOT:
496{ 522{
497 HV *stash = gv_stashpv ("CFPlus", 1); 523 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 524 static const struct {
499 const char *name; 525 const char *name;
500 IV iv; 526 IV iv;
501 } *civ, const_iv[] = { 527 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 528# define const_iv(name) { # name, (IV)name }
524 550
525 const_iv (SDL_APPINPUTFOCUS), 551 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 552 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 553 const_iv (SDL_APPACTIVE),
528 554
555 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 557 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 558 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 559 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 560 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 561 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 633 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 634 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 635 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 636 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 637 const_iv (KMOD_MODE),
638
639 const_iv (MIX_DEFAULT_FORMAT),
610# undef const_iv 640# undef const_iv
611 }; 641 };
612 642
613 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; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 662
633NV floor (NV x) 663NV floor (NV x)
634 664
635NV ceil (NV x) 665NV ceil (NV x)
636 666
667IV minpot (UV n)
668
669IV popcount (UV n)
670
637void 671void
638pango_init () 672pango_init ()
639 CODE: 673 CODE:
640{ 674{
641 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
642 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);
643 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
644} 682}
645 683
646char * 684char *
647SDL_GetError () 685SDL_GetError ()
648 686
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 719
682 if (m && m != (SDL_Rect **)-1) 720 if (m && m != (SDL_Rect **)-1)
683 while (*m) 721 while (*m)
684 { 722 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 723 if ((*m)->w >= 800 && (*m)->h >= 480)
686 { 724 {
687 AV *av = newAV (); 725 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 726 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 727 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 728 av_push (av, newSViv (rgb));
714 752
715 if (RETVAL) 753 if (RETVAL)
716 { 754 {
717 av_clear (texture_av); 755 av_clear (texture_av);
718 756
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#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);
721#include "glfunc.h" 759#include "glfunc.h"
722#undef GL_FUNC 760#undef GL_FUNC
723 } 761 }
724} 762}
731char * 769char *
732SDL_GetKeyName (int sym) 770SDL_GetKeyName (int sym)
733 771
734int 772int
735SDL_GetAppState () 773SDL_GetAppState ()
774
775int
776SDL_GetModState ()
736 777
737void 778void
738poll_events () 779poll_events ()
739 PPCODE: 780 PPCODE:
740{ 781{
750 { 791 {
751 case SDL_KEYDOWN: 792 case SDL_KEYDOWN:
752 case SDL_KEYUP: 793 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 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);
756 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 */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 799 break;
759 800
760 case SDL_ACTIVEEVENT: 801 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 820 x = ev.motion.x;
780 y = ev.motion.y; 821 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 823 }
783 824
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 826 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 827 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 828 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 829 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 830 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 831 }
791 break; 832 break;
792 833
793 case SDL_MOUSEBUTTONDOWN: 834 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 835 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 837
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 838 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 839 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 840 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 841 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 846 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 847 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 848 break;
808 } 849 }
809 850
810 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))));
811 } 852 }
812} 853}
813 854
814int 855int
815Mix_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)
816 POSTCALL: 857 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 858 Mix_HookMusicFinished (music_finished);
818 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}
819 876
820void 877void
821Mix_CloseAudio () 878Mix_CloseAudio ()
822 879
823int 880int
957void 1014void
958error (char *message) 1015error (char *message)
959 CODE: 1016 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1017 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1018#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1019 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1020#endif
964 1021
965void 1022void
966fatal (char *message) 1023fatal (char *message)
967 CODE: 1024 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1025 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1026#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1027 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1028#endif
972 _exit (1); 1029 _exit (1);
973 1030
974void 1031void
975_exit (int retval = 0) 1032_exit (int retval = 0)
987#if DEBUG 1044#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1045 VALGRIND_DO_LEAK_CHECK;
989#endif 1046#endif
990} 1047}
991 1048
992MODULE = CFPlus PACKAGE = CFPlus::Font 1049MODULE = Deliantra::Client PACKAGE = DC::Font
993 1050
994PROTOTYPES: DISABLE 1051PROTOTYPES: DISABLE
995 1052
996CFPlus::Font 1053DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1054new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1055 CODE:
999{ 1056{
1000 int count; 1057 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1058 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1061}
1005 OUTPUT: 1062 OUTPUT:
1006 RETVAL 1063 RETVAL
1007 1064
1008void 1065void
1009DESTROY (CFPlus::Font self) 1066DESTROY (DC::Font self)
1010 CODE: 1067 CODE:
1011 pango_font_description_free (self); 1068 pango_font_description_free (self);
1012 1069
1013void 1070void
1014make_default (CFPlus::Font self) 1071make_default (DC::Font self)
1015 PROTOTYPE: $ 1072 PROTOTYPE: $
1016 CODE: 1073 CODE:
1017 default_font = self; 1074 default_font = self;
1018 1075
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1076MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1077
1021PROTOTYPES: DISABLE 1078PROTOTYPES: DISABLE
1022 1079
1023void 1080void
1024reset_glyph_cache () 1081glyph_cache_backup ()
1025 PROTOTYPE: 1082 PROTOTYPE:
1026 CODE: 1083 CODE:
1084 tc_backup ();
1085
1086void
1087glyph_cache_restore ()
1088 PROTOTYPE:
1089 CODE:
1027 tc_clear (); 1090 tc_restore ();
1028 1091
1029CFPlus::Layout 1092DC::Layout
1030new (SV *class) 1093new (SV *class)
1031 CODE: 1094 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1095 New (0, RETVAL, 1, struct cf_layout);
1033 1096
1034 RETVAL->pl = pango_layout_new (opengl_context); 1097 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1099 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1100 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1101 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1102 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1103 RETVAL->font = 0;
1104 RETVAL->rc = rc_alloc ();
1041 1105
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1106 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1107 layout_update_font (RETVAL);
1044 OUTPUT: 1108 OUTPUT:
1045 RETVAL 1109 RETVAL
1046 1110
1047void 1111void
1048DESTROY (CFPlus::Layout self) 1112DESTROY (DC::Layout self)
1049 CODE: 1113 CODE:
1050 g_object_unref (self->pl); 1114 g_object_unref (self->pl);
1115 rc_free (self->rc);
1051 Safefree (self); 1116 Safefree (self);
1052 1117
1053void 1118void
1054set_text (CFPlus::Layout self, SV *text_) 1119set_text (DC::Layout self, SV *text_)
1055 CODE: 1120 CODE:
1056{ 1121{
1057 STRLEN textlen; 1122 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
1059 1124
1060 pango_layout_set_text (self->pl, text, textlen); 1125 pango_layout_set_text (self->pl, text, textlen);
1061} 1126}
1062 1127
1063void 1128void
1064set_markup (CFPlus::Layout self, SV *text_) 1129set_markup (DC::Layout self, SV *text_)
1065 CODE: 1130 CODE:
1066{ 1131{
1067 STRLEN textlen; 1132 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1133 char *text = SvPVutf8 (text_, textlen);
1069 1134
1070 pango_layout_set_markup (self->pl, text, textlen); 1135 pango_layout_set_markup (self->pl, text, textlen);
1071} 1136}
1072 1137
1073void 1138void
1074set_shapes (CFPlus::Layout self, ...) 1139set_shapes (DC::Layout self, ...)
1075 CODE: 1140 CODE:
1076{ 1141{
1077 PangoAttrList *attrs = 0; 1142 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1143 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1144 const char *pos = text;
1114 if (attrs) 1179 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1180 pango_layout_set_attributes (self->pl, attrs);
1116} 1181}
1117 1182
1118void 1183void
1119get_shapes (CFPlus::Layout self) 1184get_shapes (DC::Layout self)
1120 PPCODE: 1185 PPCODE:
1121{ 1186{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1187 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1188
1124 do 1189 do
1125 { 1190 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1191 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1192
1128 if (run && shape_attr_p (run)) 1193 if (run && shape_attr_p (run))
1129 { 1194 {
1130 PangoRectangle extents; 1195 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1196 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1204
1140 pango_layout_iter_free (iter); 1205 pango_layout_iter_free (iter);
1141} 1206}
1142 1207
1143int 1208int
1144has_wrapped (CFPlus::Layout self) 1209has_wrapped (DC::Layout self)
1145 CODE: 1210 CODE:
1146{ 1211{
1147 int lines = 1; 1212 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1213 const char *text = pango_layout_get_text (self->pl);
1149 1214
1154} 1219}
1155 OUTPUT: 1220 OUTPUT:
1156 RETVAL 1221 RETVAL
1157 1222
1158SV * 1223SV *
1159get_text (CFPlus::Layout self) 1224get_text (DC::Layout self)
1160 CODE: 1225 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1226 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1227 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1228 OUTPUT:
1164 RETVAL 1229 RETVAL
1165 1230
1166void 1231void
1167set_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.)
1168 CODE: 1233 CODE:
1169 self->r = r; 1234 self->r = r;
1170 self->g = g; 1235 self->g = g;
1171 self->b = b; 1236 self->b = b;
1172 self->a = a; 1237 self->a = a;
1173 1238
1174void 1239void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1240set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1241 CODE:
1177 if (self->font != font) 1242 if (self->font != font)
1178 { 1243 {
1179 self->font = font; 1244 self->font = font;
1180 layout_update_font (self); 1245 layout_update_font (self);
1181 } 1246 }
1182 1247
1183void 1248void
1184set_height (CFPlus::Layout self, int base_height) 1249set_height (DC::Layout self, int base_height)
1185 CODE: 1250 CODE:
1186 if (self->base_height != base_height) 1251 if (self->base_height != base_height)
1187 { 1252 {
1188 self->base_height = base_height; 1253 self->base_height = base_height;
1189 layout_update_font (self); 1254 layout_update_font (self);
1190 } 1255 }
1191 1256
1192void 1257void
1193set_width (CFPlus::Layout self, int max_width = -1) 1258set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1259 CODE:
1195 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);
1196 1261
1197void 1262void
1198set_indent (CFPlus::Layout self, int indent) 1263set_indent (DC::Layout self, int indent)
1199 CODE: 1264 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1265 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1266
1202void 1267void
1203set_spacing (CFPlus::Layout self, int spacing) 1268set_spacing (DC::Layout self, int spacing)
1204 CODE: 1269 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1270 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1271
1207void 1272void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1273set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1274 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1275 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1276 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1277 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1278 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1279 : PANGO_ELLIPSIZE_NONE
1215 ); 1280 );
1216 1281
1217void 1282void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1283set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1284 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1285 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1286
1222void 1287void
1223size (CFPlus::Layout self) 1288size (DC::Layout self)
1224 PPCODE: 1289 PPCODE:
1225{ 1290{
1226 int w, h; 1291 int w, h;
1227 1292
1228 layout_get_pixel_size (self, &w, &h); 1293 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1296 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1297 PUSHs (sv_2mortal (newSViv (h)));
1233} 1298}
1234 1299
1235int 1300int
1236descent (CFPlus::Layout self) 1301descent (DC::Layout self)
1237 CODE: 1302 CODE:
1238{ 1303{
1239 PangoRectangle rect; 1304 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1305 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1306 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1307 RETVAL = PANGO_DESCENT (rect);
1243} 1308}
1244 OUTPUT: 1309 OUTPUT:
1245 RETVAL 1310 RETVAL
1246 1311
1247int 1312int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1313xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1314 CODE:
1250{ 1315{
1251 int index, trailing; 1316 int index, trailing;
1252 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);
1253 RETVAL = index + trailing; 1318 RETVAL = index + trailing;
1254} 1319}
1255 OUTPUT: 1320 OUTPUT:
1256 RETVAL 1321 RETVAL
1257 1322
1258void 1323void
1259cursor_pos (CFPlus::Layout self, int index) 1324cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1325 PPCODE:
1261{ 1326{
1262 PangoRectangle strong_pos; 1327 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1328 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1329
1265 EXTEND (SP, 3); 1330 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1331 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1332 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1333 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1334}
1270 1335
1271void 1336void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1337index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1338 PPCODE:
1274{ 1339{
1275 int line, x; 1340 int line, x;
1276 1341
1277 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)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1344 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1345 --line;
1346#endif
1280 EXTEND (SP, 2); 1347 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1348 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1349 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1350}
1284 1351
1285void 1352void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1353line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1354 PPCODE:
1288{ 1355{
1289 PangoLayoutLine *lp; 1356 PangoLayoutLine *lp;
1290 int index, trailing; 1357 int index, trailing;
1291 1358
1292 if (line < 0) 1359 if (line < 0)
1293 XSRETURN_EMPTY; 1360 XSRETURN_EMPTY;
1294 1361
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1362 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1363 XSRETURN_EMPTY; /* do better */
1297 1364
1298 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);
1299 1366
1300 EXTEND (SP, 2); 1367 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1373 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1374 }
1308} 1375}
1309 1376
1310void 1377void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1378render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1379 CODE:
1380 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1381 pango_opengl_render_layout_subpixel (
1314 self->pl, 1382 self->pl,
1383 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1384 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1385 self->r, self->g, self->b, self->a,
1317 flags 1386 flags
1318 ); 1387 );
1388 // we assume that context_change actually clears/frees stuff
1389 // and does not do any recomputation...
1390 pango_layout_context_changed (self->pl);
1319 1391
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1392void
1393draw (DC::Layout self)
1394 CODE:
1395{
1396 glEnable (GL_TEXTURE_2D);
1397 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1398 glEnable (GL_BLEND);
1399 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1400 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1401 glEnable (GL_ALPHA_TEST);
1402 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1403
1404 rc_draw (self->rc);
1405
1406 glDisable (GL_ALPHA_TEST);
1407 glDisable (GL_BLEND);
1408 glDisable (GL_TEXTURE_2D);
1409}
1410
1411MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1412
1322PROTOTYPES: ENABLE 1413PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1414
1326void 1415void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1416pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1417 CODE:
1329{ 1418{
1406 RETVAL = width > 0; 1495 RETVAL = width > 0;
1407} 1496}
1408 OUTPUT: 1497 OUTPUT:
1409 RETVAL 1498 RETVAL
1410 1499
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1500MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1501
1413PROTOTYPES: DISABLE 1502PROTOTYPES: DISABLE
1414 1503
1415CFPlus::Map 1504DC::Map
1416new (SV *class) 1505new (SV *class)
1417 CODE: 1506 CODE:
1418 New (0, RETVAL, 1, struct map); 1507 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1508 RETVAL->x = 0;
1420 RETVAL->y = 0; 1509 RETVAL->y = 0;
1428 RETVAL->row = 0; 1517 RETVAL->row = 0;
1429 OUTPUT: 1518 OUTPUT:
1430 RETVAL 1519 RETVAL
1431 1520
1432void 1521void
1433DESTROY (CFPlus::Map self) 1522DESTROY (DC::Map self)
1434 CODE: 1523 CODE:
1435{ 1524{
1436 map_clear (self); 1525 map_clear (self);
1437 Safefree (self->face2tile); 1526 Safefree (self->face2tile);
1438 Safefree (self->tex); 1527 Safefree (self->tex);
1439 Safefree (self); 1528 Safefree (self);
1440} 1529}
1441 1530
1442void 1531void
1443resize (CFPlus::Map self, int map_width, int map_height) 1532resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1533 CODE:
1445 self->w = map_width; 1534 self->w = map_width;
1446 self->h = map_height; 1535 self->h = map_height;
1447 1536
1448void 1537void
1449clear (CFPlus::Map self) 1538clear (DC::Map self)
1450 CODE: 1539 CODE:
1451 map_clear (self); 1540 map_clear (self);
1452 1541
1453void 1542void
1454set_tileid (CFPlus::Map self, int face, int tile) 1543set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1544 CODE:
1456{ 1545{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1546 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1547 need_texid (self, tile);
1459} 1548}
1460 1549
1461void 1550void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1551set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1552 CODE:
1464{ 1553{
1465 tileid texid; 1554 tileid texid;
1466 maptex *tex; 1555 maptex *tex;
1467 1556
1480 tex->smoothtile = self->face2tile [smooth]; 1569 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1570 tex->smoothlevel = level;
1482} 1571}
1483 1572
1484void 1573void
1485set_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)
1486 CODE: 1575 CODE:
1487{ 1576{
1488 need_texid (self, texid); 1577 need_texid (self, texid);
1489 1578
1490 { 1579 {
1510 // from transparent color bleeding and ugly wrapping effects. 1599 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1601}
1513 1602
1514int 1603int
1515ox (CFPlus::Map self) 1604ox (DC::Map self)
1516 ALIAS: 1605 ALIAS:
1517 oy = 1 1606 oy = 1
1518 x = 2 1607 x = 2
1519 y = 3 1608 y = 3
1520 w = 4 1609 w = 4
1531 } 1620 }
1532 OUTPUT: 1621 OUTPUT:
1533 RETVAL 1622 RETVAL
1534 1623
1535void 1624void
1536scroll (CFPlus::Map self, int dx, int dy) 1625scroll (DC::Map self, int dx, int dy)
1537 CODE: 1626 CODE:
1538{ 1627{
1539 if (dx > 0) 1628 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1629 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1630 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1646 self->y += MAP_EXTEND_Y;
1558 } 1647 }
1559} 1648}
1560 1649
1561SV * 1650SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1651map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1652 CODE:
1564{ 1653{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1654 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1655 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1656 mapcell *cell;
1656} 1745}
1657 OUTPUT: 1746 OUTPUT:
1658 RETVAL 1747 RETVAL
1659 1748
1660SV * 1749SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1750mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1751 CODE:
1663{ 1752{
1664 int x1, x; 1753 int x1, x;
1665 int y1, y; 1754 int y1, y;
1666 int z; 1755 int z;
1711} 1800}
1712 OUTPUT: 1801 OUTPUT:
1713 RETVAL 1802 RETVAL
1714 1803
1715void 1804void
1716draw (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)
1717 CODE: 1806 CODE:
1718{ 1807{
1719 int x, y, z; 1808 int x, y, z;
1720 1809
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 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
1723 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)
1724 smooth_key skey; 1813 smooth_key skey;
1725 1814
1726 rc_t *rc = rc_alloc (); 1815 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1816 rc_key_t key;
1728 rc_array_t *arr; 1817 rc_array_t *arr;
1790 if (tile) 1879 if (tile)
1791 { 1880 {
1792 maptex tex = self->tex [tile]; 1881 maptex tex = self->tex [tile];
1793 int px, py; 1882 int px, py;
1794 1883
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1884 if (key.texname != tex.name)
1798 { 1885 {
1799 if (!tex.name) 1886 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1887 tex = self->tex [2]; /* missing, replace by noface */
1801 1888
1884 // go through all smoothlevels, lowest to highest, then draw. 1971 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 1972 // this is basically counting sort
1886 { 1973 {
1887 int w, b; 1974 int w, b;
1888 1975
1976 glEnable (GL_TEXTURE_2D);
1977 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 1978 for (w = 0; w < 256 / 32; ++w)
1890 { 1979 {
1891 uint32_t smask = smooth_level [w]; 1980 uint32_t smask = smooth_level [w];
1892 if (smask) 1981 if (smask)
1893 for (b = 0; b < 32; ++b) 1982 for (b = 0; b < 32; ++b)
1918 { 2007 {
1919 // this time avoiding texture state changes 2008 // this time avoiding texture state changes
1920 // save gobs of state changes. 2009 // save gobs of state changes.
1921 if (key.texname != tex.name) 2010 if (key.texname != tex.name)
1922 { 2011 {
2012 glEnd ();
1923 key.texname = tex.name; 2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2014 glBegin (GL_QUADS);
1925 } 2015 }
1926 2016
1927 if (border) 2017 if (border)
1928 { 2018 {
1929 float ox = border * dx; 2019 float ox = border * dx;
1930 2020
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2021 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2022 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2023 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2024 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2025 }
1936 2026
1937 if (corner) 2027 if (corner)
1938 { 2028 {
1939 float ox = corner * dx; 2029 float ox = corner * dx;
1940 2030
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2031 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2032 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 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);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2034 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2035 }
1946 } 2036 }
1947 } 2037 }
1948 } 2038 }
1949 } 2039 }
1950 } 2040 }
2041
2042 glEnd ();
2043 glDisable (GL_TEXTURE_2D);
2044 key.texname = -1;
1951 } 2045 }
1952 2046
1953 hv_clear (smooth); 2047 hv_clear (smooth);
1954 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2048 }
1957 2049
1958 glDisable (GL_BLEND); 2050 glDisable (GL_BLEND);
1959 rc_free (rc); 2051 rc_free (rc);
1960 2052
1989 } 2081 }
1990 } 2082 }
1991} 2083}
1992 2084
1993void 2085void
1994draw_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)
1995 CODE: 2087 CODE:
1996{ 2088{
1997 static float color[16][3] = { 2089 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2090 { 0.00F, 0.00F, 0.00F },
1999 { 1.00F, 1.00F, 1.00F }, 2091 { 1.00F, 1.00F, 1.00F },
2049 glDisable (GL_BLEND); 2141 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2142 glDisable (GL_TEXTURE_2D);
2051} 2143}
2052 2144
2053void 2145void
2054fow_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)
2055 PPCODE: 2147 PPCODE:
2056{ 2148{
2057 int x, y; 2149 int x, y;
2058 int sw1 = sw + 2; 2150 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2151 int sh1 = sh + 2;
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2222 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2223 PUSHs (darkness3_sv);
2132} 2224}
2133 2225
2134SV * 2226SV *
2135get_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)
2136 CODE: 2228 CODE:
2137{ 2229{
2138 int x, y, x1, y1; 2230 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2231 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2232 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2205} 2297}
2206 OUTPUT: 2298 OUTPUT:
2207 RETVAL 2299 RETVAL
2208 2300
2209void 2301void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2302set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2211 PPCODE: 2303 PPCODE:
2212{ 2304{
2213 int x, y, z; 2305 int x, y, z;
2214 int w, h; 2306 int w, h;
2215 int x1, y1; 2307 int x1, y1;
2216 2308
2217 if (*data++ != 0) 2309 if (*data++ != 0)
2218 return; /* version mismatch */ 2310 XSRETURN_EMPTY; /* version mismatch */
2219 2311
2220 w = *data++ << 8; w |= *data++; 2312 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2313 h = *data++ << 8; h |= *data++;
2222 2314
2223 // 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
2268 } 2360 }
2269 } 2361 }
2270 } 2362 }
2271} 2363}
2272 2364
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2365MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2366
2275CFPlus::RW 2367DC::RW
2276new (SV *class, SV *data_sv) 2368new (SV *class, SV *data_sv)
2277 CODE: 2369 CODE:
2278{ 2370{
2279 STRLEN datalen; 2371 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2372 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2374 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2375}
2284 OUTPUT: 2376 OUTPUT:
2285 RETVAL 2377 RETVAL
2286 2378
2287CFPlus::RW 2379DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2380new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2381 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2382 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2383 OUTPUT:
2292 RETVAL 2384 RETVAL
2293 2385
2294# fails on win32: 2386# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2387# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2388#void
2297#close (CFPlus::RW self) 2389#close (DC::RW self)
2298# CODE: 2390# CODE:
2299# (self->(close)) (self); 2391# (self->(close)) (self);
2300 2392
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2393MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2394
2303PROTOTYPES: DISABLE 2395PROTOTYPES: DISABLE
2304 2396
2305CFPlus::Channel 2397DC::Channel
2306find () 2398find ()
2307 CODE: 2399 CODE:
2308{ 2400{
2309 RETVAL = Mix_GroupAvailable (-1); 2401 RETVAL = Mix_GroupAvailable (-1);
2310 2402
2323} 2415}
2324 OUTPUT: 2416 OUTPUT:
2325 RETVAL 2417 RETVAL
2326 2418
2327void 2419void
2328halt (CFPlus::Channel self) 2420halt (DC::Channel self)
2329 CODE: 2421 CODE:
2330 Mix_HaltChannel (self); 2422 Mix_HaltChannel (self);
2331 2423
2332void 2424void
2333expire (CFPlus::Channel self, int ticks = -1) 2425expire (DC::Channel self, int ticks = -1)
2334 CODE: 2426 CODE:
2335 Mix_ExpireChannel (self, ticks); 2427 Mix_ExpireChannel (self, ticks);
2336 2428
2337void 2429void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2430fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2431 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2432 Mix_FadeOutChannel (self, ticks);
2341 2433
2342int 2434int
2343volume (CFPlus::Channel self, int volume) 2435volume (DC::Channel self, int volume)
2344 CODE: 2436 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2437 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2438 OUTPUT:
2347 RETVAL 2439 RETVAL
2348 2440
2349void 2441void
2350unregister_all_effects (CFPlus::Channel self) 2442unregister_all_effects (DC::Channel self)
2351 CODE: 2443 CODE:
2352 Mix_UnregisterAllEffects (self); 2444 Mix_UnregisterAllEffects (self);
2353 2445
2354void 2446void
2355set_panning (CFPlus::Channel self, int left, int right) 2447set_panning (DC::Channel self, int left, int right)
2356 CODE: 2448 CODE:
2357 left = CLAMP (left , 0, 255); 2449 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2450 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2451 Mix_SetPanning (self, left, right);
2360 2452
2361void 2453void
2362set_distance (CFPlus::Channel self, int distance) 2454set_distance (DC::Channel self, int distance)
2363 CODE: 2455 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2456 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2457
2366void 2458void
2367set_position (CFPlus::Channel self, int angle, int distance) 2459set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2460 CODE:
2369 2461
2370void 2462void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2464 CODE:
2373{ 2465{
2374 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));
2375 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);
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2469}
2378 2470
2379void 2471void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2472set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2473 CODE:
2382 Mix_SetReverseStereo (self, flip); 2474 Mix_SetReverseStereo (self, flip);
2383 2475
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2476MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2477
2386PROTOTYPES: DISABLE 2478PROTOTYPES: DISABLE
2387 2479
2388CFPlus::MixChunk 2480DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2481new (SV *class, DC::RW rwops)
2390 CODE: 2482 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2483 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2484 OUTPUT:
2393 RETVAL 2485 RETVAL
2394 2486
2395void 2487void
2396DESTROY (CFPlus::MixChunk self) 2488DESTROY (DC::MixChunk self)
2397 CODE: 2489 CODE:
2398 Mix_FreeChunk (self); 2490 Mix_FreeChunk (self);
2399 2491
2400int 2492int
2401volume (CFPlus::MixChunk self, int volume = -1) 2493volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2494 CODE:
2403 if (items > 1) 2495 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2496 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2497 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2498 OUTPUT:
2407 RETVAL 2499 RETVAL
2408 2500
2409CFPlus::Channel 2501DC::Channel
2410play (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)
2411 CODE: 2503 CODE:
2412{ 2504{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2506
2415 if (RETVAL < 0) 2507 if (RETVAL < 0)
2422 } 2514 }
2423} 2515}
2424 OUTPUT: 2516 OUTPUT:
2425 RETVAL 2517 RETVAL
2426 2518
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2519MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2520
2429int 2521int
2430volume (int volume = -1) 2522volume (int volume = -1)
2431 PROTOTYPE: ;$ 2523 PROTOTYPE: ;$
2432 CODE: 2524 CODE:
2444void 2536void
2445halt () 2537halt ()
2446 CODE: 2538 CODE:
2447 Mix_HaltMusic (); 2539 Mix_HaltMusic ();
2448 2540
2449CFPlus::MixMusic 2541DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2542new (SV *class, DC::RW rwops)
2451 CODE: 2543 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2544 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2545 OUTPUT:
2454 RETVAL 2546 RETVAL
2455 2547
2456void 2548void
2457DESTROY (CFPlus::MixMusic self) 2549DESTROY (DC::MixMusic self)
2458 CODE: 2550 CODE:
2459 Mix_FreeMusic (self); 2551 Mix_FreeMusic (self);
2460 2552
2461int 2553int
2462play (CFPlus::MixMusic self, int loops = -1) 2554play (DC::MixMusic self, int loops = -1)
2463 CODE: 2555 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2556 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2557 OUTPUT:
2466 RETVAL 2558 RETVAL
2467 2559
2468void 2560void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2561fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2562 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2563 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2564
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2565MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2566
2475PROTOTYPES: ENABLE 2567PROTOTYPES: ENABLE
2476 2568
2477BOOT: 2569BOOT:
2478{ 2570{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2571 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2572 static const struct {
2481 const char *name; 2573 const char *name;
2482 IV iv; 2574 IV iv;
2483 } *civ, const_iv[] = { 2575 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2576# define const_iv(name) { # name, (IV)name }
2519 const_iv (GL_INTENSITY), 2611 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2612 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2613 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2614 const_iv (GL_FLOAT),
2523 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),
2524 const_iv (GL_COMPILE), 2622 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 2623 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 2624 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 2625 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 2626 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2665 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 2666 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 2667 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 2668 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 2669 const_iv (GL_GENERATE_MIPMAP_HINT),
2670 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 2671 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 2672 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 2673 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 2674 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 2675 const_iv (GL_V3F),
2584 2683
2585 texture_av = newAV (); 2684 texture_av = newAV ();
2586 AvREAL_off (texture_av); 2685 AvREAL_off (texture_av);
2587} 2686}
2588 2687
2688void
2689disable_GL_EXT_blend_func_separate ()
2690 CODE:
2691 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0;
2693
2589char * 2694char *
2590gl_vendor () 2695gl_vendor ()
2591 CODE: 2696 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 2697 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 2698 OUTPUT:
2714 2819
2715void glRect (float x1, float y1, float x2, float y2) 2820void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 2821 CODE:
2717 glRectf (x1, y1, x2, y2); 2822 glRectf (x1, y1, x2, y2);
2718 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
2719PROTOTYPES: ENABLE 2833PROTOTYPES: ENABLE
2720 2834
2721void glBegin (int mode) 2835void glBegin (int mode)
2722 2836
2723void glEnd () 2837void glEnd ()
2755void 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)
2756 CODE: 2870 CODE:
2757 if (gl.SeparableFilter2D) 2871 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2872 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 2873
2760void 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)
2761 2875
2762void 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)
2763 2877
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 2878void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 2879
2791 2905
2792void glEndList () 2906void glEndList ()
2793 2907
2794void glCallList (int list) 2908void glCallList (int list)
2795 2909
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2910MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 2911
2798PROTOTYPES: DISABLE 2912PROTOTYPES: DISABLE
2799 2913
2800void 2914void
2801find_widget (SV *self, NV x, NV y) 2915find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 2919 XPUSHs (self);
2806} 2920}
2807 2921
2808BOOT: 2922BOOT:
2809{ 2923{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2924 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 2925
2812 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);
2813 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);
2814 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);
2815 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);
2816} 2930}
2817 2931
2818void 2932void
2819draw (SV *self) 2933draw (SV *self)
2820 CODE: 2934 CODE:
2824 NV x, y, w, h; 2938 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 2939 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 2940 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 2941 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 2942 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 2943 double draw_x, draw_y;
2831 2944
2832 if (!SvROK (self)) 2945 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2946 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 2947
2835 hv = (HV *)SvRV (self); 2948 hv = (HV *)SvRV (self);
2836 2949
2837 if (SvTYPE (hv) != SVt_PVHV) 2950 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2951 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 2952
2840 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.;
2841 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.;
2842 2955
2843 if (!h || !w) 2956 if (!h || !w)
2863 { 2976 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2977 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 2978
2866 if (svp && SvTRUE (*svp)) 2979 if (svp && SvTRUE (*svp))
2867 { 2980 {
2868 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);
2869 glEnable (GL_BLEND); 2982 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2983 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 2984 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 2985 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 2986 glVertex2f (w, 0);
2876 glEnd (); 2989 glEnd ();
2877 glDisable (GL_BLEND); 2990 glDisable (GL_BLEND);
2878 } 2991 }
2879 } 2992 }
2880#if 0 2993#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 2994 // draw borders, for debugging
2882 glPushMatrix; 2995 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 2996 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 2997 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 2998 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 2999 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3000 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3001 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3002 glVertex2f (0 , h - 1);
2890 glEnd; 3003 glEnd ();
2891 glPopMatrix; 3004 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3005#endif
2895 PUSHMARK (SP); 3006 PUSHMARK (SP);
2896 XPUSHs (self); 3007 XPUSHs (self);
2897 PUTBACK; 3008 PUTBACK;
2898 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