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.238 by root, Sat Nov 3 12:08:43 2007 UTC vs.
Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
56#endif
57
51#ifndef _WIN32 58#ifndef _WIN32
52# include <sys/types.h> 59# include <sys/types.h>
53# include <sys/socket.h> 60# include <sys/socket.h>
54# include <netinet/in.h> 61# include <netinet/in.h>
55# include <netinet/tcp.h> 62# include <netinet/tcp.h>
63#define MAP_EXTEND_X 32 70#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 71#define MAP_EXTEND_Y 512
65 72
66#define MIN_FONT_HEIGHT 10 73#define MIN_FONT_HEIGHT 10
67 74
75/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77
68#if 0 78#if 0
69# define PARACHUTE SDL_INIT_NOPARACHUTE 79# define PARACHUTE SDL_INIT_NOPARACHUTE
70#else 80#else
71# define PARACHUTE 0 81# define PARACHUTE 0
72#endif 82#endif
120 130
121#include "pango-font.c" 131#include "pango-font.c"
122#include "pango-fontmap.c" 132#include "pango-fontmap.c"
123#include "pango-render.c" 133#include "pango-render.c"
124 134
125typedef IV CFPlus__Channel; 135typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 136typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 137typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 138typedef Mix_Music *DC__MixMusic;
129 139
130typedef PangoFontDescription *CFPlus__Font; 140typedef PangoFontDescription *DC__Font;
131 141
132static int 142static int
133shape_attr_p (PangoLayoutRun *run) 143shape_attr_p (PangoLayoutRun *run)
134{ 144{
135 GSList *attrs = run->item->analysis.extra_attrs; 145 GSList *attrs = run->item->analysis.extra_attrs;
149 159
150typedef struct cf_layout { 160typedef struct cf_layout {
151 PangoLayout *pl; 161 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 162 float r, g, b, a; // default color for rgba mode
153 int base_height; 163 int base_height;
154 CFPlus__Font font; 164 DC__Font font;
155 rc_t *rc; 165 rc_t *rc;
156} *CFPlus__Layout; 166} *DC__Layout;
157 167
158static CFPlus__Font default_font; 168static DC__Font default_font;
159static PangoContext *opengl_context; 169static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 170static PangoFontMap *opengl_fontmap;
161 171
162static void 172static void
163substitute_func (FcPattern *pattern, gpointer data) 173substitute_func (FcPattern *pattern, gpointer data)
168#endif 178#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 179 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 180}
171 181
172static void 182static void
173layout_update_font (CFPlus__Layout self) 183layout_update_font (DC__Layout self)
174{ 184{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 185 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 186 * reasonably well with bitstream vera
177 */ 187 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 188 PangoFontDescription *font = self->font ? self->font : default_font;
182 192
183 pango_layout_set_font_description (self->pl, font); 193 pango_layout_set_font_description (self->pl, font);
184} 194}
185 195
186static void 196static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 197layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 198{
189 PangoRectangle rect; 199 PangoRectangle rect;
190 200
191 // get_pixel_* wrongly rounds down 201 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 202 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 241 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 242 int texs; maptex *tex; // [tileid]
233 243
234 int32_t rows; 244 int32_t rows;
235 maprow *row; 245 maprow *row;
236} *CFPlus__Map; 246} *DC__Map;
237 247
238static char * 248static char *
239prepend (char *ptr, int sze, int inc) 249prepend (char *ptr, int sze, int inc)
240{ 250{
241 char *p; 251 char *p;
279 self->texs *= 2; 289 self->texs *= 2;
280 } 290 }
281} 291}
282 292
283static maprow * 293static maprow *
284map_get_row (CFPlus__Map self, int y) 294map_get_row (DC__Map self, int y)
285{ 295{
286 if (0 > y) 296 if (0 > y)
287 { 297 {
288 int extend = - y + MAP_EXTEND_Y; 298 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 299 Prepend (maprow, self->row, self->rows, extend);
327 337
328 return row->col + (x - row->c0); 338 return row->col + (x - row->c0);
329} 339}
330 340
331static mapcell * 341static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 342map_get_cell (DC__Map self, int x, int y)
333{ 343{
334 return row_get_cell (map_get_row (self, y), x); 344 return row_get_cell (map_get_row (self, y), x);
335} 345}
336 346
337static void 347static void
338map_clear (CFPlus__Map self) 348map_clear (DC__Map self)
339{ 349{
340 int r; 350 int r;
341 351
342 for (r = 0; r < self->rows; r++) 352 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 353 Safefree (self->row[r].col);
351 self->row = 0; 361 self->row = 0;
352 self->rows = 0; 362 self->rows = 0;
353} 363}
354 364
355static void 365static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 366map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 367{
358 int x, y; 368 int x, y;
359 maprow *row; 369 maprow *row;
360 mapcell *cell; 370 mapcell *cell;
361 371
498 return 0; 508 return 0;
499 509
500 return 1; 510 return 1;
501} 511}
502 512
503MODULE = CFPlus PACKAGE = CFPlus 513MODULE = Deliantra::Client PACKAGE = DC
504 514
505PROTOTYPES: ENABLE 515PROTOTYPES: ENABLE
506 516
507BOOT: 517BOOT:
508{ 518{
509 HV *stash = gv_stashpv ("CFPlus", 1); 519 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 520 static const struct {
511 const char *name; 521 const char *name;
512 IV iv; 522 IV iv;
513 } *civ, const_iv[] = { 523 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 524# define const_iv(name) { # name, (IV)name }
659 CODE: 669 CODE:
660{ 670{
661 opengl_fontmap = pango_opengl_font_map_new (); 671 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 672 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif
664} 678}
665 679
666char * 680char *
667SDL_GetError () 681SDL_GetError ()
668 682
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 715
702 if (m && m != (SDL_Rect **)-1) 716 if (m && m != (SDL_Rect **)-1)
703 while (*m) 717 while (*m)
704 { 718 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 719 if ((*m)->w >= 800 && (*m)->h >= 480)
706 { 720 {
707 AV *av = newAV (); 721 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 722 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 723 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 724 av_push (av, newSViv (rgb));
770 { 784 {
771 case SDL_KEYDOWN: 785 case SDL_KEYDOWN:
772 case SDL_KEYUP: 786 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 789 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 790 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 792 break;
779 793
780 case SDL_ACTIVEEVENT: 794 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 813 x = ev.motion.x;
800 y = ev.motion.y; 814 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 816 }
803 817
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 819 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 820 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 821 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 822 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 823 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 824 }
811 break; 825 break;
812 826
813 case SDL_MOUSEBUTTONDOWN: 827 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 828 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 829 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 830
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 831 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 833 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 834 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 839 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 840 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 841 break;
828 } 842 }
829 843
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 844 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 845 }
832} 846}
833 847
834int 848int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 849Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
993void 1007void
994error (char *message) 1008error (char *message)
995 CODE: 1009 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1010 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1011#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1012 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1013#endif
1000 1014
1001void 1015void
1002fatal (char *message) 1016fatal (char *message)
1003 CODE: 1017 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1018 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1019#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1020 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1021#endif
1008 _exit (1); 1022 _exit (1);
1009 1023
1010void 1024void
1011_exit (int retval = 0) 1025_exit (int retval = 0)
1023#if DEBUG 1037#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1038 VALGRIND_DO_LEAK_CHECK;
1025#endif 1039#endif
1026} 1040}
1027 1041
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1042MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1043
1030PROTOTYPES: DISABLE 1044PROTOTYPES: DISABLE
1031 1045
1032CFPlus::Font 1046DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1047new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1048 CODE:
1035{ 1049{
1036 int count; 1050 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1054}
1041 OUTPUT: 1055 OUTPUT:
1042 RETVAL 1056 RETVAL
1043 1057
1044void 1058void
1045DESTROY (CFPlus::Font self) 1059DESTROY (DC::Font self)
1046 CODE: 1060 CODE:
1047 pango_font_description_free (self); 1061 pango_font_description_free (self);
1048 1062
1049void 1063void
1050make_default (CFPlus::Font self) 1064make_default (DC::Font self)
1051 PROTOTYPE: $ 1065 PROTOTYPE: $
1052 CODE: 1066 CODE:
1053 default_font = self; 1067 default_font = self;
1054 1068
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1069MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1070
1057PROTOTYPES: DISABLE 1071PROTOTYPES: DISABLE
1058 1072
1059void 1073void
1060reset_glyph_cache () 1074glyph_cache_backup ()
1061 PROTOTYPE: 1075 PROTOTYPE:
1062 CODE: 1076 CODE:
1077 tc_backup ();
1078
1079void
1080glyph_cache_restore ()
1081 PROTOTYPE:
1082 CODE:
1063 tc_clear (); 1083 tc_restore ();
1064 1084
1065CFPlus::Layout 1085DC::Layout
1066new (SV *class) 1086new (SV *class)
1067 CODE: 1087 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1088 New (0, RETVAL, 1, struct cf_layout);
1069 1089
1070 RETVAL->pl = pango_layout_new (opengl_context); 1090 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1100 layout_update_font (RETVAL);
1081 OUTPUT: 1101 OUTPUT:
1082 RETVAL 1102 RETVAL
1083 1103
1084void 1104void
1085DESTROY (CFPlus::Layout self) 1105DESTROY (DC::Layout self)
1086 CODE: 1106 CODE:
1087 g_object_unref (self->pl); 1107 g_object_unref (self->pl);
1088 rc_free (self->rc); 1108 rc_free (self->rc);
1089 Safefree (self); 1109 Safefree (self);
1090 1110
1091void 1111void
1092set_text (CFPlus::Layout self, SV *text_) 1112set_text (DC::Layout self, SV *text_)
1093 CODE: 1113 CODE:
1094{ 1114{
1095 STRLEN textlen; 1115 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1116 char *text = SvPVutf8 (text_, textlen);
1097 1117
1098 pango_layout_set_text (self->pl, text, textlen); 1118 pango_layout_set_text (self->pl, text, textlen);
1099} 1119}
1100 1120
1101void 1121void
1102set_markup (CFPlus::Layout self, SV *text_) 1122set_markup (DC::Layout self, SV *text_)
1103 CODE: 1123 CODE:
1104{ 1124{
1105 STRLEN textlen; 1125 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
1107 1127
1108 pango_layout_set_markup (self->pl, text, textlen); 1128 pango_layout_set_markup (self->pl, text, textlen);
1109} 1129}
1110 1130
1111void 1131void
1112set_shapes (CFPlus::Layout self, ...) 1132set_shapes (DC::Layout self, ...)
1113 CODE: 1133 CODE:
1114{ 1134{
1115 PangoAttrList *attrs = 0; 1135 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1136 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1137 const char *pos = text;
1152 if (attrs) 1172 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1173 pango_layout_set_attributes (self->pl, attrs);
1154} 1174}
1155 1175
1156void 1176void
1157get_shapes (CFPlus::Layout self) 1177get_shapes (DC::Layout self)
1158 PPCODE: 1178 PPCODE:
1159{ 1179{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1180 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1181
1162 do 1182 do
1163 { 1183 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1184 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1185
1166 if (run && shape_attr_p (run)) 1186 if (run && shape_attr_p (run))
1167 { 1187 {
1168 PangoRectangle extents; 1188 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1189 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1197
1178 pango_layout_iter_free (iter); 1198 pango_layout_iter_free (iter);
1179} 1199}
1180 1200
1181int 1201int
1182has_wrapped (CFPlus::Layout self) 1202has_wrapped (DC::Layout self)
1183 CODE: 1203 CODE:
1184{ 1204{
1185 int lines = 1; 1205 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1206 const char *text = pango_layout_get_text (self->pl);
1187 1207
1192} 1212}
1193 OUTPUT: 1213 OUTPUT:
1194 RETVAL 1214 RETVAL
1195 1215
1196SV * 1216SV *
1197get_text (CFPlus::Layout self) 1217get_text (DC::Layout self)
1198 CODE: 1218 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1219 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1220 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1221 OUTPUT:
1202 RETVAL 1222 RETVAL
1203 1223
1204void 1224void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1225set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1226 CODE:
1207 self->r = r; 1227 self->r = r;
1208 self->g = g; 1228 self->g = g;
1209 self->b = b; 1229 self->b = b;
1210 self->a = a; 1230 self->a = a;
1211 1231
1212void 1232void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1233set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1234 CODE:
1215 if (self->font != font) 1235 if (self->font != font)
1216 { 1236 {
1217 self->font = font; 1237 self->font = font;
1218 layout_update_font (self); 1238 layout_update_font (self);
1219 } 1239 }
1220 1240
1221void 1241void
1222set_height (CFPlus::Layout self, int base_height) 1242set_height (DC::Layout self, int base_height)
1223 CODE: 1243 CODE:
1224 if (self->base_height != base_height) 1244 if (self->base_height != base_height)
1225 { 1245 {
1226 self->base_height = base_height; 1246 self->base_height = base_height;
1227 layout_update_font (self); 1247 layout_update_font (self);
1228 } 1248 }
1229 1249
1230void 1250void
1231set_width (CFPlus::Layout self, int max_width = -1) 1251set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1252 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1253 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1254
1235void 1255void
1236set_indent (CFPlus::Layout self, int indent) 1256set_indent (DC::Layout self, int indent)
1237 CODE: 1257 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1258 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1259
1240void 1260void
1241set_spacing (CFPlus::Layout self, int spacing) 1261set_spacing (DC::Layout self, int spacing)
1242 CODE: 1262 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1263 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1264
1245void 1265void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1266set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1267 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1268 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1269 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1270 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1271 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1272 : PANGO_ELLIPSIZE_NONE
1253 ); 1273 );
1254 1274
1255void 1275void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1276set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1277 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1278 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1279
1260void 1280void
1261size (CFPlus::Layout self) 1281size (DC::Layout self)
1262 PPCODE: 1282 PPCODE:
1263{ 1283{
1264 int w, h; 1284 int w, h;
1265 1285
1266 layout_get_pixel_size (self, &w, &h); 1286 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1289 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1290 PUSHs (sv_2mortal (newSViv (h)));
1271} 1291}
1272 1292
1273int 1293int
1274descent (CFPlus::Layout self) 1294descent (DC::Layout self)
1275 CODE: 1295 CODE:
1276{ 1296{
1277 PangoRectangle rect; 1297 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1298 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1299 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1300 RETVAL = PANGO_DESCENT (rect);
1281} 1301}
1282 OUTPUT: 1302 OUTPUT:
1283 RETVAL 1303 RETVAL
1284 1304
1285int 1305int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1306xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1307 CODE:
1288{ 1308{
1289 int index, trailing; 1309 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1310 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1311 RETVAL = index + trailing;
1292} 1312}
1293 OUTPUT: 1313 OUTPUT:
1294 RETVAL 1314 RETVAL
1295 1315
1296void 1316void
1297cursor_pos (CFPlus::Layout self, int index) 1317cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1318 PPCODE:
1299{ 1319{
1300 PangoRectangle strong_pos; 1320 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1321 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1322
1303 EXTEND (SP, 3); 1323 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1324 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1325 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1326 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1327}
1308 1328
1309void 1329void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1330index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1331 PPCODE:
1312{ 1332{
1313 int line, x; 1333 int line, x;
1314 1334
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1338 --line;
1339#endif
1318 EXTEND (SP, 2); 1340 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1341 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1342 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1343}
1322 1344
1323void 1345void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1346line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1347 PPCODE:
1326{ 1348{
1327 PangoLayoutLine *lp; 1349 PangoLayoutLine *lp;
1328 int index, trailing; 1350 int index, trailing;
1329 1351
1330 if (line < 0) 1352 if (line < 0)
1331 XSRETURN_EMPTY; 1353 XSRETURN_EMPTY;
1332 1354
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1355 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1356 XSRETURN_EMPTY; /* do better */
1335 1357
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1358 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1359
1338 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1366 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1367 }
1346} 1368}
1347 1369
1348void 1370void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1371render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1372 CODE:
1351 rc_clear (self->rc); 1373 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1374 pango_opengl_render_layout_subpixel (
1353 self->pl, 1375 self->pl,
1354 self->rc, 1376 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1381 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1382 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1383 pango_layout_context_changed (self->pl);
1362 1384
1363void 1385void
1364draw (CFPlus::Layout self) 1386draw (DC::Layout self)
1365 CODE: 1387 CODE:
1366{ 1388{
1367 glEnable (GL_TEXTURE_2D); 1389 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1390 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1391 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1399 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1400 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1401 glDisable (GL_TEXTURE_2D);
1380} 1402}
1381 1403
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1404MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1405
1384PROTOTYPES: ENABLE 1406PROTOTYPES: ENABLE
1385 1407
1386void 1408void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1409pad (SV *data_, int ow, int oh, int nw, int nh)
1466 RETVAL = width > 0; 1488 RETVAL = width > 0;
1467} 1489}
1468 OUTPUT: 1490 OUTPUT:
1469 RETVAL 1491 RETVAL
1470 1492
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1493MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1494
1473PROTOTYPES: DISABLE 1495PROTOTYPES: DISABLE
1474 1496
1475CFPlus::Map 1497DC::Map
1476new (SV *class) 1498new (SV *class)
1477 CODE: 1499 CODE:
1478 New (0, RETVAL, 1, struct map); 1500 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1501 RETVAL->x = 0;
1480 RETVAL->y = 0; 1502 RETVAL->y = 0;
1488 RETVAL->row = 0; 1510 RETVAL->row = 0;
1489 OUTPUT: 1511 OUTPUT:
1490 RETVAL 1512 RETVAL
1491 1513
1492void 1514void
1493DESTROY (CFPlus::Map self) 1515DESTROY (DC::Map self)
1494 CODE: 1516 CODE:
1495{ 1517{
1496 map_clear (self); 1518 map_clear (self);
1497 Safefree (self->face2tile); 1519 Safefree (self->face2tile);
1498 Safefree (self->tex); 1520 Safefree (self->tex);
1499 Safefree (self); 1521 Safefree (self);
1500} 1522}
1501 1523
1502void 1524void
1503resize (CFPlus::Map self, int map_width, int map_height) 1525resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1526 CODE:
1505 self->w = map_width; 1527 self->w = map_width;
1506 self->h = map_height; 1528 self->h = map_height;
1507 1529
1508void 1530void
1509clear (CFPlus::Map self) 1531clear (DC::Map self)
1510 CODE: 1532 CODE:
1511 map_clear (self); 1533 map_clear (self);
1512 1534
1513void 1535void
1514set_tileid (CFPlus::Map self, int face, int tile) 1536set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1537 CODE:
1516{ 1538{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1539 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1540 need_texid (self, tile);
1519} 1541}
1520 1542
1521void 1543void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1544set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1545 CODE:
1524{ 1546{
1525 tileid texid; 1547 tileid texid;
1526 maptex *tex; 1548 maptex *tex;
1527 1549
1540 tex->smoothtile = self->face2tile [smooth]; 1562 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1563 tex->smoothlevel = level;
1542} 1564}
1543 1565
1544void 1566void
1545set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1567set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1546 CODE: 1568 CODE:
1547{ 1569{
1548 need_texid (self, texid); 1570 need_texid (self, texid);
1549 1571
1550 { 1572 {
1570 // from transparent color bleeding and ugly wrapping effects. 1592 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1594}
1573 1595
1574int 1596int
1575ox (CFPlus::Map self) 1597ox (DC::Map self)
1576 ALIAS: 1598 ALIAS:
1577 oy = 1 1599 oy = 1
1578 x = 2 1600 x = 2
1579 y = 3 1601 y = 3
1580 w = 4 1602 w = 4
1591 } 1613 }
1592 OUTPUT: 1614 OUTPUT:
1593 RETVAL 1615 RETVAL
1594 1616
1595void 1617void
1596scroll (CFPlus::Map self, int dx, int dy) 1618scroll (DC::Map self, int dx, int dy)
1597 CODE: 1619 CODE:
1598{ 1620{
1599 if (dx > 0) 1621 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1622 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1623 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1639 self->y += MAP_EXTEND_Y;
1618 } 1640 }
1619} 1641}
1620 1642
1621SV * 1643SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1644map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1645 CODE:
1624{ 1646{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1648 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1649 mapcell *cell;
1716} 1738}
1717 OUTPUT: 1739 OUTPUT:
1718 RETVAL 1740 RETVAL
1719 1741
1720SV * 1742SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1743mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 1744 CODE:
1723{ 1745{
1724 int x1, x; 1746 int x1, x;
1725 int y1, y; 1747 int y1, y;
1726 int z; 1748 int z;
1771} 1793}
1772 OUTPUT: 1794 OUTPUT:
1773 RETVAL 1795 RETVAL
1774 1796
1775void 1797void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1798draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1777 CODE: 1799 CODE:
1778{ 1800{
1779 int x, y, z; 1801 int x, y, z;
1780 1802
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2052 } 2074 }
2053 } 2075 }
2054} 2076}
2055 2077
2056void 2078void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2079draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058 CODE: 2080 CODE:
2059{ 2081{
2060 static float color[16][3] = { 2082 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2083 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2084 { 1.00F, 1.00F, 1.00F },
2112 glDisable (GL_BLEND); 2134 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2135 glDisable (GL_TEXTURE_2D);
2114} 2136}
2115 2137
2116void 2138void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2139fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2140 PPCODE:
2119{ 2141{
2120 int x, y; 2142 int x, y;
2121 int sw1 = sw + 2; 2143 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2144 int sh1 = sh + 2;
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2215 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2216 PUSHs (darkness3_sv);
2195} 2217}
2196 2218
2197SV * 2219SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2220get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2221 CODE:
2200{ 2222{
2201 int x, y, x1, y1; 2223 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2224 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2225 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2268} 2290}
2269 OUTPUT: 2291 OUTPUT:
2270 RETVAL 2292 RETVAL
2271 2293
2272void 2294void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2295set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2274 PPCODE: 2296 PPCODE:
2275{ 2297{
2276 int x, y, z; 2298 int x, y, z;
2277 int w, h; 2299 int w, h;
2278 int x1, y1; 2300 int x1, y1;
2331 } 2353 }
2332 } 2354 }
2333 } 2355 }
2334} 2356}
2335 2357
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2358MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2359
2338CFPlus::RW 2360DC::RW
2339new (SV *class, SV *data_sv) 2361new (SV *class, SV *data_sv)
2340 CODE: 2362 CODE:
2341{ 2363{
2342 STRLEN datalen; 2364 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2365 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2367 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2368}
2347 OUTPUT: 2369 OUTPUT:
2348 RETVAL 2370 RETVAL
2349 2371
2350CFPlus::RW 2372DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2373new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2374 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2375 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2376 OUTPUT:
2355 RETVAL 2377 RETVAL
2356 2378
2357# fails on win32: 2379# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2380# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2381#void
2360#close (CFPlus::RW self) 2382#close (DC::RW self)
2361# CODE: 2383# CODE:
2362# (self->(close)) (self); 2384# (self->(close)) (self);
2363 2385
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2386MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2387
2366PROTOTYPES: DISABLE 2388PROTOTYPES: DISABLE
2367 2389
2368CFPlus::Channel 2390DC::Channel
2369find () 2391find ()
2370 CODE: 2392 CODE:
2371{ 2393{
2372 RETVAL = Mix_GroupAvailable (-1); 2394 RETVAL = Mix_GroupAvailable (-1);
2373 2395
2386} 2408}
2387 OUTPUT: 2409 OUTPUT:
2388 RETVAL 2410 RETVAL
2389 2411
2390void 2412void
2391halt (CFPlus::Channel self) 2413halt (DC::Channel self)
2392 CODE: 2414 CODE:
2393 Mix_HaltChannel (self); 2415 Mix_HaltChannel (self);
2394 2416
2395void 2417void
2396expire (CFPlus::Channel self, int ticks = -1) 2418expire (DC::Channel self, int ticks = -1)
2397 CODE: 2419 CODE:
2398 Mix_ExpireChannel (self, ticks); 2420 Mix_ExpireChannel (self, ticks);
2399 2421
2400void 2422void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2423fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2424 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2425 Mix_FadeOutChannel (self, ticks);
2404 2426
2405int 2427int
2406volume (CFPlus::Channel self, int volume) 2428volume (DC::Channel self, int volume)
2407 CODE: 2429 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2430 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2431 OUTPUT:
2410 RETVAL 2432 RETVAL
2411 2433
2412void 2434void
2413unregister_all_effects (CFPlus::Channel self) 2435unregister_all_effects (DC::Channel self)
2414 CODE: 2436 CODE:
2415 Mix_UnregisterAllEffects (self); 2437 Mix_UnregisterAllEffects (self);
2416 2438
2417void 2439void
2418set_panning (CFPlus::Channel self, int left, int right) 2440set_panning (DC::Channel self, int left, int right)
2419 CODE: 2441 CODE:
2420 left = CLAMP (left , 0, 255); 2442 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2443 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2444 Mix_SetPanning (self, left, right);
2423 2445
2424void 2446void
2425set_distance (CFPlus::Channel self, int distance) 2447set_distance (DC::Channel self, int distance)
2426 CODE: 2448 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2449 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2450
2429void 2451void
2430set_position (CFPlus::Channel self, int angle, int distance) 2452set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2453 CODE:
2432 2454
2433void 2455void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2457 CODE:
2436{ 2458{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2459 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2460 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2462}
2441 2463
2442void 2464void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2465set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2466 CODE:
2445 Mix_SetReverseStereo (self, flip); 2467 Mix_SetReverseStereo (self, flip);
2446 2468
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2470
2449PROTOTYPES: DISABLE 2471PROTOTYPES: DISABLE
2450 2472
2451CFPlus::MixChunk 2473DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2474new (SV *class, DC::RW rwops)
2453 CODE: 2475 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2476 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2477 OUTPUT:
2456 RETVAL 2478 RETVAL
2457 2479
2458void 2480void
2459DESTROY (CFPlus::MixChunk self) 2481DESTROY (DC::MixChunk self)
2460 CODE: 2482 CODE:
2461 Mix_FreeChunk (self); 2483 Mix_FreeChunk (self);
2462 2484
2463int 2485int
2464volume (CFPlus::MixChunk self, int volume = -1) 2486volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2487 CODE:
2466 if (items > 1) 2488 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2489 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2490 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2491 OUTPUT:
2470 RETVAL 2492 RETVAL
2471 2493
2472CFPlus::Channel 2494DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2495play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2496 CODE:
2475{ 2497{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2498 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2499
2478 if (RETVAL < 0) 2500 if (RETVAL < 0)
2485 } 2507 }
2486} 2508}
2487 OUTPUT: 2509 OUTPUT:
2488 RETVAL 2510 RETVAL
2489 2511
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2513
2492int 2514int
2493volume (int volume = -1) 2515volume (int volume = -1)
2494 PROTOTYPE: ;$ 2516 PROTOTYPE: ;$
2495 CODE: 2517 CODE:
2507void 2529void
2508halt () 2530halt ()
2509 CODE: 2531 CODE:
2510 Mix_HaltMusic (); 2532 Mix_HaltMusic ();
2511 2533
2512CFPlus::MixMusic 2534DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2535new (SV *class, DC::RW rwops)
2514 CODE: 2536 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2537 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2538 OUTPUT:
2517 RETVAL 2539 RETVAL
2518 2540
2519void 2541void
2520DESTROY (CFPlus::MixMusic self) 2542DESTROY (DC::MixMusic self)
2521 CODE: 2543 CODE:
2522 Mix_FreeMusic (self); 2544 Mix_FreeMusic (self);
2523 2545
2524int 2546int
2525play (CFPlus::MixMusic self, int loops = -1) 2547play (DC::MixMusic self, int loops = -1)
2526 CODE: 2548 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2549 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2550 OUTPUT:
2529 RETVAL 2551 RETVAL
2530 2552
2531void 2553void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2554fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2555 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2556 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2557
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2558MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2559
2538PROTOTYPES: ENABLE 2560PROTOTYPES: ENABLE
2539 2561
2540BOOT: 2562BOOT:
2541{ 2563{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2564 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2565 static const struct {
2544 const char *name; 2566 const char *name;
2545 IV iv; 2567 IV iv;
2546 } *civ, const_iv[] = { 2568 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2569# define const_iv(name) { # name, (IV)name }
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2862void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 2863 CODE:
2842 if (gl.SeparableFilter2D) 2864 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2865 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 2866
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2867void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 2868
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2869void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 2870
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 2871void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 2872
2876 2898
2877void glEndList () 2899void glEndList ()
2878 2900
2879void glCallList (int list) 2901void glCallList (int list)
2880 2902
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 2904
2883PROTOTYPES: DISABLE 2905PROTOTYPES: DISABLE
2884 2906
2885void 2907void
2886find_widget (SV *self, NV x, NV y) 2908find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 2912 XPUSHs (self);
2891} 2913}
2892 2914
2893BOOT: 2915BOOT:
2894{ 2916{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2917 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 2918
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2919 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2920 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2921 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2922 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 2923}
2902 2924
2903void 2925void
2904draw (SV *self) 2926draw (SV *self)
2905 CODE: 2927 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 2934 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 2935 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 2936 double draw_x, draw_y;
2915 2937
2916 if (!SvROK (self)) 2938 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2939 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 2940
2919 hv = (HV *)SvRV (self); 2941 hv = (HV *)SvRV (self);
2920 2942
2921 if (SvTYPE (hv) != SVt_PVHV) 2943 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2944 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 2945
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2946 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2947 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 2948
2927 if (!h || !w) 2949 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines