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.253 by root, Fri Dec 28 20:59:14 2007 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#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
56#endif
57
51#ifndef _WIN32 58#ifndef _WIN32
52# include <sys/types.h> 59# include <sys/types.h>
53# include <sys/socket.h> 60# include <sys/socket.h>
54# include <netinet/in.h> 61# include <netinet/in.h>
55# include <netinet/tcp.h> 62# include <netinet/tcp.h>
63#define MAP_EXTEND_X 32 70#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 71#define MAP_EXTEND_Y 512
65 72
66#define MIN_FONT_HEIGHT 10 73#define MIN_FONT_HEIGHT 10
67 74
75/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77
68#if 0 78#if 0
69# define PARACHUTE SDL_INIT_NOPARACHUTE 79# define PARACHUTE SDL_INIT_NOPARACHUTE
70#else 80#else
71# define PARACHUTE 0 81# define PARACHUTE 0
72#endif 82#endif
120 130
121#include "pango-font.c" 131#include "pango-font.c"
122#include "pango-fontmap.c" 132#include "pango-fontmap.c"
123#include "pango-render.c" 133#include "pango-render.c"
124 134
125typedef IV CFPlus__Channel; 135typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 136typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 137typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 138typedef Mix_Music *DC__MixMusic;
129 139
130typedef PangoFontDescription *CFPlus__Font; 140typedef PangoFontDescription *DC__Font;
131 141
132static int 142static int
133shape_attr_p (PangoLayoutRun *run) 143shape_attr_p (PangoLayoutRun *run)
134{ 144{
135 GSList *attrs = run->item->analysis.extra_attrs; 145 GSList *attrs = run->item->analysis.extra_attrs;
149 159
150typedef struct cf_layout { 160typedef struct cf_layout {
151 PangoLayout *pl; 161 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 162 float r, g, b, a; // default color for rgba mode
153 int base_height; 163 int base_height;
154 CFPlus__Font font; 164 DC__Font font;
165 rc_t *rc;
155} *CFPlus__Layout; 166} *DC__Layout;
156 167
157static CFPlus__Font default_font; 168static DC__Font default_font;
158static PangoContext *opengl_context; 169static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 170static PangoFontMap *opengl_fontmap;
160 171
161static void 172static void
162substitute_func (FcPattern *pattern, gpointer data) 173substitute_func (FcPattern *pattern, gpointer data)
167#endif 178#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 179 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 180}
170 181
171static void 182static void
172layout_update_font (CFPlus__Layout self) 183layout_update_font (DC__Layout self)
173{ 184{
174 /* use a random scale factor to account for unknown descenders, 0.8 works 185 /* use a random scale factor to account for unknown descenders, 0.8 works
175 * reasonably well with bitstream vera 186 * reasonably well with bitstream vera
176 */ 187 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 188 PangoFontDescription *font = self->font ? self->font : default_font;
181 192
182 pango_layout_set_font_description (self->pl, font); 193 pango_layout_set_font_description (self->pl, font);
183} 194}
184 195
185static void 196static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 197layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 198{
188 PangoRectangle rect; 199 PangoRectangle rect;
189 200
190 // get_pixel_* wrongly rounds down 201 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 202 pango_layout_get_extents (self->pl, 0, &rect);
202 213
203typedef uint16_t tileid; 214typedef uint16_t tileid;
204typedef uint16_t faceid; 215typedef uint16_t faceid;
205 216
206typedef struct { 217typedef struct {
207 int name; 218 GLuint name;
208 int w, h; 219 int w, h;
209 float s, t; 220 float s, t;
210 uint8_t r, g, b, a; 221 uint8_t r, g, b, a;
211 tileid smoothtile; 222 tileid smoothtile;
212 uint8_t smoothlevel; 223 uint8_t smoothlevel;
230 int faces; tileid *face2tile; // [faceid] 241 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 242 int texs; maptex *tex; // [tileid]
232 243
233 int32_t rows; 244 int32_t rows;
234 maprow *row; 245 maprow *row;
235} *CFPlus__Map; 246} *DC__Map;
236 247
237static char * 248static char *
238prepend (char *ptr, int sze, int inc) 249prepend (char *ptr, int sze, int inc)
239{ 250{
240 char *p; 251 char *p;
278 self->texs *= 2; 289 self->texs *= 2;
279 } 290 }
280} 291}
281 292
282static maprow * 293static maprow *
283map_get_row (CFPlus__Map self, int y) 294map_get_row (DC__Map self, int y)
284{ 295{
285 if (0 > y) 296 if (0 > y)
286 { 297 {
287 int extend = - y + MAP_EXTEND_Y; 298 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 299 Prepend (maprow, self->row, self->rows, extend);
326 337
327 return row->col + (x - row->c0); 338 return row->col + (x - row->c0);
328} 339}
329 340
330static mapcell * 341static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 342map_get_cell (DC__Map self, int x, int y)
332{ 343{
333 return row_get_cell (map_get_row (self, y), x); 344 return row_get_cell (map_get_row (self, y), x);
334} 345}
335 346
336static void 347static void
337map_clear (CFPlus__Map self) 348map_clear (DC__Map self)
338{ 349{
339 int r; 350 int r;
340 351
341 for (r = 0; r < self->rows; r++) 352 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 353 Safefree (self->row[r].col);
350 self->row = 0; 361 self->row = 0;
351 self->rows = 0; 362 self->rows = 0;
352} 363}
353 364
354static void 365static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 366map_blank (DC__Map self, int x0, int y0, int w, int h)
356{ 367{
357 int x, y; 368 int x, y;
358 maprow *row; 369 maprow *row;
359 mapcell *cell; 370 mapcell *cell;
360 371
439 n |= n >> 16; 450 n |= n >> 16;
440 451
441 return n + 1; 452 return n + 1;
442} 453}
443 454
455static unsigned int
456popcount (unsigned int n)
457{
458 n -= (n >> 1) & 0x55555555U;
459 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
460 n = ((n >> 4) + n) & 0x0f0f0f0fU;
461 n *= 0x01010101U;
462
463 return n >> 24;
464}
465
444/* SDL should provide this, really. */ 466/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 467#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 468#define SDLK_MODIFIER_MAX 314
447 469
448/******************************************************************************/ 470/******************************************************************************/
486 return 0; 508 return 0;
487 509
488 return 1; 510 return 1;
489} 511}
490 512
491MODULE = CFPlus PACKAGE = CFPlus 513MODULE = Deliantra::Client PACKAGE = DC
492 514
493PROTOTYPES: ENABLE 515PROTOTYPES: ENABLE
494 516
495BOOT: 517BOOT:
496{ 518{
497 HV *stash = gv_stashpv ("CFPlus", 1); 519 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 520 static const struct {
499 const char *name; 521 const char *name;
500 IV iv; 522 IV iv;
501 } *civ, const_iv[] = { 523 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 524# define const_iv(name) { # name, (IV)name }
524 546
525 const_iv (SDL_APPINPUTFOCUS), 547 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 548 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 549 const_iv (SDL_APPACTIVE),
528 550
551 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 553 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 554 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 555 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 556 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 557 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 629 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 630 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 631 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 632 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 633 const_iv (KMOD_MODE),
634
635 const_iv (MIX_DEFAULT_FORMAT),
610# undef const_iv 636# undef const_iv
611 }; 637 };
612 638
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 658
633NV floor (NV x) 659NV floor (NV x)
634 660
635NV ceil (NV x) 661NV ceil (NV x)
636 662
663IV minpot (UV n)
664
665IV popcount (UV n)
666
637void 667void
638pango_init () 668pango_init ()
639 CODE: 669 CODE:
640{ 670{
641 opengl_fontmap = pango_opengl_font_map_new (); 671 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 672 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); 673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif
644} 678}
645 679
646char * 680char *
647SDL_GetError () 681SDL_GetError ()
648 682
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 715
682 if (m && m != (SDL_Rect **)-1) 716 if (m && m != (SDL_Rect **)-1)
683 while (*m) 717 while (*m)
684 { 718 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 719 if ((*m)->w >= 800 && (*m)->h >= 480)
686 { 720 {
687 AV *av = newAV (); 721 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 722 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 723 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 724 av_push (av, newSViv (rgb));
714 748
715 if (RETVAL) 749 if (RETVAL)
716 { 750 {
717 av_clear (texture_av); 751 av_clear (texture_av);
718 752
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 753 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 754#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 755#include "glfunc.h"
722#undef GL_FUNC 756#undef GL_FUNC
723 } 757 }
724} 758}
750 { 784 {
751 case SDL_KEYDOWN: 785 case SDL_KEYDOWN:
752 case SDL_KEYUP: 786 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 789 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 */ 790 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); 791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 792 break;
759 793
760 case SDL_ACTIVEEVENT: 794 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 813 x = ev.motion.x;
780 y = ev.motion.y; 814 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 816 }
783 817
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 819 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 820 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 821 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 822 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 823 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 824 }
791 break; 825 break;
792 826
793 case SDL_MOUSEBUTTONDOWN: 827 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 828 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 829 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 830
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 831 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 833 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 834 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 839 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 840 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 841 break;
808 } 842 }
809 843
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 844 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 845 }
812} 846}
813 847
814int 848int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 849Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 850 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 851 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 852 Mix_ChannelFinished (channel_finished);
853
854void
855Mix_QuerySpec ()
856 PPCODE:
857{
858 int freq, channels;
859 Uint16 format;
860
861 if (Mix_QuerySpec (&freq, &format, &channels))
862 {
863 EXTEND (SP, 3);
864 PUSHs (sv_2mortal (newSViv (freq)));
865 PUSHs (sv_2mortal (newSViv (format)));
866 PUSHs (sv_2mortal (newSViv (channels)));
867 }
868}
819 869
820void 870void
821Mix_CloseAudio () 871Mix_CloseAudio ()
822 872
823int 873int
957void 1007void
958error (char *message) 1008error (char *message)
959 CODE: 1009 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1010 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1011#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1012 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1013#endif
964 1014
965void 1015void
966fatal (char *message) 1016fatal (char *message)
967 CODE: 1017 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1018 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1019#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1020 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1021#endif
972 _exit (1); 1022 _exit (1);
973 1023
974void 1024void
975_exit (int retval = 0) 1025_exit (int retval = 0)
987#if DEBUG 1037#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1038 VALGRIND_DO_LEAK_CHECK;
989#endif 1039#endif
990} 1040}
991 1041
992MODULE = CFPlus PACKAGE = CFPlus::Font 1042MODULE = Deliantra::Client PACKAGE = DC::Font
993 1043
994PROTOTYPES: DISABLE 1044PROTOTYPES: DISABLE
995 1045
996CFPlus::Font 1046DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1047new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1048 CODE:
999{ 1049{
1000 int count; 1050 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1054}
1005 OUTPUT: 1055 OUTPUT:
1006 RETVAL 1056 RETVAL
1007 1057
1008void 1058void
1009DESTROY (CFPlus::Font self) 1059DESTROY (DC::Font self)
1010 CODE: 1060 CODE:
1011 pango_font_description_free (self); 1061 pango_font_description_free (self);
1012 1062
1013void 1063void
1014make_default (CFPlus::Font self) 1064make_default (DC::Font self)
1015 PROTOTYPE: $ 1065 PROTOTYPE: $
1016 CODE: 1066 CODE:
1017 default_font = self; 1067 default_font = self;
1018 1068
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1069MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1070
1021PROTOTYPES: DISABLE 1071PROTOTYPES: DISABLE
1022 1072
1023void 1073void
1024reset_glyph_cache () 1074glyph_cache_backup ()
1025 PROTOTYPE: 1075 PROTOTYPE:
1026 CODE: 1076 CODE:
1077 tc_backup ();
1078
1079void
1080glyph_cache_restore ()
1081 PROTOTYPE:
1082 CODE:
1027 tc_clear (); 1083 tc_restore ();
1028 1084
1029CFPlus::Layout 1085DC::Layout
1030new (SV *class) 1086new (SV *class)
1031 CODE: 1087 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1088 New (0, RETVAL, 1, struct cf_layout);
1033 1089
1034 RETVAL->pl = pango_layout_new (opengl_context); 1090 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1092 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1093 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1094 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1095 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1096 RETVAL->font = 0;
1097 RETVAL->rc = rc_alloc ();
1041 1098
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1099 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1100 layout_update_font (RETVAL);
1044 OUTPUT: 1101 OUTPUT:
1045 RETVAL 1102 RETVAL
1046 1103
1047void 1104void
1048DESTROY (CFPlus::Layout self) 1105DESTROY (DC::Layout self)
1049 CODE: 1106 CODE:
1050 g_object_unref (self->pl); 1107 g_object_unref (self->pl);
1108 rc_free (self->rc);
1051 Safefree (self); 1109 Safefree (self);
1052 1110
1053void 1111void
1054set_text (CFPlus::Layout self, SV *text_) 1112set_text (DC::Layout self, SV *text_)
1055 CODE: 1113 CODE:
1056{ 1114{
1057 STRLEN textlen; 1115 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1116 char *text = SvPVutf8 (text_, textlen);
1059 1117
1060 pango_layout_set_text (self->pl, text, textlen); 1118 pango_layout_set_text (self->pl, text, textlen);
1061} 1119}
1062 1120
1063void 1121void
1064set_markup (CFPlus::Layout self, SV *text_) 1122set_markup (DC::Layout self, SV *text_)
1065 CODE: 1123 CODE:
1066{ 1124{
1067 STRLEN textlen; 1125 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
1069 1127
1070 pango_layout_set_markup (self->pl, text, textlen); 1128 pango_layout_set_markup (self->pl, text, textlen);
1071} 1129}
1072 1130
1073void 1131void
1074set_shapes (CFPlus::Layout self, ...) 1132set_shapes (DC::Layout self, ...)
1075 CODE: 1133 CODE:
1076{ 1134{
1077 PangoAttrList *attrs = 0; 1135 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1136 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1137 const char *pos = text;
1114 if (attrs) 1172 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1173 pango_layout_set_attributes (self->pl, attrs);
1116} 1174}
1117 1175
1118void 1176void
1119get_shapes (CFPlus::Layout self) 1177get_shapes (DC::Layout self)
1120 PPCODE: 1178 PPCODE:
1121{ 1179{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1180 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1181
1124 do 1182 do
1125 { 1183 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1184 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1185
1128 if (run && shape_attr_p (run)) 1186 if (run && shape_attr_p (run))
1129 { 1187 {
1130 PangoRectangle extents; 1188 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1189 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1197
1140 pango_layout_iter_free (iter); 1198 pango_layout_iter_free (iter);
1141} 1199}
1142 1200
1143int 1201int
1144has_wrapped (CFPlus::Layout self) 1202has_wrapped (DC::Layout self)
1145 CODE: 1203 CODE:
1146{ 1204{
1147 int lines = 1; 1205 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1206 const char *text = pango_layout_get_text (self->pl);
1149 1207
1154} 1212}
1155 OUTPUT: 1213 OUTPUT:
1156 RETVAL 1214 RETVAL
1157 1215
1158SV * 1216SV *
1159get_text (CFPlus::Layout self) 1217get_text (DC::Layout self)
1160 CODE: 1218 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1219 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1220 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1221 OUTPUT:
1164 RETVAL 1222 RETVAL
1165 1223
1166void 1224void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1225set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1226 CODE:
1169 self->r = r; 1227 self->r = r;
1170 self->g = g; 1228 self->g = g;
1171 self->b = b; 1229 self->b = b;
1172 self->a = a; 1230 self->a = a;
1173 1231
1174void 1232void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1233set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1234 CODE:
1177 if (self->font != font) 1235 if (self->font != font)
1178 { 1236 {
1179 self->font = font; 1237 self->font = font;
1180 layout_update_font (self); 1238 layout_update_font (self);
1181 } 1239 }
1182 1240
1183void 1241void
1184set_height (CFPlus::Layout self, int base_height) 1242set_height (DC::Layout self, int base_height)
1185 CODE: 1243 CODE:
1186 if (self->base_height != base_height) 1244 if (self->base_height != base_height)
1187 { 1245 {
1188 self->base_height = base_height; 1246 self->base_height = base_height;
1189 layout_update_font (self); 1247 layout_update_font (self);
1190 } 1248 }
1191 1249
1192void 1250void
1193set_width (CFPlus::Layout self, int max_width = -1) 1251set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1252 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1253 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1254
1197void 1255void
1198set_indent (CFPlus::Layout self, int indent) 1256set_indent (DC::Layout self, int indent)
1199 CODE: 1257 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1258 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1259
1202void 1260void
1203set_spacing (CFPlus::Layout self, int spacing) 1261set_spacing (DC::Layout self, int spacing)
1204 CODE: 1262 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1263 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1264
1207void 1265void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1266set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1267 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1268 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1269 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1270 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1271 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1272 : PANGO_ELLIPSIZE_NONE
1215 ); 1273 );
1216 1274
1217void 1275void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1276set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1277 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1278 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1279
1222void 1280void
1223size (CFPlus::Layout self) 1281size (DC::Layout self)
1224 PPCODE: 1282 PPCODE:
1225{ 1283{
1226 int w, h; 1284 int w, h;
1227 1285
1228 layout_get_pixel_size (self, &w, &h); 1286 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1289 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1290 PUSHs (sv_2mortal (newSViv (h)));
1233} 1291}
1234 1292
1235int 1293int
1236descent (CFPlus::Layout self) 1294descent (DC::Layout self)
1237 CODE: 1295 CODE:
1238{ 1296{
1239 PangoRectangle rect; 1297 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1298 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1299 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1300 RETVAL = PANGO_DESCENT (rect);
1243} 1301}
1244 OUTPUT: 1302 OUTPUT:
1245 RETVAL 1303 RETVAL
1246 1304
1247int 1305int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1306xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1307 CODE:
1250{ 1308{
1251 int index, trailing; 1309 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1310 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1311 RETVAL = index + trailing;
1254} 1312}
1255 OUTPUT: 1313 OUTPUT:
1256 RETVAL 1314 RETVAL
1257 1315
1258void 1316void
1259cursor_pos (CFPlus::Layout self, int index) 1317cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1318 PPCODE:
1261{ 1319{
1262 PangoRectangle strong_pos; 1320 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1321 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1322
1265 EXTEND (SP, 3); 1323 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1324 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1325 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1326 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1327}
1270 1328
1271void 1329void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1330index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1331 PPCODE:
1274{ 1332{
1275 int line, x; 1333 int line, x;
1276 1334
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1338 --line;
1339#endif
1280 EXTEND (SP, 2); 1340 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1341 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1342 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1343}
1284 1344
1285void 1345void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1346line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1347 PPCODE:
1288{ 1348{
1289 PangoLayoutLine *lp; 1349 PangoLayoutLine *lp;
1290 int index, trailing; 1350 int index, trailing;
1291 1351
1292 if (line < 0) 1352 if (line < 0)
1293 XSRETURN_EMPTY; 1353 XSRETURN_EMPTY;
1294 1354
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1355 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1356 XSRETURN_EMPTY; /* do better */
1297 1357
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1358 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1359
1300 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1366 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1367 }
1308} 1368}
1309 1369
1310void 1370void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1371render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1372 CODE:
1373 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1374 pango_opengl_render_layout_subpixel (
1314 self->pl, 1375 self->pl,
1376 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1377 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1378 self->r, self->g, self->b, self->a,
1317 flags 1379 flags
1318 ); 1380 );
1381 // we assume that context_change actually clears/frees stuff
1382 // and does not do any recomputation...
1383 pango_layout_context_changed (self->pl);
1319 1384
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1385void
1386draw (DC::Layout self)
1387 CODE:
1388{
1389 glEnable (GL_TEXTURE_2D);
1390 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1391 glEnable (GL_BLEND);
1392 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1393 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1394 glEnable (GL_ALPHA_TEST);
1395 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1396
1397 rc_draw (self->rc);
1398
1399 glDisable (GL_ALPHA_TEST);
1400 glDisable (GL_BLEND);
1401 glDisable (GL_TEXTURE_2D);
1402}
1403
1404MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1405
1322PROTOTYPES: ENABLE 1406PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1407
1326void 1408void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1409pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1410 CODE:
1329{ 1411{
1406 RETVAL = width > 0; 1488 RETVAL = width > 0;
1407} 1489}
1408 OUTPUT: 1490 OUTPUT:
1409 RETVAL 1491 RETVAL
1410 1492
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1493MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1494
1413PROTOTYPES: DISABLE 1495PROTOTYPES: DISABLE
1414 1496
1415CFPlus::Map 1497DC::Map
1416new (SV *class) 1498new (SV *class)
1417 CODE: 1499 CODE:
1418 New (0, RETVAL, 1, struct map); 1500 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1501 RETVAL->x = 0;
1420 RETVAL->y = 0; 1502 RETVAL->y = 0;
1428 RETVAL->row = 0; 1510 RETVAL->row = 0;
1429 OUTPUT: 1511 OUTPUT:
1430 RETVAL 1512 RETVAL
1431 1513
1432void 1514void
1433DESTROY (CFPlus::Map self) 1515DESTROY (DC::Map self)
1434 CODE: 1516 CODE:
1435{ 1517{
1436 map_clear (self); 1518 map_clear (self);
1437 Safefree (self->face2tile); 1519 Safefree (self->face2tile);
1438 Safefree (self->tex); 1520 Safefree (self->tex);
1439 Safefree (self); 1521 Safefree (self);
1440} 1522}
1441 1523
1442void 1524void
1443resize (CFPlus::Map self, int map_width, int map_height) 1525resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1526 CODE:
1445 self->w = map_width; 1527 self->w = map_width;
1446 self->h = map_height; 1528 self->h = map_height;
1447 1529
1448void 1530void
1449clear (CFPlus::Map self) 1531clear (DC::Map self)
1450 CODE: 1532 CODE:
1451 map_clear (self); 1533 map_clear (self);
1452 1534
1453void 1535void
1454set_tileid (CFPlus::Map self, int face, int tile) 1536set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1537 CODE:
1456{ 1538{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1539 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1540 need_texid (self, tile);
1459} 1541}
1460 1542
1461void 1543void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1544set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1545 CODE:
1464{ 1546{
1465 tileid texid; 1547 tileid texid;
1466 maptex *tex; 1548 maptex *tex;
1467 1549
1480 tex->smoothtile = self->face2tile [smooth]; 1562 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1563 tex->smoothlevel = level;
1482} 1564}
1483 1565
1484void 1566void
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) 1567set_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: 1568 CODE:
1487{ 1569{
1488 need_texid (self, texid); 1570 need_texid (self, texid);
1489 1571
1490 { 1572 {
1510 // from transparent color bleeding and ugly wrapping effects. 1592 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1594}
1513 1595
1514int 1596int
1515ox (CFPlus::Map self) 1597ox (DC::Map self)
1516 ALIAS: 1598 ALIAS:
1517 oy = 1 1599 oy = 1
1518 x = 2 1600 x = 2
1519 y = 3 1601 y = 3
1520 w = 4 1602 w = 4
1531 } 1613 }
1532 OUTPUT: 1614 OUTPUT:
1533 RETVAL 1615 RETVAL
1534 1616
1535void 1617void
1536scroll (CFPlus::Map self, int dx, int dy) 1618scroll (DC::Map self, int dx, int dy)
1537 CODE: 1619 CODE:
1538{ 1620{
1539 if (dx > 0) 1621 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1622 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1623 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1639 self->y += MAP_EXTEND_Y;
1558 } 1640 }
1559} 1641}
1560 1642
1561SV * 1643SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1644map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1645 CODE:
1564{ 1646{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1648 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1649 mapcell *cell;
1656} 1738}
1657 OUTPUT: 1739 OUTPUT:
1658 RETVAL 1740 RETVAL
1659 1741
1660SV * 1742SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1743mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1744 CODE:
1663{ 1745{
1664 int x1, x; 1746 int x1, x;
1665 int y1, y; 1747 int y1, y;
1666 int z; 1748 int z;
1711} 1793}
1712 OUTPUT: 1794 OUTPUT:
1713 RETVAL 1795 RETVAL
1714 1796
1715void 1797void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1798draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1717 CODE: 1799 CODE:
1718{ 1800{
1719 int x, y, z; 1801 int x, y, z;
1720 1802
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1804 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) 1805 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1806 smooth_key skey;
1725 1807
1726 rc_t *rc = rc_alloc (); 1808 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1809 rc_key_t key;
1728 rc_array_t *arr; 1810 rc_array_t *arr;
1790 if (tile) 1872 if (tile)
1791 { 1873 {
1792 maptex tex = self->tex [tile]; 1874 maptex tex = self->tex [tile];
1793 int px, py; 1875 int px, py;
1794 1876
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1877 if (key.texname != tex.name)
1798 { 1878 {
1799 if (!tex.name) 1879 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1880 tex = self->tex [2]; /* missing, replace by noface */
1801 1881
1884 // go through all smoothlevels, lowest to highest, then draw. 1964 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 1965 // this is basically counting sort
1886 { 1966 {
1887 int w, b; 1967 int w, b;
1888 1968
1969 glEnable (GL_TEXTURE_2D);
1970 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 1971 for (w = 0; w < 256 / 32; ++w)
1890 { 1972 {
1891 uint32_t smask = smooth_level [w]; 1973 uint32_t smask = smooth_level [w];
1892 if (smask) 1974 if (smask)
1893 for (b = 0; b < 32; ++b) 1975 for (b = 0; b < 32; ++b)
1918 { 2000 {
1919 // this time avoiding texture state changes 2001 // this time avoiding texture state changes
1920 // save gobs of state changes. 2002 // save gobs of state changes.
1921 if (key.texname != tex.name) 2003 if (key.texname != tex.name)
1922 { 2004 {
2005 glEnd ();
1923 key.texname = tex.name; 2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2007 glBegin (GL_QUADS);
1925 } 2008 }
1926 2009
1927 if (border) 2010 if (border)
1928 { 2011 {
1929 float ox = border * dx; 2012 float ox = border * dx;
1930 2013
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2014 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2015 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2016 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2017 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2018 }
1936 2019
1937 if (corner) 2020 if (corner)
1938 { 2021 {
1939 float ox = corner * dx; 2022 float ox = corner * dx;
1940 2023
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2024 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2025 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2026 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2027 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2028 }
1946 } 2029 }
1947 } 2030 }
1948 } 2031 }
1949 } 2032 }
1950 } 2033 }
2034
2035 glEnd ();
2036 glDisable (GL_TEXTURE_2D);
2037 key.texname = -1;
1951 } 2038 }
1952 2039
1953 hv_clear (smooth); 2040 hv_clear (smooth);
1954 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2041 }
1957 2042
1958 glDisable (GL_BLEND); 2043 glDisable (GL_BLEND);
1959 rc_free (rc); 2044 rc_free (rc);
1960 2045
1989 } 2074 }
1990 } 2075 }
1991} 2076}
1992 2077
1993void 2078void
1994draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2079draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1995 CODE: 2080 CODE:
1996{ 2081{
1997 static float color[16][3] = { 2082 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2083 { 0.00F, 0.00F, 0.00F },
1999 { 1.00F, 1.00F, 1.00F }, 2084 { 1.00F, 1.00F, 1.00F },
2049 glDisable (GL_BLEND); 2134 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2135 glDisable (GL_TEXTURE_2D);
2051} 2136}
2052 2137
2053void 2138void
2054fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2139fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055 PPCODE: 2140 PPCODE:
2056{ 2141{
2057 int x, y; 2142 int x, y;
2058 int sw1 = sw + 2; 2143 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2144 int sh1 = sh + 2;
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2215 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2216 PUSHs (darkness3_sv);
2132} 2217}
2133 2218
2134SV * 2219SV *
2135get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2220get_rect (DC::Map self, int x0, int y0, int w, int h)
2136 CODE: 2221 CODE:
2137{ 2222{
2138 int x, y, x1, y1; 2223 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2224 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2225 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2205} 2290}
2206 OUTPUT: 2291 OUTPUT:
2207 RETVAL 2292 RETVAL
2208 2293
2209void 2294void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2295set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2211 PPCODE: 2296 PPCODE:
2212{ 2297{
2213 int x, y, z; 2298 int x, y, z;
2214 int w, h; 2299 int w, h;
2215 int x1, y1; 2300 int x1, y1;
2216 2301
2217 if (*data++ != 0) 2302 if (*data++ != 0)
2218 return; /* version mismatch */ 2303 XSRETURN_EMPTY; /* version mismatch */
2219 2304
2220 w = *data++ << 8; w |= *data++; 2305 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2306 h = *data++ << 8; h |= *data++;
2222 2307
2223 // we need to do this 'cause we don't keep an absolute coord system for rows 2308 // we need to do this 'cause we don't keep an absolute coord system for rows
2268 } 2353 }
2269 } 2354 }
2270 } 2355 }
2271} 2356}
2272 2357
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2358MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2359
2275CFPlus::RW 2360DC::RW
2276new (SV *class, SV *data_sv) 2361new (SV *class, SV *data_sv)
2277 CODE: 2362 CODE:
2278{ 2363{
2279 STRLEN datalen; 2364 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2365 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2367 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2368}
2284 OUTPUT: 2369 OUTPUT:
2285 RETVAL 2370 RETVAL
2286 2371
2287CFPlus::RW 2372DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2373new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2374 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2375 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2376 OUTPUT:
2292 RETVAL 2377 RETVAL
2293 2378
2294# fails on win32: 2379# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2380# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2381#void
2297#close (CFPlus::RW self) 2382#close (DC::RW self)
2298# CODE: 2383# CODE:
2299# (self->(close)) (self); 2384# (self->(close)) (self);
2300 2385
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2386MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2387
2303PROTOTYPES: DISABLE 2388PROTOTYPES: DISABLE
2304 2389
2305CFPlus::Channel 2390DC::Channel
2306find () 2391find ()
2307 CODE: 2392 CODE:
2308{ 2393{
2309 RETVAL = Mix_GroupAvailable (-1); 2394 RETVAL = Mix_GroupAvailable (-1);
2310 2395
2323} 2408}
2324 OUTPUT: 2409 OUTPUT:
2325 RETVAL 2410 RETVAL
2326 2411
2327void 2412void
2328halt (CFPlus::Channel self) 2413halt (DC::Channel self)
2329 CODE: 2414 CODE:
2330 Mix_HaltChannel (self); 2415 Mix_HaltChannel (self);
2331 2416
2332void 2417void
2333expire (CFPlus::Channel self, int ticks = -1) 2418expire (DC::Channel self, int ticks = -1)
2334 CODE: 2419 CODE:
2335 Mix_ExpireChannel (self, ticks); 2420 Mix_ExpireChannel (self, ticks);
2336 2421
2337void 2422void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2423fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2424 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2425 Mix_FadeOutChannel (self, ticks);
2341 2426
2342int 2427int
2343volume (CFPlus::Channel self, int volume) 2428volume (DC::Channel self, int volume)
2344 CODE: 2429 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2430 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2431 OUTPUT:
2347 RETVAL 2432 RETVAL
2348 2433
2349void 2434void
2350unregister_all_effects (CFPlus::Channel self) 2435unregister_all_effects (DC::Channel self)
2351 CODE: 2436 CODE:
2352 Mix_UnregisterAllEffects (self); 2437 Mix_UnregisterAllEffects (self);
2353 2438
2354void 2439void
2355set_panning (CFPlus::Channel self, int left, int right) 2440set_panning (DC::Channel self, int left, int right)
2356 CODE: 2441 CODE:
2357 left = CLAMP (left , 0, 255); 2442 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2443 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2444 Mix_SetPanning (self, left, right);
2360 2445
2361void 2446void
2362set_distance (CFPlus::Channel self, int distance) 2447set_distance (DC::Channel self, int distance)
2363 CODE: 2448 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2449 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2450
2366void 2451void
2367set_position (CFPlus::Channel self, int angle, int distance) 2452set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2453 CODE:
2369 2454
2370void 2455void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2457 CODE:
2373{ 2458{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2459 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); 2460 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2462}
2378 2463
2379void 2464void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2465set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2466 CODE:
2382 Mix_SetReverseStereo (self, flip); 2467 Mix_SetReverseStereo (self, flip);
2383 2468
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2470
2386PROTOTYPES: DISABLE 2471PROTOTYPES: DISABLE
2387 2472
2388CFPlus::MixChunk 2473DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2474new (SV *class, DC::RW rwops)
2390 CODE: 2475 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2476 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2477 OUTPUT:
2393 RETVAL 2478 RETVAL
2394 2479
2395void 2480void
2396DESTROY (CFPlus::MixChunk self) 2481DESTROY (DC::MixChunk self)
2397 CODE: 2482 CODE:
2398 Mix_FreeChunk (self); 2483 Mix_FreeChunk (self);
2399 2484
2400int 2485int
2401volume (CFPlus::MixChunk self, int volume = -1) 2486volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2487 CODE:
2403 if (items > 1) 2488 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2489 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2490 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2491 OUTPUT:
2407 RETVAL 2492 RETVAL
2408 2493
2409CFPlus::Channel 2494DC::Channel
2410play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2495play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411 CODE: 2496 CODE:
2412{ 2497{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2498 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2499
2415 if (RETVAL < 0) 2500 if (RETVAL < 0)
2422 } 2507 }
2423} 2508}
2424 OUTPUT: 2509 OUTPUT:
2425 RETVAL 2510 RETVAL
2426 2511
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2513
2429int 2514int
2430volume (int volume = -1) 2515volume (int volume = -1)
2431 PROTOTYPE: ;$ 2516 PROTOTYPE: ;$
2432 CODE: 2517 CODE:
2444void 2529void
2445halt () 2530halt ()
2446 CODE: 2531 CODE:
2447 Mix_HaltMusic (); 2532 Mix_HaltMusic ();
2448 2533
2449CFPlus::MixMusic 2534DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2535new (SV *class, DC::RW rwops)
2451 CODE: 2536 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2537 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2538 OUTPUT:
2454 RETVAL 2539 RETVAL
2455 2540
2456void 2541void
2457DESTROY (CFPlus::MixMusic self) 2542DESTROY (DC::MixMusic self)
2458 CODE: 2543 CODE:
2459 Mix_FreeMusic (self); 2544 Mix_FreeMusic (self);
2460 2545
2461int 2546int
2462play (CFPlus::MixMusic self, int loops = -1) 2547play (DC::MixMusic self, int loops = -1)
2463 CODE: 2548 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2549 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2550 OUTPUT:
2466 RETVAL 2551 RETVAL
2467 2552
2468void 2553void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2554fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2555 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2556 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2557
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2558MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2559
2475PROTOTYPES: ENABLE 2560PROTOTYPES: ENABLE
2476 2561
2477BOOT: 2562BOOT:
2478{ 2563{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2564 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2565 static const struct {
2481 const char *name; 2566 const char *name;
2482 IV iv; 2567 IV iv;
2483 } *civ, const_iv[] = { 2568 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2569# define const_iv(name) { # name, (IV)name }
2519 const_iv (GL_INTENSITY), 2604 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2605 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2606 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2607 const_iv (GL_FLOAT),
2523 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2608 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2609 const_iv (GL_COMPRESSED_ALPHA_ARB),
2610 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2611 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2612 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2613 const_iv (GL_COMPRESSED_RGB_ARB),
2614 const_iv (GL_COMPRESSED_RGBA_ARB),
2524 const_iv (GL_COMPILE), 2615 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 2616 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 2617 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 2618 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 2619 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2658 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 2659 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 2660 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 2661 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 2662 const_iv (GL_GENERATE_MIPMAP_HINT),
2663 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 2664 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 2665 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 2666 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 2667 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 2668 const_iv (GL_V3F),
2584 2676
2585 texture_av = newAV (); 2677 texture_av = newAV ();
2586 AvREAL_off (texture_av); 2678 AvREAL_off (texture_av);
2587} 2679}
2588 2680
2681void
2682disable_GL_EXT_blend_func_separate ()
2683 CODE:
2684 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0;
2686
2589char * 2687char *
2590gl_vendor () 2688gl_vendor ()
2591 CODE: 2689 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 2690 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 2691 OUTPUT:
2714 2812
2715void glRect (float x1, float y1, float x2, float y2) 2813void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 2814 CODE:
2717 glRectf (x1, y1, x2, y2); 2815 glRectf (x1, y1, x2, y2);
2718 2816
2817void glRect_lineloop (float x1, float y1, float x2, float y2)
2818 CODE:
2819 glBegin (GL_LINE_LOOP);
2820 glVertex2f (x1, y1);
2821 glVertex2f (x2, y1);
2822 glVertex2f (x2, y2);
2823 glVertex2f (x1, y2);
2824 glEnd ();
2825
2719PROTOTYPES: ENABLE 2826PROTOTYPES: ENABLE
2720 2827
2721void glBegin (int mode) 2828void glBegin (int mode)
2722 2829
2723void glEnd () 2830void glEnd ()
2755void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2862void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756 CODE: 2863 CODE:
2757 if (gl.SeparableFilter2D) 2864 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2865 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 2866
2760void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2867void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761 2868
2762void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2869void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763 2870
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 2871void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 2872
2791 2898
2792void glEndList () 2899void glEndList ()
2793 2900
2794void glCallList (int list) 2901void glCallList (int list)
2795 2902
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 2904
2798PROTOTYPES: DISABLE 2905PROTOTYPES: DISABLE
2799 2906
2800void 2907void
2801find_widget (SV *self, NV x, NV y) 2908find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 2912 XPUSHs (self);
2806} 2913}
2807 2914
2808BOOT: 2915BOOT:
2809{ 2916{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2917 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 2918
2812 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2919 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); 2920 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); 2921 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); 2922 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816} 2923}
2817 2924
2818void 2925void
2819draw (SV *self) 2926draw (SV *self)
2820 CODE: 2927 CODE:
2824 NV x, y, w, h; 2931 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 2932 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 2933 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 2934 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 2935 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 2936 double draw_x, draw_y;
2831 2937
2832 if (!SvROK (self)) 2938 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2939 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 2940
2835 hv = (HV *)SvRV (self); 2941 hv = (HV *)SvRV (self);
2836 2942
2837 if (SvTYPE (hv) != SVt_PVHV) 2943 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2944 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 2945
2840 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2946 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.; 2947 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842 2948
2843 if (!h || !w) 2949 if (!h || !w)
2863 { 2969 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2970 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 2971
2866 if (svp && SvTRUE (*svp)) 2972 if (svp && SvTRUE (*svp))
2867 { 2973 {
2868 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2974 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869 glEnable (GL_BLEND); 2975 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2976 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 2977 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 2978 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 2979 glVertex2f (w, 0);
2876 glEnd (); 2982 glEnd ();
2877 glDisable (GL_BLEND); 2983 glDisable (GL_BLEND);
2878 } 2984 }
2879 } 2985 }
2880#if 0 2986#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 2987 // draw borders, for debugging
2882 glPushMatrix; 2988 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 2989 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 2990 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 2991 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 2992 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 2993 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 2994 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 2995 glVertex2f (0 , h - 1);
2890 glEnd; 2996 glEnd ();
2891 glPopMatrix; 2997 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 2998#endif
2895 PUSHMARK (SP); 2999 PUSHMARK (SP);
2896 XPUSHs (self); 3000 XPUSHs (self);
2897 PUTBACK; 3001 PUTBACK;
2898 call_method ("_draw", G_VOID | G_DISCARD); 3002 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines