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.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.255 by root, Sun Jan 6 18:25:59 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
63#define MAP_EXTEND_X 32 74#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 75#define MAP_EXTEND_Y 512
65 76
66#define MIN_FONT_HEIGHT 10 77#define MIN_FONT_HEIGHT 10
67 78
79/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
68#if 0 82#if 0
69# define PARACHUTE SDL_INIT_NOPARACHUTE 83# define PARACHUTE SDL_INIT_NOPARACHUTE
70#else 84#else
71# define PARACHUTE 0 85# define PARACHUTE 0
72#endif 86#endif
120 134
121#include "pango-font.c" 135#include "pango-font.c"
122#include "pango-fontmap.c" 136#include "pango-fontmap.c"
123#include "pango-render.c" 137#include "pango-render.c"
124 138
125typedef IV CFPlus__Channel; 139typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 140typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 141typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 142typedef Mix_Music *DC__MixMusic;
129 143
130typedef PangoFontDescription *CFPlus__Font; 144typedef PangoFontDescription *DC__Font;
131 145
132static int 146static int
133shape_attr_p (PangoLayoutRun *run) 147shape_attr_p (PangoLayoutRun *run)
134{ 148{
135 GSList *attrs = run->item->analysis.extra_attrs; 149 GSList *attrs = run->item->analysis.extra_attrs;
149 163
150typedef struct cf_layout { 164typedef struct cf_layout {
151 PangoLayout *pl; 165 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 166 float r, g, b, a; // default color for rgba mode
153 int base_height; 167 int base_height;
154 CFPlus__Font font; 168 DC__Font font;
155 rc_t *rc; 169 rc_t *rc;
156} *CFPlus__Layout; 170} *DC__Layout;
157 171
158static CFPlus__Font default_font; 172static DC__Font default_font;
159static PangoContext *opengl_context; 173static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 174static PangoFontMap *opengl_fontmap;
161 175
162static void 176static void
163substitute_func (FcPattern *pattern, gpointer data) 177substitute_func (FcPattern *pattern, gpointer data)
168#endif 182#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 183 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 184}
171 185
172static void 186static void
173layout_update_font (CFPlus__Layout self) 187layout_update_font (DC__Layout self)
174{ 188{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 189 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 190 * reasonably well with bitstream vera
177 */ 191 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
182 196
183 pango_layout_set_font_description (self->pl, font); 197 pango_layout_set_font_description (self->pl, font);
184} 198}
185 199
186static void 200static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 201layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 202{
189 PangoRectangle rect; 203 PangoRectangle rect;
190 204
191 // get_pixel_* wrongly rounds down 205 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 206 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 245 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 246 int texs; maptex *tex; // [tileid]
233 247
234 int32_t rows; 248 int32_t rows;
235 maprow *row; 249 maprow *row;
236} *CFPlus__Map; 250} *DC__Map;
237 251
238static char * 252static char *
239prepend (char *ptr, int sze, int inc) 253prepend (char *ptr, int sze, int inc)
240{ 254{
241 char *p; 255 char *p;
279 self->texs *= 2; 293 self->texs *= 2;
280 } 294 }
281} 295}
282 296
283static maprow * 297static maprow *
284map_get_row (CFPlus__Map self, int y) 298map_get_row (DC__Map self, int y)
285{ 299{
286 if (0 > y) 300 if (0 > y)
287 { 301 {
288 int extend = - y + MAP_EXTEND_Y; 302 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 303 Prepend (maprow, self->row, self->rows, extend);
327 341
328 return row->col + (x - row->c0); 342 return row->col + (x - row->c0);
329} 343}
330 344
331static mapcell * 345static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 346map_get_cell (DC__Map self, int x, int y)
333{ 347{
334 return row_get_cell (map_get_row (self, y), x); 348 return row_get_cell (map_get_row (self, y), x);
335} 349}
336 350
337static void 351static void
338map_clear (CFPlus__Map self) 352map_clear (DC__Map self)
339{ 353{
340 int r; 354 int r;
341 355
342 for (r = 0; r < self->rows; r++) 356 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 357 Safefree (self->row[r].col);
351 self->row = 0; 365 self->row = 0;
352 self->rows = 0; 366 self->rows = 0;
353} 367}
354 368
355static void 369static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 370map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 371{
358 int x, y; 372 int x, y;
359 maprow *row; 373 maprow *row;
360 mapcell *cell; 374 mapcell *cell;
361 375
498 return 0; 512 return 0;
499 513
500 return 1; 514 return 1;
501} 515}
502 516
503MODULE = CFPlus PACKAGE = CFPlus 517MODULE = Deliantra::Client PACKAGE = DC
504 518
505PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
506 520
507BOOT: 521BOOT:
508{ 522{
509 HV *stash = gv_stashpv ("CFPlus", 1); 523 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 524 static const struct {
511 const char *name; 525 const char *name;
512 IV iv; 526 IV iv;
513 } *civ, const_iv[] = { 527 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 528# define const_iv(name) { # name, (IV)name }
619 const_iv (KMOD_LMETA), 633 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 634 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 635 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 636 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 637 const_iv (KMOD_MODE),
638
639 const_iv (MIX_DEFAULT_FORMAT),
624# undef const_iv 640# undef const_iv
625 }; 641 };
626 642
627 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; )
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
657 CODE: 673 CODE:
658{ 674{
659 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
660 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);
661 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
678#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif
662} 682}
663 683
664char * 684char *
665SDL_GetError () 685SDL_GetError ()
666 686
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 719
700 if (m && m != (SDL_Rect **)-1) 720 if (m && m != (SDL_Rect **)-1)
701 while (*m) 721 while (*m)
702 { 722 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 723 if ((*m)->w >= 800 && (*m)->h >= 480)
704 { 724 {
705 AV *av = newAV (); 725 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 726 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 727 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 728 av_push (av, newSViv (rgb));
732 752
733 if (RETVAL) 753 if (RETVAL)
734 { 754 {
735 av_clear (texture_av); 755 av_clear (texture_av);
736 756
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 758#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 759#include "glfunc.h"
740#undef GL_FUNC 760#undef GL_FUNC
741 } 761 }
742} 762}
768 { 788 {
769 case SDL_KEYDOWN: 789 case SDL_KEYDOWN:
770 case SDL_KEYUP: 790 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 791 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 792 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 793 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
774 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 794 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 795 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 796 break;
777 797
778 case SDL_ACTIVEEVENT: 798 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 799 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 817 x = ev.motion.x;
798 y = ev.motion.y; 818 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 819 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 820 }
801 821
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 822 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 823 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 824 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 825 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 826 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 827 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 828 }
809 break; 829 break;
810 830
811 case SDL_MOUSEBUTTONDOWN: 831 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 832 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 833 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 834
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 835 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 836 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 837 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 838 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 843 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 844 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 845 break;
826 } 846 }
827 847
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 848 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 849 }
830} 850}
831 851
832int 852int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 853Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 854 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 855 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 856 Mix_ChannelFinished (channel_finished);
857
858void
859Mix_QuerySpec ()
860 PPCODE:
861{
862 int freq, channels;
863 Uint16 format;
864
865 if (Mix_QuerySpec (&freq, &format, &channels))
866 {
867 EXTEND (SP, 3);
868 PUSHs (sv_2mortal (newSViv (freq)));
869 PUSHs (sv_2mortal (newSViv (format)));
870 PUSHs (sv_2mortal (newSViv (channels)));
871 }
872}
837 873
838void 874void
839Mix_CloseAudio () 875Mix_CloseAudio ()
840 876
841int 877int
975void 1011void
976error (char *message) 1012error (char *message)
977 CODE: 1013 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1014 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1015#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1016 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1017#endif
982 1018
983void 1019void
984fatal (char *message) 1020fatal (char *message)
985 CODE: 1021 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1022 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1023#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1024 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1025#endif
990 _exit (1); 1026 _exit (1);
991 1027
992void 1028void
993_exit (int retval = 0) 1029_exit (int retval = 0)
1005#if DEBUG 1041#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1042 VALGRIND_DO_LEAK_CHECK;
1007#endif 1043#endif
1008} 1044}
1009 1045
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1046MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1047
1012PROTOTYPES: DISABLE 1048PROTOTYPES: DISABLE
1013 1049
1014CFPlus::Font 1050DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1051new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1052 CODE:
1017{ 1053{
1018 int count; 1054 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1055 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1022} 1058}
1023 OUTPUT: 1059 OUTPUT:
1024 RETVAL 1060 RETVAL
1025 1061
1026void 1062void
1027DESTROY (CFPlus::Font self) 1063DESTROY (DC::Font self)
1028 CODE: 1064 CODE:
1029 pango_font_description_free (self); 1065 pango_font_description_free (self);
1030 1066
1031void 1067void
1032make_default (CFPlus::Font self) 1068make_default (DC::Font self)
1033 PROTOTYPE: $ 1069 PROTOTYPE: $
1034 CODE: 1070 CODE:
1035 default_font = self; 1071 default_font = self;
1036 1072
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1073MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1074
1039PROTOTYPES: DISABLE 1075PROTOTYPES: DISABLE
1040 1076
1041void 1077void
1042reset_glyph_cache () 1078glyph_cache_backup ()
1043 PROTOTYPE: 1079 PROTOTYPE:
1044 CODE: 1080 CODE:
1081 tc_backup ();
1082
1083void
1084glyph_cache_restore ()
1085 PROTOTYPE:
1086 CODE:
1045 tc_clear (); 1087 tc_restore ();
1046 1088
1047CFPlus::Layout 1089DC::Layout
1048new (SV *class) 1090new (SV *class)
1049 CODE: 1091 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1092 New (0, RETVAL, 1, struct cf_layout);
1051 1093
1052 RETVAL->pl = pango_layout_new (opengl_context); 1094 RETVAL->pl = pango_layout_new (opengl_context);
1062 layout_update_font (RETVAL); 1104 layout_update_font (RETVAL);
1063 OUTPUT: 1105 OUTPUT:
1064 RETVAL 1106 RETVAL
1065 1107
1066void 1108void
1067DESTROY (CFPlus::Layout self) 1109DESTROY (DC::Layout self)
1068 CODE: 1110 CODE:
1069 g_object_unref (self->pl); 1111 g_object_unref (self->pl);
1070 rc_free (self->rc); 1112 rc_free (self->rc);
1071 Safefree (self); 1113 Safefree (self);
1072 1114
1073void 1115void
1074set_text (CFPlus::Layout self, SV *text_) 1116set_text (DC::Layout self, SV *text_)
1075 CODE: 1117 CODE:
1076{ 1118{
1077 STRLEN textlen; 1119 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1120 char *text = SvPVutf8 (text_, textlen);
1079 1121
1080 pango_layout_set_text (self->pl, text, textlen); 1122 pango_layout_set_text (self->pl, text, textlen);
1081} 1123}
1082 1124
1083void 1125void
1084set_markup (CFPlus::Layout self, SV *text_) 1126set_markup (DC::Layout self, SV *text_)
1085 CODE: 1127 CODE:
1086{ 1128{
1087 STRLEN textlen; 1129 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1130 char *text = SvPVutf8 (text_, textlen);
1089 1131
1090 pango_layout_set_markup (self->pl, text, textlen); 1132 pango_layout_set_markup (self->pl, text, textlen);
1091} 1133}
1092 1134
1093void 1135void
1094set_shapes (CFPlus::Layout self, ...) 1136set_shapes (DC::Layout self, ...)
1095 CODE: 1137 CODE:
1096{ 1138{
1097 PangoAttrList *attrs = 0; 1139 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1140 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1141 const char *pos = text;
1134 if (attrs) 1176 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1177 pango_layout_set_attributes (self->pl, attrs);
1136} 1178}
1137 1179
1138void 1180void
1139get_shapes (CFPlus::Layout self) 1181get_shapes (DC::Layout self)
1140 PPCODE: 1182 PPCODE:
1141{ 1183{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1184 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1185
1144 do 1186 do
1145 { 1187 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1188 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1189
1148 if (run && shape_attr_p (run)) 1190 if (run && shape_attr_p (run))
1149 { 1191 {
1150 PangoRectangle extents; 1192 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1193 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1201
1160 pango_layout_iter_free (iter); 1202 pango_layout_iter_free (iter);
1161} 1203}
1162 1204
1163int 1205int
1164has_wrapped (CFPlus::Layout self) 1206has_wrapped (DC::Layout self)
1165 CODE: 1207 CODE:
1166{ 1208{
1167 int lines = 1; 1209 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1210 const char *text = pango_layout_get_text (self->pl);
1169 1211
1174} 1216}
1175 OUTPUT: 1217 OUTPUT:
1176 RETVAL 1218 RETVAL
1177 1219
1178SV * 1220SV *
1179get_text (CFPlus::Layout self) 1221get_text (DC::Layout self)
1180 CODE: 1222 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1223 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1224 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1225 OUTPUT:
1184 RETVAL 1226 RETVAL
1185 1227
1186void 1228void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1229set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1230 CODE:
1189 self->r = r; 1231 self->r = r;
1190 self->g = g; 1232 self->g = g;
1191 self->b = b; 1233 self->b = b;
1192 self->a = a; 1234 self->a = a;
1193 1235
1194void 1236void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1237set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1238 CODE:
1197 if (self->font != font) 1239 if (self->font != font)
1198 { 1240 {
1199 self->font = font; 1241 self->font = font;
1200 layout_update_font (self); 1242 layout_update_font (self);
1201 } 1243 }
1202 1244
1203void 1245void
1204set_height (CFPlus::Layout self, int base_height) 1246set_height (DC::Layout self, int base_height)
1205 CODE: 1247 CODE:
1206 if (self->base_height != base_height) 1248 if (self->base_height != base_height)
1207 { 1249 {
1208 self->base_height = base_height; 1250 self->base_height = base_height;
1209 layout_update_font (self); 1251 layout_update_font (self);
1210 } 1252 }
1211 1253
1212void 1254void
1213set_width (CFPlus::Layout self, int max_width = -1) 1255set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1256 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1257 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1258
1217void 1259void
1218set_indent (CFPlus::Layout self, int indent) 1260set_indent (DC::Layout self, int indent)
1219 CODE: 1261 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1262 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1263
1222void 1264void
1223set_spacing (CFPlus::Layout self, int spacing) 1265set_spacing (DC::Layout self, int spacing)
1224 CODE: 1266 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1267 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1268
1227void 1269void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1270set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1271 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1272 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1273 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1274 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1275 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1276 : PANGO_ELLIPSIZE_NONE
1235 ); 1277 );
1236 1278
1237void 1279void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1280set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1281 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1282 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1283
1242void 1284void
1243size (CFPlus::Layout self) 1285size (DC::Layout self)
1244 PPCODE: 1286 PPCODE:
1245{ 1287{
1246 int w, h; 1288 int w, h;
1247 1289
1248 layout_get_pixel_size (self, &w, &h); 1290 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1293 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1294 PUSHs (sv_2mortal (newSViv (h)));
1253} 1295}
1254 1296
1255int 1297int
1256descent (CFPlus::Layout self) 1298descent (DC::Layout self)
1257 CODE: 1299 CODE:
1258{ 1300{
1259 PangoRectangle rect; 1301 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1302 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1303 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1304 RETVAL = PANGO_DESCENT (rect);
1263} 1305}
1264 OUTPUT: 1306 OUTPUT:
1265 RETVAL 1307 RETVAL
1266 1308
1267int 1309int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1310xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1311 CODE:
1270{ 1312{
1271 int index, trailing; 1313 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1314 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1315 RETVAL = index + trailing;
1274} 1316}
1275 OUTPUT: 1317 OUTPUT:
1276 RETVAL 1318 RETVAL
1277 1319
1278void 1320void
1279cursor_pos (CFPlus::Layout self, int index) 1321cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1322 PPCODE:
1281{ 1323{
1282 PangoRectangle strong_pos; 1324 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1325 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1326
1285 EXTEND (SP, 3); 1327 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1328 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1329 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1330 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1331}
1290 1332
1291void 1333void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1334index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1335 PPCODE:
1294{ 1336{
1295 int line, x; 1337 int line, x;
1296 1338
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1339 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1340#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1341 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1342 --line;
1343#endif
1300 EXTEND (SP, 2); 1344 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1345 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1347}
1304 1348
1305void 1349void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1350line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1351 PPCODE:
1308{ 1352{
1309 PangoLayoutLine *lp; 1353 PangoLayoutLine *lp;
1310 int index, trailing; 1354 int index, trailing;
1311 1355
1312 if (line < 0) 1356 if (line < 0)
1313 XSRETURN_EMPTY; 1357 XSRETURN_EMPTY;
1314 1358
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1359 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1360 XSRETURN_EMPTY; /* do better */
1317 1361
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1362 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1363
1320 EXTEND (SP, 2); 1364 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1370 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1371 }
1328} 1372}
1329 1373
1330void 1374void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1375render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1376 CODE:
1333 rc_clear (self->rc); 1377 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1378 pango_opengl_render_layout_subpixel (
1335 self->pl, 1379 self->pl,
1336 self->rc, 1380 self->rc,
1341 // we assume that context_change actually clears/frees stuff 1385 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1386 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1387 pango_layout_context_changed (self->pl);
1344 1388
1345void 1389void
1346draw (CFPlus::Layout self) 1390draw (DC::Layout self)
1347 CODE: 1391 CODE:
1348{ 1392{
1349 glEnable (GL_TEXTURE_2D); 1393 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1394 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1395 glEnable (GL_BLEND);
1359 glDisable (GL_ALPHA_TEST); 1403 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1404 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1405 glDisable (GL_TEXTURE_2D);
1362} 1406}
1363 1407
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1408MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1409
1366PROTOTYPES: ENABLE 1410PROTOTYPES: ENABLE
1367 1411
1368void 1412void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1413pad (SV *data_, int ow, int oh, int nw, int nh)
1448 RETVAL = width > 0; 1492 RETVAL = width > 0;
1449} 1493}
1450 OUTPUT: 1494 OUTPUT:
1451 RETVAL 1495 RETVAL
1452 1496
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1497MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1498
1455PROTOTYPES: DISABLE 1499PROTOTYPES: DISABLE
1456 1500
1457CFPlus::Map 1501DC::Map
1458new (SV *class) 1502new (SV *class)
1459 CODE: 1503 CODE:
1460 New (0, RETVAL, 1, struct map); 1504 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1505 RETVAL->x = 0;
1462 RETVAL->y = 0; 1506 RETVAL->y = 0;
1470 RETVAL->row = 0; 1514 RETVAL->row = 0;
1471 OUTPUT: 1515 OUTPUT:
1472 RETVAL 1516 RETVAL
1473 1517
1474void 1518void
1475DESTROY (CFPlus::Map self) 1519DESTROY (DC::Map self)
1476 CODE: 1520 CODE:
1477{ 1521{
1478 map_clear (self); 1522 map_clear (self);
1479 Safefree (self->face2tile); 1523 Safefree (self->face2tile);
1480 Safefree (self->tex); 1524 Safefree (self->tex);
1481 Safefree (self); 1525 Safefree (self);
1482} 1526}
1483 1527
1484void 1528void
1485resize (CFPlus::Map self, int map_width, int map_height) 1529resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1530 CODE:
1487 self->w = map_width; 1531 self->w = map_width;
1488 self->h = map_height; 1532 self->h = map_height;
1489 1533
1490void 1534void
1491clear (CFPlus::Map self) 1535clear (DC::Map self)
1492 CODE: 1536 CODE:
1493 map_clear (self); 1537 map_clear (self);
1494 1538
1495void 1539void
1496set_tileid (CFPlus::Map self, int face, int tile) 1540set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1541 CODE:
1498{ 1542{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1543 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1544 need_texid (self, tile);
1501} 1545}
1502 1546
1503void 1547void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1548set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1549 CODE:
1506{ 1550{
1507 tileid texid; 1551 tileid texid;
1508 maptex *tex; 1552 maptex *tex;
1509 1553
1522 tex->smoothtile = self->face2tile [smooth]; 1566 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1567 tex->smoothlevel = level;
1524} 1568}
1525 1569
1526void 1570void
1527set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1571set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528 CODE: 1572 CODE:
1529{ 1573{
1530 need_texid (self, texid); 1574 need_texid (self, texid);
1531 1575
1532 { 1576 {
1552 // from transparent color bleeding and ugly wrapping effects. 1596 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1597 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1598}
1555 1599
1556int 1600int
1557ox (CFPlus::Map self) 1601ox (DC::Map self)
1558 ALIAS: 1602 ALIAS:
1559 oy = 1 1603 oy = 1
1560 x = 2 1604 x = 2
1561 y = 3 1605 y = 3
1562 w = 4 1606 w = 4
1573 } 1617 }
1574 OUTPUT: 1618 OUTPUT:
1575 RETVAL 1619 RETVAL
1576 1620
1577void 1621void
1578scroll (CFPlus::Map self, int dx, int dy) 1622scroll (DC::Map self, int dx, int dy)
1579 CODE: 1623 CODE:
1580{ 1624{
1581 if (dx > 0) 1625 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1626 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1627 else if (dx < 0)
1599 self->y += MAP_EXTEND_Y; 1643 self->y += MAP_EXTEND_Y;
1600 } 1644 }
1601} 1645}
1602 1646
1603SV * 1647SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1648map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1649 CODE:
1606{ 1650{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1651 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1652 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1653 mapcell *cell;
1698} 1742}
1699 OUTPUT: 1743 OUTPUT:
1700 RETVAL 1744 RETVAL
1701 1745
1702SV * 1746SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1747mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 1748 CODE:
1705{ 1749{
1706 int x1, x; 1750 int x1, x;
1707 int y1, y; 1751 int y1, y;
1708 int z; 1752 int z;
1753} 1797}
1754 OUTPUT: 1798 OUTPUT:
1755 RETVAL 1799 RETVAL
1756 1800
1757void 1801void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1802draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1759 CODE: 1803 CODE:
1760{ 1804{
1761 int x, y, z; 1805 int x, y, z;
1762 1806
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1807 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2034 } 2078 }
2035 } 2079 }
2036} 2080}
2037 2081
2038void 2082void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2083draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2040 CODE: 2084 CODE:
2041{ 2085{
2042 static float color[16][3] = { 2086 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2087 { 0.00F, 0.00F, 0.00F },
2044 { 1.00F, 1.00F, 1.00F }, 2088 { 1.00F, 1.00F, 1.00F },
2094 glDisable (GL_BLEND); 2138 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2139 glDisable (GL_TEXTURE_2D);
2096} 2140}
2097 2141
2098void 2142void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2143fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2144 PPCODE:
2101{ 2145{
2102 int x, y; 2146 int x, y;
2103 int sw1 = sw + 2; 2147 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2148 int sh1 = sh + 2;
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2219 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2220 PUSHs (darkness3_sv);
2177} 2221}
2178 2222
2179SV * 2223SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2224get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2225 CODE:
2182{ 2226{
2183 int x, y, x1, y1; 2227 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2228 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2229 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2250} 2294}
2251 OUTPUT: 2295 OUTPUT:
2252 RETVAL 2296 RETVAL
2253 2297
2254void 2298void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2299set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2256 PPCODE: 2300 PPCODE:
2257{ 2301{
2258 int x, y, z; 2302 int x, y, z;
2259 int w, h; 2303 int w, h;
2260 int x1, y1; 2304 int x1, y1;
2313 } 2357 }
2314 } 2358 }
2315 } 2359 }
2316} 2360}
2317 2361
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2362MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2363
2320CFPlus::RW 2364DC::RW
2321new (SV *class, SV *data_sv) 2365new (SV *class, SV *data_sv)
2322 CODE: 2366 CODE:
2323{ 2367{
2324 STRLEN datalen; 2368 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2369 char *data = SvPVbyte (data_sv, datalen);
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2371 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2372}
2329 OUTPUT: 2373 OUTPUT:
2330 RETVAL 2374 RETVAL
2331 2375
2332CFPlus::RW 2376DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2377new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2378 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2379 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2380 OUTPUT:
2337 RETVAL 2381 RETVAL
2338 2382
2339# fails on win32: 2383# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2384# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2385#void
2342#close (CFPlus::RW self) 2386#close (DC::RW self)
2343# CODE: 2387# CODE:
2344# (self->(close)) (self); 2388# (self->(close)) (self);
2345 2389
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2390MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2391
2348PROTOTYPES: DISABLE 2392PROTOTYPES: DISABLE
2349 2393
2350CFPlus::Channel 2394DC::Channel
2351find () 2395find ()
2352 CODE: 2396 CODE:
2353{ 2397{
2354 RETVAL = Mix_GroupAvailable (-1); 2398 RETVAL = Mix_GroupAvailable (-1);
2355 2399
2368} 2412}
2369 OUTPUT: 2413 OUTPUT:
2370 RETVAL 2414 RETVAL
2371 2415
2372void 2416void
2373halt (CFPlus::Channel self) 2417halt (DC::Channel self)
2374 CODE: 2418 CODE:
2375 Mix_HaltChannel (self); 2419 Mix_HaltChannel (self);
2376 2420
2377void 2421void
2378expire (CFPlus::Channel self, int ticks = -1) 2422expire (DC::Channel self, int ticks = -1)
2379 CODE: 2423 CODE:
2380 Mix_ExpireChannel (self, ticks); 2424 Mix_ExpireChannel (self, ticks);
2381 2425
2382void 2426void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2427fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2428 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2429 Mix_FadeOutChannel (self, ticks);
2386 2430
2387int 2431int
2388volume (CFPlus::Channel self, int volume) 2432volume (DC::Channel self, int volume)
2389 CODE: 2433 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2434 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2435 OUTPUT:
2392 RETVAL 2436 RETVAL
2393 2437
2394void 2438void
2395unregister_all_effects (CFPlus::Channel self) 2439unregister_all_effects (DC::Channel self)
2396 CODE: 2440 CODE:
2397 Mix_UnregisterAllEffects (self); 2441 Mix_UnregisterAllEffects (self);
2398 2442
2399void 2443void
2400set_panning (CFPlus::Channel self, int left, int right) 2444set_panning (DC::Channel self, int left, int right)
2401 CODE: 2445 CODE:
2402 left = CLAMP (left , 0, 255); 2446 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2447 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2448 Mix_SetPanning (self, left, right);
2405 2449
2406void 2450void
2407set_distance (CFPlus::Channel self, int distance) 2451set_distance (DC::Channel self, int distance)
2408 CODE: 2452 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2453 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2454
2411void 2455void
2412set_position (CFPlus::Channel self, int angle, int distance) 2456set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2457 CODE:
2414 2458
2415void 2459void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2460set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2461 CODE:
2418{ 2462{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2463 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2464 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2465 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2466}
2423 2467
2424void 2468void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2469set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2470 CODE:
2427 Mix_SetReverseStereo (self, flip); 2471 Mix_SetReverseStereo (self, flip);
2428 2472
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2473MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2474
2431PROTOTYPES: DISABLE 2475PROTOTYPES: DISABLE
2432 2476
2433CFPlus::MixChunk 2477DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2478new (SV *class, DC::RW rwops)
2435 CODE: 2479 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2480 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2481 OUTPUT:
2438 RETVAL 2482 RETVAL
2439 2483
2440void 2484void
2441DESTROY (CFPlus::MixChunk self) 2485DESTROY (DC::MixChunk self)
2442 CODE: 2486 CODE:
2443 Mix_FreeChunk (self); 2487 Mix_FreeChunk (self);
2444 2488
2445int 2489int
2446volume (CFPlus::MixChunk self, int volume = -1) 2490volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2491 CODE:
2448 if (items > 1) 2492 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2493 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2494 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2495 OUTPUT:
2452 RETVAL 2496 RETVAL
2453 2497
2454CFPlus::Channel 2498DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2499play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2500 CODE:
2457{ 2501{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2502 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2503
2460 if (RETVAL < 0) 2504 if (RETVAL < 0)
2467 } 2511 }
2468} 2512}
2469 OUTPUT: 2513 OUTPUT:
2470 RETVAL 2514 RETVAL
2471 2515
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2516MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2517
2474int 2518int
2475volume (int volume = -1) 2519volume (int volume = -1)
2476 PROTOTYPE: ;$ 2520 PROTOTYPE: ;$
2477 CODE: 2521 CODE:
2489void 2533void
2490halt () 2534halt ()
2491 CODE: 2535 CODE:
2492 Mix_HaltMusic (); 2536 Mix_HaltMusic ();
2493 2537
2494CFPlus::MixMusic 2538DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2539new (SV *class, DC::RW rwops)
2496 CODE: 2540 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2541 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2542 OUTPUT:
2499 RETVAL 2543 RETVAL
2500 2544
2501void 2545void
2502DESTROY (CFPlus::MixMusic self) 2546DESTROY (DC::MixMusic self)
2503 CODE: 2547 CODE:
2504 Mix_FreeMusic (self); 2548 Mix_FreeMusic (self);
2505 2549
2506int 2550int
2507play (CFPlus::MixMusic self, int loops = -1) 2551play (DC::MixMusic self, int loops = -1)
2508 CODE: 2552 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2553 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2554 OUTPUT:
2511 RETVAL 2555 RETVAL
2512 2556
2513void 2557void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2558fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2559 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2560 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2561
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2562MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2563
2520PROTOTYPES: ENABLE 2564PROTOTYPES: ENABLE
2521 2565
2522BOOT: 2566BOOT:
2523{ 2567{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2568 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2569 static const struct {
2526 const char *name; 2570 const char *name;
2527 IV iv; 2571 IV iv;
2528 } *civ, const_iv[] = { 2572 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2573# define const_iv(name) { # name, (IV)name }
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2866void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 2867 CODE:
2824 if (gl.SeparableFilter2D) 2868 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2869 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 2870
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2871void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 2872
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2873void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 2874
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 2875void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 2876
2858 2902
2859void glEndList () 2903void glEndList ()
2860 2904
2861void glCallList (int list) 2905void glCallList (int list)
2862 2906
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2907MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 2908
2865PROTOTYPES: DISABLE 2909PROTOTYPES: DISABLE
2866 2910
2867void 2911void
2868find_widget (SV *self, NV x, NV y) 2912find_widget (SV *self, NV x, NV y)
2872 XPUSHs (self); 2916 XPUSHs (self);
2873} 2917}
2874 2918
2875BOOT: 2919BOOT:
2876{ 2920{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2921 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 2922
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2923 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2924 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2925 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2926 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 2927}
2884 2928
2885void 2929void
2886draw (SV *self) 2930draw (SV *self)
2887 CODE: 2931 CODE:
2894 SV *draw_w_sv = GvSV (draw_w_gv); 2938 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 2939 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 2940 double draw_x, draw_y;
2897 2941
2898 if (!SvROK (self)) 2942 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2943 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 2944
2901 hv = (HV *)SvRV (self); 2945 hv = (HV *)SvRV (self);
2902 2946
2903 if (SvTYPE (hv) != SVt_PVHV) 2947 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2948 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 2949
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2950 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2951 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 2952
2909 if (!h || !w) 2953 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines