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.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.257 by root, Mon Mar 24 01:15:21 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 /*pango_context_set_font_description (opengl_context, default_font);*/
679#if PANGO_VERSION_CHECK (1, 15, 2)
680 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif
644} 683}
645 684
646char * 685char *
647SDL_GetError () 686SDL_GetError ()
648 687
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 720
682 if (m && m != (SDL_Rect **)-1) 721 if (m && m != (SDL_Rect **)-1)
683 while (*m) 722 while (*m)
684 { 723 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 724 if ((*m)->w >= 800 && (*m)->h >= 480)
686 { 725 {
687 AV *av = newAV (); 726 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 727 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 728 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 729 av_push (av, newSViv (rgb));
714 753
715 if (RETVAL) 754 if (RETVAL)
716 { 755 {
717 av_clear (texture_av); 756 av_clear (texture_av);
718 757
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 760#include "glfunc.h"
722#undef GL_FUNC 761#undef GL_FUNC
723 } 762 }
724} 763}
731char * 770char *
732SDL_GetKeyName (int sym) 771SDL_GetKeyName (int sym)
733 772
734int 773int
735SDL_GetAppState () 774SDL_GetAppState ()
775
776int
777SDL_GetModState ()
736 778
737void 779void
738poll_events () 780poll_events ()
739 PPCODE: 781 PPCODE:
740{ 782{
750 { 792 {
751 case SDL_KEYDOWN: 793 case SDL_KEYDOWN:
752 case SDL_KEYUP: 794 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 797 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 */ 798 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); 799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 800 break;
759 801
760 case SDL_ACTIVEEVENT: 802 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 821 x = ev.motion.x;
780 y = ev.motion.y; 822 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 824 }
783 825
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 827 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 828 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 829 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 830 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 831 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 832 }
791 break; 833 break;
792 834
793 case SDL_MOUSEBUTTONDOWN: 835 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 836 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 837 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 838
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 839 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 840 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 841 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 842 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 847 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 848 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 849 break;
808 } 850 }
809 851
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 852 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 853 }
812} 854}
813 855
814int 856int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 857Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 858 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 859 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 860 Mix_ChannelFinished (channel_finished);
861
862void
863Mix_QuerySpec ()
864 PPCODE:
865{
866 int freq, channels;
867 Uint16 format;
868
869 if (Mix_QuerySpec (&freq, &format, &channels))
870 {
871 EXTEND (SP, 3);
872 PUSHs (sv_2mortal (newSViv (freq)));
873 PUSHs (sv_2mortal (newSViv (format)));
874 PUSHs (sv_2mortal (newSViv (channels)));
875 }
876}
819 877
820void 878void
821Mix_CloseAudio () 879Mix_CloseAudio ()
822 880
823int 881int
858 } 916 }
859 } 917 }
860#endif 918#endif
861} 919}
862 920
863void 921int
864add_font (char *file) 922add_font (char *file)
865 CODE: 923 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT:
926 RETVAL
867 927
868void 928void
869load_image_inline (SV *image_) 929load_image_inline (SV *image_)
870 ALIAS: 930 ALIAS:
871 load_image_file = 1 931 load_image_file = 1
957void 1017void
958error (char *message) 1018error (char *message)
959 CODE: 1019 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1020 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1021#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1022 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1023#endif
964 1024
965void 1025void
966fatal (char *message) 1026fatal (char *message)
967 CODE: 1027 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1028 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1029#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1030 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1031#endif
972 _exit (1); 1032 _exit (1);
973 1033
974void 1034void
975_exit (int retval = 0) 1035_exit (int retval = 0)
987#if DEBUG 1047#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1048 VALGRIND_DO_LEAK_CHECK;
989#endif 1049#endif
990} 1050}
991 1051
992MODULE = CFPlus PACKAGE = CFPlus::Font 1052MODULE = Deliantra::Client PACKAGE = DC::Font
993 1053
994PROTOTYPES: DISABLE 1054PROTOTYPES: DISABLE
995 1055
996CFPlus::Font 1056DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1057new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1058 CODE:
999{ 1059{
1000 int count; 1060 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1064}
1005 OUTPUT: 1065 OUTPUT:
1006 RETVAL 1066 RETVAL
1007 1067
1008void 1068void
1009DESTROY (CFPlus::Font self) 1069DESTROY (DC::Font self)
1010 CODE: 1070 CODE:
1011 pango_font_description_free (self); 1071 pango_font_description_free (self);
1012 1072
1013void 1073void
1014make_default (CFPlus::Font self) 1074make_default (DC::Font self)
1015 PROTOTYPE: $ 1075 PROTOTYPE: $
1016 CODE: 1076 CODE:
1017 default_font = self; 1077 default_font = self;
1018 1078
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1079MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1080
1021PROTOTYPES: DISABLE 1081PROTOTYPES: DISABLE
1022 1082
1023void 1083void
1024reset_glyph_cache () 1084glyph_cache_backup ()
1025 PROTOTYPE: 1085 PROTOTYPE:
1026 CODE: 1086 CODE:
1087 tc_backup ();
1088
1089void
1090glyph_cache_restore ()
1091 PROTOTYPE:
1092 CODE:
1027 tc_clear (); 1093 tc_restore ();
1028 1094
1029CFPlus::Layout 1095DC::Layout
1030new (SV *class) 1096new (SV *class)
1031 CODE: 1097 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1098 New (0, RETVAL, 1, struct cf_layout);
1033 1099
1034 RETVAL->pl = pango_layout_new (opengl_context); 1100 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1102 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1103 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1104 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1105 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1106 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
1041 1108
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1110 layout_update_font (RETVAL);
1044 OUTPUT: 1111 OUTPUT:
1045 RETVAL 1112 RETVAL
1046 1113
1047void 1114void
1048DESTROY (CFPlus::Layout self) 1115DESTROY (DC::Layout self)
1049 CODE: 1116 CODE:
1050 g_object_unref (self->pl); 1117 g_object_unref (self->pl);
1118 rc_free (self->rc);
1051 Safefree (self); 1119 Safefree (self);
1052 1120
1053void 1121void
1054set_text (CFPlus::Layout self, SV *text_) 1122set_text (DC::Layout self, SV *text_)
1055 CODE: 1123 CODE:
1056{ 1124{
1057 STRLEN textlen; 1125 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
1059 1127
1060 pango_layout_set_text (self->pl, text, textlen); 1128 pango_layout_set_text (self->pl, text, textlen);
1061} 1129}
1062 1130
1063void 1131void
1064set_markup (CFPlus::Layout self, SV *text_) 1132set_markup (DC::Layout self, SV *text_)
1065 CODE: 1133 CODE:
1066{ 1134{
1067 STRLEN textlen; 1135 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1069 1137
1070 pango_layout_set_markup (self->pl, text, textlen); 1138 pango_layout_set_markup (self->pl, text, textlen);
1071} 1139}
1072 1140
1073void 1141void
1074set_shapes (CFPlus::Layout self, ...) 1142set_shapes (DC::Layout self, ...)
1075 CODE: 1143 CODE:
1076{ 1144{
1077 PangoAttrList *attrs = 0; 1145 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1146 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1147 const char *pos = text;
1114 if (attrs) 1182 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1183 pango_layout_set_attributes (self->pl, attrs);
1116} 1184}
1117 1185
1118void 1186void
1119get_shapes (CFPlus::Layout self) 1187get_shapes (DC::Layout self)
1120 PPCODE: 1188 PPCODE:
1121{ 1189{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1190 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1191
1124 do 1192 do
1125 { 1193 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1194 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1195
1128 if (run && shape_attr_p (run)) 1196 if (run && shape_attr_p (run))
1129 { 1197 {
1130 PangoRectangle extents; 1198 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1199 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1207
1140 pango_layout_iter_free (iter); 1208 pango_layout_iter_free (iter);
1141} 1209}
1142 1210
1143int 1211int
1144has_wrapped (CFPlus::Layout self) 1212has_wrapped (DC::Layout self)
1145 CODE: 1213 CODE:
1146{ 1214{
1147 int lines = 1; 1215 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1216 const char *text = pango_layout_get_text (self->pl);
1149 1217
1154} 1222}
1155 OUTPUT: 1223 OUTPUT:
1156 RETVAL 1224 RETVAL
1157 1225
1158SV * 1226SV *
1159get_text (CFPlus::Layout self) 1227get_text (DC::Layout self)
1160 CODE: 1228 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1229 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1230 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1231 OUTPUT:
1164 RETVAL 1232 RETVAL
1165 1233
1166void 1234void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1235set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1236 CODE:
1169 self->r = r; 1237 self->r = r;
1170 self->g = g; 1238 self->g = g;
1171 self->b = b; 1239 self->b = b;
1172 self->a = a; 1240 self->a = a;
1173 1241
1174void 1242void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1243set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1244 CODE:
1177 if (self->font != font) 1245 if (self->font != font)
1178 { 1246 {
1179 self->font = font; 1247 self->font = font;
1180 layout_update_font (self); 1248 layout_update_font (self);
1181 } 1249 }
1182 1250
1183void 1251void
1184set_height (CFPlus::Layout self, int base_height) 1252set_height (DC::Layout self, int base_height)
1185 CODE: 1253 CODE:
1186 if (self->base_height != base_height) 1254 if (self->base_height != base_height)
1187 { 1255 {
1188 self->base_height = base_height; 1256 self->base_height = base_height;
1189 layout_update_font (self); 1257 layout_update_font (self);
1190 } 1258 }
1191 1259
1192void 1260void
1193set_width (CFPlus::Layout self, int max_width = -1) 1261set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1262 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1263 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1264
1197void 1265void
1198set_indent (CFPlus::Layout self, int indent) 1266set_indent (DC::Layout self, int indent)
1199 CODE: 1267 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1268 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1269
1202void 1270void
1203set_spacing (CFPlus::Layout self, int spacing) 1271set_spacing (DC::Layout self, int spacing)
1204 CODE: 1272 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1273 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1274
1207void 1275void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1276set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1277 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1278 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1279 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1280 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1281 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1282 : PANGO_ELLIPSIZE_NONE
1215 ); 1283 );
1216 1284
1217void 1285void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1286set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1287 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1288 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1289
1222void 1290void
1223size (CFPlus::Layout self) 1291size (DC::Layout self)
1224 PPCODE: 1292 PPCODE:
1225{ 1293{
1226 int w, h; 1294 int w, h;
1227 1295
1228 layout_get_pixel_size (self, &w, &h); 1296 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1299 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1300 PUSHs (sv_2mortal (newSViv (h)));
1233} 1301}
1234 1302
1235int 1303int
1236descent (CFPlus::Layout self) 1304descent (DC::Layout self)
1237 CODE: 1305 CODE:
1238{ 1306{
1239 PangoRectangle rect; 1307 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1308 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1309 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1310 RETVAL = PANGO_DESCENT (rect);
1243} 1311}
1244 OUTPUT: 1312 OUTPUT:
1245 RETVAL 1313 RETVAL
1246 1314
1247int 1315int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1316xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1317 CODE:
1250{ 1318{
1251 int index, trailing; 1319 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1320 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1321 RETVAL = index + trailing;
1254} 1322}
1255 OUTPUT: 1323 OUTPUT:
1256 RETVAL 1324 RETVAL
1257 1325
1258void 1326void
1259cursor_pos (CFPlus::Layout self, int index) 1327cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1328 PPCODE:
1261{ 1329{
1262 PangoRectangle strong_pos; 1330 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1331 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1332
1265 EXTEND (SP, 3); 1333 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1334 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1335 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1336 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1337}
1270 1338
1271void 1339void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1340index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1341 PPCODE:
1274{ 1342{
1275 int line, x; 1343 int line, x;
1276 1344
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1345 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1346#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1347 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1348 --line;
1349#endif
1280 EXTEND (SP, 2); 1350 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1351 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1352 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1353}
1284 1354
1285void 1355void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1356line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1357 PPCODE:
1288{ 1358{
1289 PangoLayoutLine *lp; 1359 PangoLayoutLine *lp;
1290 int index, trailing; 1360 int index, trailing;
1291 1361
1292 if (line < 0) 1362 if (line < 0)
1293 XSRETURN_EMPTY; 1363 XSRETURN_EMPTY;
1294 1364
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1365 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1366 XSRETURN_EMPTY; /* do better */
1297 1367
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1368 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1369
1300 EXTEND (SP, 2); 1370 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1376 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1377 }
1308} 1378}
1309 1379
1310void 1380void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1381render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1382 CODE:
1383 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1384 pango_opengl_render_layout_subpixel (
1314 self->pl, 1385 self->pl,
1386 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1387 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1388 self->r, self->g, self->b, self->a,
1317 flags 1389 flags
1318 ); 1390 );
1391 // we assume that context_change actually clears/frees stuff
1392 // and does not do any recomputation...
1393 pango_layout_context_changed (self->pl);
1319 1394
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1395void
1396draw (DC::Layout self)
1397 CODE:
1398{
1399 glEnable (GL_TEXTURE_2D);
1400 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1401 glEnable (GL_BLEND);
1402 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1403 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_ALPHA_TEST);
1405 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1406
1407 rc_draw (self->rc);
1408
1409 glDisable (GL_ALPHA_TEST);
1410 glDisable (GL_BLEND);
1411 glDisable (GL_TEXTURE_2D);
1412}
1413
1414MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1415
1322PROTOTYPES: ENABLE 1416PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1417
1326void 1418void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1419pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1420 CODE:
1329{ 1421{
1406 RETVAL = width > 0; 1498 RETVAL = width > 0;
1407} 1499}
1408 OUTPUT: 1500 OUTPUT:
1409 RETVAL 1501 RETVAL
1410 1502
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1503MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1504
1413PROTOTYPES: DISABLE 1505PROTOTYPES: DISABLE
1414 1506
1415CFPlus::Map 1507DC::Map
1416new (SV *class) 1508new (SV *class)
1417 CODE: 1509 CODE:
1418 New (0, RETVAL, 1, struct map); 1510 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1511 RETVAL->x = 0;
1420 RETVAL->y = 0; 1512 RETVAL->y = 0;
1428 RETVAL->row = 0; 1520 RETVAL->row = 0;
1429 OUTPUT: 1521 OUTPUT:
1430 RETVAL 1522 RETVAL
1431 1523
1432void 1524void
1433DESTROY (CFPlus::Map self) 1525DESTROY (DC::Map self)
1434 CODE: 1526 CODE:
1435{ 1527{
1436 map_clear (self); 1528 map_clear (self);
1437 Safefree (self->face2tile); 1529 Safefree (self->face2tile);
1438 Safefree (self->tex); 1530 Safefree (self->tex);
1439 Safefree (self); 1531 Safefree (self);
1440} 1532}
1441 1533
1442void 1534void
1443resize (CFPlus::Map self, int map_width, int map_height) 1535resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1536 CODE:
1445 self->w = map_width; 1537 self->w = map_width;
1446 self->h = map_height; 1538 self->h = map_height;
1447 1539
1448void 1540void
1449clear (CFPlus::Map self) 1541clear (DC::Map self)
1450 CODE: 1542 CODE:
1451 map_clear (self); 1543 map_clear (self);
1452 1544
1453void 1545void
1454set_tileid (CFPlus::Map self, int face, int tile) 1546set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1547 CODE:
1456{ 1548{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1549 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1550 need_texid (self, tile);
1459} 1551}
1460 1552
1461void 1553void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1554set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1555 CODE:
1464{ 1556{
1465 tileid texid; 1557 tileid texid;
1466 maptex *tex; 1558 maptex *tex;
1467 1559
1480 tex->smoothtile = self->face2tile [smooth]; 1572 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1573 tex->smoothlevel = level;
1482} 1574}
1483 1575
1484void 1576void
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) 1577set_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: 1578 CODE:
1487{ 1579{
1488 need_texid (self, texid); 1580 need_texid (self, texid);
1489 1581
1490 { 1582 {
1510 // from transparent color bleeding and ugly wrapping effects. 1602 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1604}
1513 1605
1514int 1606int
1515ox (CFPlus::Map self) 1607ox (DC::Map self)
1516 ALIAS: 1608 ALIAS:
1517 oy = 1 1609 oy = 1
1518 x = 2 1610 x = 2
1519 y = 3 1611 y = 3
1520 w = 4 1612 w = 4
1531 } 1623 }
1532 OUTPUT: 1624 OUTPUT:
1533 RETVAL 1625 RETVAL
1534 1626
1535void 1627void
1536scroll (CFPlus::Map self, int dx, int dy) 1628scroll (DC::Map self, int dx, int dy)
1537 CODE: 1629 CODE:
1538{ 1630{
1539 if (dx > 0) 1631 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1632 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1633 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1649 self->y += MAP_EXTEND_Y;
1558 } 1650 }
1559} 1651}
1560 1652
1561SV * 1653SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1654map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1655 CODE:
1564{ 1656{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1658 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1659 mapcell *cell;
1656} 1748}
1657 OUTPUT: 1749 OUTPUT:
1658 RETVAL 1750 RETVAL
1659 1751
1660SV * 1752SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1753mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1754 CODE:
1663{ 1755{
1664 int x1, x; 1756 int x1, x;
1665 int y1, y; 1757 int y1, y;
1666 int z; 1758 int z;
1711} 1803}
1712 OUTPUT: 1804 OUTPUT:
1713 RETVAL 1805 RETVAL
1714 1806
1715void 1807void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1808draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1717 CODE: 1809 CODE:
1718{ 1810{
1719 int x, y, z; 1811 int x, y, z;
1720 1812
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1814 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) 1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1816 smooth_key skey;
1725 1817
1726 rc_t *rc = rc_alloc (); 1818 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1819 rc_key_t key;
1728 rc_array_t *arr; 1820 rc_array_t *arr;
1790 if (tile) 1882 if (tile)
1791 { 1883 {
1792 maptex tex = self->tex [tile]; 1884 maptex tex = self->tex [tile];
1793 int px, py; 1885 int px, py;
1794 1886
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1887 if (key.texname != tex.name)
1798 { 1888 {
1799 if (!tex.name) 1889 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1890 tex = self->tex [2]; /* missing, replace by noface */
1801 1891
1876 } 1966 }
1877 } 1967 }
1878 } 1968 }
1879 } 1969 }
1880 1970
1971 rc_draw (rc);
1972 rc_clear (rc);
1973
1881 // go through all smoothlevels, lowest to highest, then draw. 1974 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 1975 // this is basically counting sort
1883 { 1976 {
1884 int w, b; 1977 int w, b;
1885 1978
1979 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 1981 for (w = 0; w < 256 / 32; ++w)
1887 { 1982 {
1888 uint32_t smask = smooth_level [w]; 1983 uint32_t smask = smooth_level [w];
1889 if (smask) 1984 if (smask)
1890 for (b = 0; b < 32; ++b) 1985 for (b = 0; b < 32; ++b)
1915 { 2010 {
1916 // this time avoiding texture state changes 2011 // this time avoiding texture state changes
1917 // save gobs of state changes. 2012 // save gobs of state changes.
1918 if (key.texname != tex.name) 2013 if (key.texname != tex.name)
1919 { 2014 {
2015 glEnd ();
1920 key.texname = tex.name; 2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2017 glBegin (GL_QUADS);
1922 } 2018 }
1923 2019
1924 if (border) 2020 if (border)
1925 { 2021 {
1926 float ox = border * dx; 2022 float ox = border * dx;
1927 2023
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1932 } 2028 }
1933 2029
1934 if (corner) 2030 if (corner)
1935 { 2031 {
1936 float ox = corner * dx; 2032 float ox = corner * dx;
1937 2033
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2034 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1942 } 2038 }
1943 } 2039 }
1944 } 2040 }
1945 } 2041 }
1946 } 2042 }
1947 } 2043 }
2044
2045 glEnd ();
2046 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1;
1948 } 2048 }
1949 2049
1950 hv_clear (smooth); 2050 hv_clear (smooth);
1951 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2051 }
1954 2052
1955 glDisable (GL_BLEND); 2053 glDisable (GL_BLEND);
1956 rc_free (rc); 2054 rc_free (rc);
1957 2055
1986 } 2084 }
1987 } 2085 }
1988} 2086}
1989 2087
1990void 2088void
1991draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1992 CODE: 2090 CODE:
1993{ 2091{
1994 static float color[16][3] = { 2092 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2093 { 0.00F, 0.00F, 0.00F },
1996 { 1.00F, 1.00F, 1.00F }, 2094 { 1.00F, 1.00F, 1.00F },
2046 glDisable (GL_BLEND); 2144 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2145 glDisable (GL_TEXTURE_2D);
2048} 2146}
2049 2147
2050void 2148void
2051fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2149fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2052 PPCODE: 2150 PPCODE:
2053{ 2151{
2054 int x, y; 2152 int x, y;
2055 int sw1 = sw + 2; 2153 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2154 int sh1 = sh + 2;
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2225 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2226 PUSHs (darkness3_sv);
2129} 2227}
2130 2228
2131SV * 2229SV *
2132get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2230get_rect (DC::Map self, int x0, int y0, int w, int h)
2133 CODE: 2231 CODE:
2134{ 2232{
2135 int x, y, x1, y1; 2233 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2234 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2235 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2202} 2300}
2203 OUTPUT: 2301 OUTPUT:
2204 RETVAL 2302 RETVAL
2205 2303
2206void 2304void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2305set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2208 PPCODE: 2306 PPCODE:
2209{ 2307{
2210 int x, y, z; 2308 int x, y, z;
2211 int w, h; 2309 int w, h;
2212 int x1, y1; 2310 int x1, y1;
2213 2311
2214 if (*data++ != 0) 2312 if (*data++ != 0)
2215 return; /* version mismatch */ 2313 XSRETURN_EMPTY; /* version mismatch */
2216 2314
2217 w = *data++ << 8; w |= *data++; 2315 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2316 h = *data++ << 8; h |= *data++;
2219 2317
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2318 // we need to do this 'cause we don't keep an absolute coord system for rows
2265 } 2363 }
2266 } 2364 }
2267 } 2365 }
2268} 2366}
2269 2367
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2368MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2369
2272CFPlus::RW 2370DC::RW
2273new (SV *class, SV *data_sv) 2371new (SV *class, SV *data_sv)
2274 CODE: 2372 CODE:
2275{ 2373{
2276 STRLEN datalen; 2374 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2375 char *data = SvPVbyte (data_sv, datalen);
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2377 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2378}
2281 OUTPUT: 2379 OUTPUT:
2282 RETVAL 2380 RETVAL
2283 2381
2284CFPlus::RW 2382DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2383new_from_file (SV *class, const char *path, const char *mode = "rb")
2286 CODE: 2384 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2385 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2386 OUTPUT:
2289 RETVAL 2387 RETVAL
2290 2388
2291# fails on win32: 2389# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2390# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2391#void
2294#close (CFPlus::RW self) 2392#close (DC::RW self)
2295# CODE: 2393# CODE:
2296# (self->(close)) (self); 2394# (self->(close)) (self);
2297 2395
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2396MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2397
2300PROTOTYPES: DISABLE 2398PROTOTYPES: DISABLE
2301 2399
2302CFPlus::Channel 2400DC::Channel
2303find () 2401find ()
2304 CODE: 2402 CODE:
2305{ 2403{
2306 RETVAL = Mix_GroupAvailable (-1); 2404 RETVAL = Mix_GroupAvailable (-1);
2307 2405
2320} 2418}
2321 OUTPUT: 2419 OUTPUT:
2322 RETVAL 2420 RETVAL
2323 2421
2324void 2422void
2325halt (CFPlus::Channel self) 2423halt (DC::Channel self)
2326 CODE: 2424 CODE:
2327 Mix_HaltChannel (self); 2425 Mix_HaltChannel (self);
2328 2426
2329void 2427void
2330expire (CFPlus::Channel self, int ticks = -1) 2428expire (DC::Channel self, int ticks = -1)
2331 CODE: 2429 CODE:
2332 Mix_ExpireChannel (self, ticks); 2430 Mix_ExpireChannel (self, ticks);
2333 2431
2334void 2432void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2433fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2434 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2435 Mix_FadeOutChannel (self, ticks);
2338 2436
2339int 2437int
2340volume (CFPlus::Channel self, int volume) 2438volume (DC::Channel self, int volume)
2341 CODE: 2439 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2440 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2441 OUTPUT:
2344 RETVAL 2442 RETVAL
2345 2443
2346void 2444void
2347unregister_all_effects (CFPlus::Channel self) 2445unregister_all_effects (DC::Channel self)
2348 CODE: 2446 CODE:
2349 Mix_UnregisterAllEffects (self); 2447 Mix_UnregisterAllEffects (self);
2350 2448
2351void 2449void
2352set_panning (CFPlus::Channel self, int left, int right) 2450set_panning (DC::Channel self, int left, int right)
2353 CODE: 2451 CODE:
2354 left = CLAMP (left , 0, 255); 2452 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2453 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2454 Mix_SetPanning (self, left, right);
2357 2455
2358void 2456void
2359set_distance (CFPlus::Channel self, int distance) 2457set_distance (DC::Channel self, int distance)
2360 CODE: 2458 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2459 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2460
2363void 2461void
2364set_position (CFPlus::Channel self, int angle, int distance) 2462set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2463 CODE:
2366 2464
2367void 2465void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2467 CODE:
2370{ 2468{
2371 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2469 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2372 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2470 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2472}
2375 2473
2376void 2474void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2475set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2476 CODE:
2379 Mix_SetReverseStereo (self, flip); 2477 Mix_SetReverseStereo (self, flip);
2380 2478
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2480
2383PROTOTYPES: DISABLE 2481PROTOTYPES: DISABLE
2384 2482
2385CFPlus::MixChunk 2483DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2484new (SV *class, DC::RW rwops)
2387 CODE: 2485 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2486 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2487 OUTPUT:
2390 RETVAL 2488 RETVAL
2391 2489
2392void 2490void
2393DESTROY (CFPlus::MixChunk self) 2491DESTROY (DC::MixChunk self)
2394 CODE: 2492 CODE:
2395 Mix_FreeChunk (self); 2493 Mix_FreeChunk (self);
2396 2494
2397int 2495int
2398volume (CFPlus::MixChunk self, int volume = -1) 2496volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2497 CODE:
2400 if (items > 1) 2498 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2499 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2500 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2501 OUTPUT:
2404 RETVAL 2502 RETVAL
2405 2503
2406CFPlus::Channel 2504DC::Channel
2407play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2505play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408 CODE: 2506 CODE:
2409{ 2507{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2508 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 2509
2412 if (RETVAL < 0) 2510 if (RETVAL < 0)
2419 } 2517 }
2420} 2518}
2421 OUTPUT: 2519 OUTPUT:
2422 RETVAL 2520 RETVAL
2423 2521
2424MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2425 2523
2426int 2524int
2427volume (int volume = -1) 2525volume (int volume = -1)
2428 PROTOTYPE: ;$ 2526 PROTOTYPE: ;$
2429 CODE: 2527 CODE:
2441void 2539void
2442halt () 2540halt ()
2443 CODE: 2541 CODE:
2444 Mix_HaltMusic (); 2542 Mix_HaltMusic ();
2445 2543
2446CFPlus::MixMusic 2544DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 2545new (SV *class, DC::RW rwops)
2448 CODE: 2546 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 2547 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 2548 OUTPUT:
2451 RETVAL 2549 RETVAL
2452 2550
2453void 2551void
2454DESTROY (CFPlus::MixMusic self) 2552DESTROY (DC::MixMusic self)
2455 CODE: 2553 CODE:
2456 Mix_FreeMusic (self); 2554 Mix_FreeMusic (self);
2457 2555
2458int 2556int
2459play (CFPlus::MixMusic self, int loops = -1) 2557play (DC::MixMusic self, int loops = -1)
2460 CODE: 2558 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 2559 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 2560 OUTPUT:
2463 RETVAL 2561 RETVAL
2464 2562
2465void 2563void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2564fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 2565 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 2566 Mix_FadeInMusicPos (self, loops, ms, position);
2469 2567
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2568MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 2569
2472PROTOTYPES: ENABLE 2570PROTOTYPES: ENABLE
2473 2571
2474BOOT: 2572BOOT:
2475{ 2573{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2574 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 2575 static const struct {
2478 const char *name; 2576 const char *name;
2479 IV iv; 2577 IV iv;
2480 } *civ, const_iv[] = { 2578 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 2579# define const_iv(name) { # name, (IV)name }
2516 const_iv (GL_INTENSITY), 2614 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 2615 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 2616 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 2617 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2618 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2619 const_iv (GL_COMPRESSED_ALPHA_ARB),
2620 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2621 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2622 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2623 const_iv (GL_COMPRESSED_RGB_ARB),
2624 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 2625 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 2626 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 2627 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 2628 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 2629 const_iv (GL_TEXTURE_2D),
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2668 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 2669 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 2670 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 2671 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 2672 const_iv (GL_GENERATE_MIPMAP_HINT),
2673 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 2674 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 2675 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 2676 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 2677 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 2678 const_iv (GL_V3F),
2581 2686
2582 texture_av = newAV (); 2687 texture_av = newAV ();
2583 AvREAL_off (texture_av); 2688 AvREAL_off (texture_av);
2584} 2689}
2585 2690
2691void
2692disable_GL_EXT_blend_func_separate ()
2693 CODE:
2694 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0;
2696
2586char * 2697char *
2587gl_vendor () 2698gl_vendor ()
2588 CODE: 2699 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 2700 RETVAL = (char *)glGetString (GL_VENDOR);
2590 OUTPUT: 2701 OUTPUT:
2711 2822
2712void glRect (float x1, float y1, float x2, float y2) 2823void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 2824 CODE:
2714 glRectf (x1, y1, x2, y2); 2825 glRectf (x1, y1, x2, y2);
2715 2826
2827void glRect_lineloop (float x1, float y1, float x2, float y2)
2828 CODE:
2829 glBegin (GL_LINE_LOOP);
2830 glVertex2f (x1, y1);
2831 glVertex2f (x2, y1);
2832 glVertex2f (x2, y2);
2833 glVertex2f (x1, y2);
2834 glEnd ();
2835
2716PROTOTYPES: ENABLE 2836PROTOTYPES: ENABLE
2717 2837
2718void glBegin (int mode) 2838void glBegin (int mode)
2719 2839
2720void glEnd () 2840void glEnd ()
2752void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2872void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2753 CODE: 2873 CODE:
2754 if (gl.SeparableFilter2D) 2874 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2875 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 2876
2757void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2877void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2758 2878
2759void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2879void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2760 2880
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 2881void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 2882
2788 2908
2789void glEndList () 2909void glEndList ()
2790 2910
2791void glCallList (int list) 2911void glCallList (int list)
2792 2912
2793MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2794 2914
2795PROTOTYPES: DISABLE 2915PROTOTYPES: DISABLE
2796 2916
2797void 2917void
2798find_widget (SV *self, NV x, NV y) 2918find_widget (SV *self, NV x, NV y)
2802 XPUSHs (self); 2922 XPUSHs (self);
2803} 2923}
2804 2924
2805BOOT: 2925BOOT:
2806{ 2926{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2927 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 2928
2809 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2929 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2810 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2930 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2811 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2931 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2812 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2932 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2813} 2933}
2814 2934
2815void 2935void
2816draw (SV *self) 2936draw (SV *self)
2817 CODE: 2937 CODE:
2821 NV x, y, w, h; 2941 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 2942 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 2943 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 2944 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 2945 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 2946 double draw_x, draw_y;
2828 2947
2829 if (!SvROK (self)) 2948 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2949 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 2950
2832 hv = (HV *)SvRV (self); 2951 hv = (HV *)SvRV (self);
2833 2952
2834 if (SvTYPE (hv) != SVt_PVHV) 2953 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2954 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 2955
2837 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2956 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2838 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2957 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2839 2958
2840 if (!h || !w) 2959 if (!h || !w)
2860 { 2979 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2980 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 2981
2863 if (svp && SvTRUE (*svp)) 2982 if (svp && SvTRUE (*svp))
2864 { 2983 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2984 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 2985 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2986 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 2987 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 2988 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 2989 glVertex2f (w, 0);
2873 glEnd (); 2992 glEnd ();
2874 glDisable (GL_BLEND); 2993 glDisable (GL_BLEND);
2875 } 2994 }
2876 } 2995 }
2877#if 0 2996#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 2997 // draw borders, for debugging
2879 glPushMatrix; 2998 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 2999 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3000 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3001 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3002 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3003 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3004 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3005 glVertex2f (0 , h - 1);
2887 glEnd; 3006 glEnd ();
2888 glPopMatrix; 3007 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3008#endif
2892 PUSHMARK (SP); 3009 PUSHMARK (SP);
2893 XPUSHs (self); 3010 XPUSHs (self);
2894 PUTBACK; 3011 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 3012 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines