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.241 by root, Wed Dec 26 20:46:39 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 dc__Channel; 139typedef IV DC__Channel;
126typedef SDL_RWops *dc__RW; 140typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *dc__MixChunk; 141typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *dc__MixMusic; 142typedef Mix_Music *DC__MixMusic;
129 143
130typedef PangoFontDescription *dc__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 dc__Font font; 168 DC__Font font;
155 rc_t *rc; 169 rc_t *rc;
156} *dc__Layout; 170} *DC__Layout;
157 171
158static dc__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 (dc__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 (dc__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} *dc__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 (dc__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 (dc__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 (dc__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 (dc__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 = Deliantra::Client PACKAGE = dc 517MODULE = Deliantra::Client PACKAGE = DC
504 518
505PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
506 520
507BOOT: 521BOOT:
508{ 522{
509 HV *stash = gv_stashpv ("dc", 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 }
659 CODE: 673 CODE:
660{ 674{
661 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 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
664} 682}
665 683
666char * 684char *
667SDL_GetError () 685SDL_GetError ()
668 686
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 719
702 if (m && m != (SDL_Rect **)-1) 720 if (m && m != (SDL_Rect **)-1)
703 while (*m) 721 while (*m)
704 { 722 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 723 if ((*m)->w >= 800 && (*m)->h >= 480)
706 { 724 {
707 AV *av = newAV (); 725 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 726 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 727 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 728 av_push (av, newSViv (rgb));
770 { 788 {
771 case SDL_KEYDOWN: 789 case SDL_KEYDOWN:
772 case SDL_KEYUP: 790 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 791 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 792 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 795 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 796 break;
779 797
780 case SDL_ACTIVEEVENT: 798 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 799 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 817 x = ev.motion.x;
800 y = ev.motion.y; 818 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 819 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 820 }
803 821
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 822 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 823 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 824 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 825 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 826 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 827 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 828 }
811 break; 829 break;
812 830
813 case SDL_MOUSEBUTTONDOWN: 831 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 832 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 833 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 834
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 835 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 836 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 837 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 838 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 843 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 844 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 845 break;
828 } 846 }
829 847
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("dc::UI::Event", 1)))); 848 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 849 }
832} 850}
833 851
834int 852int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 853Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1023#if DEBUG 1041#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1042 VALGRIND_DO_LEAK_CHECK;
1025#endif 1043#endif
1026} 1044}
1027 1045
1028MODULE = Deliantra::Client PACKAGE = dc::Font 1046MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1047
1030PROTOTYPES: DISABLE 1048PROTOTYPES: DISABLE
1031 1049
1032dc::Font 1050DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1051new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1052 CODE:
1035{ 1053{
1036 int count; 1054 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1055 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1058}
1041 OUTPUT: 1059 OUTPUT:
1042 RETVAL 1060 RETVAL
1043 1061
1044void 1062void
1045DESTROY (dc::Font self) 1063DESTROY (DC::Font self)
1046 CODE: 1064 CODE:
1047 pango_font_description_free (self); 1065 pango_font_description_free (self);
1048 1066
1049void 1067void
1050make_default (dc::Font self) 1068make_default (DC::Font self)
1051 PROTOTYPE: $ 1069 PROTOTYPE: $
1052 CODE: 1070 CODE:
1053 default_font = self; 1071 default_font = self;
1054 1072
1055MODULE = Deliantra::Client PACKAGE = dc::Layout 1073MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1074
1057PROTOTYPES: DISABLE 1075PROTOTYPES: DISABLE
1058 1076
1059void 1077void
1060glyph_cache_backup () 1078glyph_cache_backup ()
1066glyph_cache_restore () 1084glyph_cache_restore ()
1067 PROTOTYPE: 1085 PROTOTYPE:
1068 CODE: 1086 CODE:
1069 tc_restore (); 1087 tc_restore ();
1070 1088
1071dc::Layout 1089DC::Layout
1072new (SV *class) 1090new (SV *class)
1073 CODE: 1091 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1092 New (0, RETVAL, 1, struct cf_layout);
1075 1093
1076 RETVAL->pl = pango_layout_new (opengl_context); 1094 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1104 layout_update_font (RETVAL);
1087 OUTPUT: 1105 OUTPUT:
1088 RETVAL 1106 RETVAL
1089 1107
1090void 1108void
1091DESTROY (dc::Layout self) 1109DESTROY (DC::Layout self)
1092 CODE: 1110 CODE:
1093 g_object_unref (self->pl); 1111 g_object_unref (self->pl);
1094 rc_free (self->rc); 1112 rc_free (self->rc);
1095 Safefree (self); 1113 Safefree (self);
1096 1114
1097void 1115void
1098set_text (dc::Layout self, SV *text_) 1116set_text (DC::Layout self, SV *text_)
1099 CODE: 1117 CODE:
1100{ 1118{
1101 STRLEN textlen; 1119 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1120 char *text = SvPVutf8 (text_, textlen);
1103 1121
1104 pango_layout_set_text (self->pl, text, textlen); 1122 pango_layout_set_text (self->pl, text, textlen);
1105} 1123}
1106 1124
1107void 1125void
1108set_markup (dc::Layout self, SV *text_) 1126set_markup (DC::Layout self, SV *text_)
1109 CODE: 1127 CODE:
1110{ 1128{
1111 STRLEN textlen; 1129 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1130 char *text = SvPVutf8 (text_, textlen);
1113 1131
1114 pango_layout_set_markup (self->pl, text, textlen); 1132 pango_layout_set_markup (self->pl, text, textlen);
1115} 1133}
1116 1134
1117void 1135void
1118set_shapes (dc::Layout self, ...) 1136set_shapes (DC::Layout self, ...)
1119 CODE: 1137 CODE:
1120{ 1138{
1121 PangoAttrList *attrs = 0; 1139 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1140 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1141 const char *pos = text;
1158 if (attrs) 1176 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1177 pango_layout_set_attributes (self->pl, attrs);
1160} 1178}
1161 1179
1162void 1180void
1163get_shapes (dc::Layout self) 1181get_shapes (DC::Layout self)
1164 PPCODE: 1182 PPCODE:
1165{ 1183{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1184 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1185
1168 do 1186 do
1169 { 1187 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1188 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1189
1172 if (run && shape_attr_p (run)) 1190 if (run && shape_attr_p (run))
1173 { 1191 {
1174 PangoRectangle extents; 1192 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1193 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1201
1184 pango_layout_iter_free (iter); 1202 pango_layout_iter_free (iter);
1185} 1203}
1186 1204
1187int 1205int
1188has_wrapped (dc::Layout self) 1206has_wrapped (DC::Layout self)
1189 CODE: 1207 CODE:
1190{ 1208{
1191 int lines = 1; 1209 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1210 const char *text = pango_layout_get_text (self->pl);
1193 1211
1198} 1216}
1199 OUTPUT: 1217 OUTPUT:
1200 RETVAL 1218 RETVAL
1201 1219
1202SV * 1220SV *
1203get_text (dc::Layout self) 1221get_text (DC::Layout self)
1204 CODE: 1222 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1223 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1224 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1225 OUTPUT:
1208 RETVAL 1226 RETVAL
1209 1227
1210void 1228void
1211set_foreground (dc::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.)
1212 CODE: 1230 CODE:
1213 self->r = r; 1231 self->r = r;
1214 self->g = g; 1232 self->g = g;
1215 self->b = b; 1233 self->b = b;
1216 self->a = a; 1234 self->a = a;
1217 1235
1218void 1236void
1219set_font (dc::Layout self, dc::Font font = 0) 1237set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1238 CODE:
1221 if (self->font != font) 1239 if (self->font != font)
1222 { 1240 {
1223 self->font = font; 1241 self->font = font;
1224 layout_update_font (self); 1242 layout_update_font (self);
1225 } 1243 }
1226 1244
1227void 1245void
1228set_height (dc::Layout self, int base_height) 1246set_height (DC::Layout self, int base_height)
1229 CODE: 1247 CODE:
1230 if (self->base_height != base_height) 1248 if (self->base_height != base_height)
1231 { 1249 {
1232 self->base_height = base_height; 1250 self->base_height = base_height;
1233 layout_update_font (self); 1251 layout_update_font (self);
1234 } 1252 }
1235 1253
1236void 1254void
1237set_width (dc::Layout self, int max_width = -1) 1255set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1256 CODE:
1239 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);
1240 1258
1241void 1259void
1242set_indent (dc::Layout self, int indent) 1260set_indent (DC::Layout self, int indent)
1243 CODE: 1261 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1262 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1263
1246void 1264void
1247set_spacing (dc::Layout self, int spacing) 1265set_spacing (DC::Layout self, int spacing)
1248 CODE: 1266 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1267 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1268
1251void 1269void
1252set_ellipsise (dc::Layout self, int ellipsise) 1270set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1271 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1272 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1273 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1274 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1275 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1276 : PANGO_ELLIPSIZE_NONE
1259 ); 1277 );
1260 1278
1261void 1279void
1262set_single_paragraph_mode (dc::Layout self, int spm) 1280set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1281 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1282 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1283
1266void 1284void
1267size (dc::Layout self) 1285size (DC::Layout self)
1268 PPCODE: 1286 PPCODE:
1269{ 1287{
1270 int w, h; 1288 int w, h;
1271 1289
1272 layout_get_pixel_size (self, &w, &h); 1290 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1293 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1294 PUSHs (sv_2mortal (newSViv (h)));
1277} 1295}
1278 1296
1279int 1297int
1280descent (dc::Layout self) 1298descent (DC::Layout self)
1281 CODE: 1299 CODE:
1282{ 1300{
1283 PangoRectangle rect; 1301 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1302 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1303 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1304 RETVAL = PANGO_DESCENT (rect);
1287} 1305}
1288 OUTPUT: 1306 OUTPUT:
1289 RETVAL 1307 RETVAL
1290 1308
1291int 1309int
1292xy_to_index (dc::Layout self, int x, int y) 1310xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1311 CODE:
1294{ 1312{
1295 int index, trailing; 1313 int index, trailing;
1296 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);
1297 RETVAL = index + trailing; 1315 RETVAL = index + trailing;
1298} 1316}
1299 OUTPUT: 1317 OUTPUT:
1300 RETVAL 1318 RETVAL
1301 1319
1302void 1320void
1303cursor_pos (dc::Layout self, int index) 1321cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1322 PPCODE:
1305{ 1323{
1306 PangoRectangle strong_pos; 1324 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1325 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1326
1309 EXTEND (SP, 3); 1327 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1328 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1329 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1330 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1331}
1314 1332
1315void 1333void
1316index_to_line_x (dc::Layout self, int index, int trailing = 0) 1334index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1335 PPCODE:
1318{ 1336{
1319 int line, x; 1337 int line, x;
1320 1338
1321 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)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1341 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1342 --line;
1343#endif
1324 EXTEND (SP, 2); 1344 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1345 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1347}
1328 1348
1329void 1349void
1330line_x_to_index (dc::Layout self, int line, int x) 1350line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1351 PPCODE:
1332{ 1352{
1333 PangoLayoutLine *lp; 1353 PangoLayoutLine *lp;
1334 int index, trailing; 1354 int index, trailing;
1335 1355
1336 if (line < 0) 1356 if (line < 0)
1337 XSRETURN_EMPTY; 1357 XSRETURN_EMPTY;
1338 1358
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1359 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1360 XSRETURN_EMPTY; /* do better */
1341 1361
1342 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);
1343 1363
1344 EXTEND (SP, 2); 1364 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1370 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1371 }
1352} 1372}
1353 1373
1354void 1374void
1355render (dc::Layout self, float x, float y, int flags = 0) 1375render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1376 CODE:
1357 rc_clear (self->rc); 1377 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1378 pango_opengl_render_layout_subpixel (
1359 self->pl, 1379 self->pl,
1360 self->rc, 1380 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1385 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1386 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1387 pango_layout_context_changed (self->pl);
1368 1388
1369void 1389void
1370draw (dc::Layout self) 1390draw (DC::Layout self)
1371 CODE: 1391 CODE:
1372{ 1392{
1373 glEnable (GL_TEXTURE_2D); 1393 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1394 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1395 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1403 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1404 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1405 glDisable (GL_TEXTURE_2D);
1386} 1406}
1387 1407
1388MODULE = Deliantra::Client PACKAGE = dc::Texture 1408MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1409
1390PROTOTYPES: ENABLE 1410PROTOTYPES: ENABLE
1391 1411
1392void 1412void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1413pad (SV *data_, int ow, int oh, int nw, int nh)
1472 RETVAL = width > 0; 1492 RETVAL = width > 0;
1473} 1493}
1474 OUTPUT: 1494 OUTPUT:
1475 RETVAL 1495 RETVAL
1476 1496
1477MODULE = Deliantra::Client PACKAGE = dc::Map 1497MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1498
1479PROTOTYPES: DISABLE 1499PROTOTYPES: DISABLE
1480 1500
1481dc::Map 1501DC::Map
1482new (SV *class) 1502new (SV *class)
1483 CODE: 1503 CODE:
1484 New (0, RETVAL, 1, struct map); 1504 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1505 RETVAL->x = 0;
1486 RETVAL->y = 0; 1506 RETVAL->y = 0;
1494 RETVAL->row = 0; 1514 RETVAL->row = 0;
1495 OUTPUT: 1515 OUTPUT:
1496 RETVAL 1516 RETVAL
1497 1517
1498void 1518void
1499DESTROY (dc::Map self) 1519DESTROY (DC::Map self)
1500 CODE: 1520 CODE:
1501{ 1521{
1502 map_clear (self); 1522 map_clear (self);
1503 Safefree (self->face2tile); 1523 Safefree (self->face2tile);
1504 Safefree (self->tex); 1524 Safefree (self->tex);
1505 Safefree (self); 1525 Safefree (self);
1506} 1526}
1507 1527
1508void 1528void
1509resize (dc::Map self, int map_width, int map_height) 1529resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1530 CODE:
1511 self->w = map_width; 1531 self->w = map_width;
1512 self->h = map_height; 1532 self->h = map_height;
1513 1533
1514void 1534void
1515clear (dc::Map self) 1535clear (DC::Map self)
1516 CODE: 1536 CODE:
1517 map_clear (self); 1537 map_clear (self);
1518 1538
1519void 1539void
1520set_tileid (dc::Map self, int face, int tile) 1540set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1541 CODE:
1522{ 1542{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1543 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1544 need_texid (self, tile);
1525} 1545}
1526 1546
1527void 1547void
1528set_smooth (dc::Map self, int face, int smooth, int level) 1548set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1549 CODE:
1530{ 1550{
1531 tileid texid; 1551 tileid texid;
1532 maptex *tex; 1552 maptex *tex;
1533 1553
1546 tex->smoothtile = self->face2tile [smooth]; 1566 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1567 tex->smoothlevel = level;
1548} 1568}
1549 1569
1550void 1570void
1551set_texture (dc::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)
1552 CODE: 1572 CODE:
1553{ 1573{
1554 need_texid (self, texid); 1574 need_texid (self, texid);
1555 1575
1556 { 1576 {
1576 // from transparent color bleeding and ugly wrapping effects. 1596 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1597 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1598}
1579 1599
1580int 1600int
1581ox (dc::Map self) 1601ox (DC::Map self)
1582 ALIAS: 1602 ALIAS:
1583 oy = 1 1603 oy = 1
1584 x = 2 1604 x = 2
1585 y = 3 1605 y = 3
1586 w = 4 1606 w = 4
1597 } 1617 }
1598 OUTPUT: 1618 OUTPUT:
1599 RETVAL 1619 RETVAL
1600 1620
1601void 1621void
1602scroll (dc::Map self, int dx, int dy) 1622scroll (DC::Map self, int dx, int dy)
1603 CODE: 1623 CODE:
1604{ 1624{
1605 if (dx > 0) 1625 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1626 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1627 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1643 self->y += MAP_EXTEND_Y;
1624 } 1644 }
1625} 1645}
1626 1646
1627SV * 1647SV *
1628map1a_update (dc::Map self, SV *data_, int extmap) 1648map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1649 CODE:
1630{ 1650{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1651 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1652 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1653 mapcell *cell;
1722} 1742}
1723 OUTPUT: 1743 OUTPUT:
1724 RETVAL 1744 RETVAL
1725 1745
1726SV * 1746SV *
1727mapmap (dc::Map self, int x0, int y0, int w, int h) 1747mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 1748 CODE:
1729{ 1749{
1730 int x1, x; 1750 int x1, x;
1731 int y1, y; 1751 int y1, y;
1732 int z; 1752 int z;
1777} 1797}
1778 OUTPUT: 1798 OUTPUT:
1779 RETVAL 1799 RETVAL
1780 1800
1781void 1801void
1782draw (dc::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)
1783 CODE: 1803 CODE:
1784{ 1804{
1785 int x, y, z; 1805 int x, y, z;
1786 1806
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1807 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2058 } 2078 }
2059 } 2079 }
2060} 2080}
2061 2081
2062void 2082void
2063draw_magicmap (dc::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)
2064 CODE: 2084 CODE:
2065{ 2085{
2066 static float color[16][3] = { 2086 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2087 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2088 { 1.00F, 1.00F, 1.00F },
2118 glDisable (GL_BLEND); 2138 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2139 glDisable (GL_TEXTURE_2D);
2120} 2140}
2121 2141
2122void 2142void
2123fow_texture (dc::Map self, int mx, int my, int sw, int sh) 2143fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2144 PPCODE:
2125{ 2145{
2126 int x, y; 2146 int x, y;
2127 int sw1 = sw + 2; 2147 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2148 int sh1 = sh + 2;
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2219 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2220 PUSHs (darkness3_sv);
2201} 2221}
2202 2222
2203SV * 2223SV *
2204get_rect (dc::Map self, int x0, int y0, int w, int h) 2224get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2225 CODE:
2206{ 2226{
2207 int x, y, x1, y1; 2227 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2228 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2229 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2274} 2294}
2275 OUTPUT: 2295 OUTPUT:
2276 RETVAL 2296 RETVAL
2277 2297
2278void 2298void
2279set_rect (dc::Map self, int x0, int y0, uint8_t *data) 2299set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2280 PPCODE: 2300 PPCODE:
2281{ 2301{
2282 int x, y, z; 2302 int x, y, z;
2283 int w, h; 2303 int w, h;
2284 int x1, y1; 2304 int x1, y1;
2337 } 2357 }
2338 } 2358 }
2339 } 2359 }
2340} 2360}
2341 2361
2342MODULE = Deliantra::Client PACKAGE = dc::RW 2362MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2363
2344dc::RW 2364DC::RW
2345new (SV *class, SV *data_sv) 2365new (SV *class, SV *data_sv)
2346 CODE: 2366 CODE:
2347{ 2367{
2348 STRLEN datalen; 2368 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2369 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2371 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2372}
2353 OUTPUT: 2373 OUTPUT:
2354 RETVAL 2374 RETVAL
2355 2375
2356dc::RW 2376DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2377new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2378 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2379 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2380 OUTPUT:
2361 RETVAL 2381 RETVAL
2362 2382
2363# fails on win32: 2383# fails on win32:
2364# dc.xs(2268) : error C2059: syntax error : '(' 2384# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2385#void
2366#close (dc::RW self) 2386#close (DC::RW self)
2367# CODE: 2387# CODE:
2368# (self->(close)) (self); 2388# (self->(close)) (self);
2369 2389
2370MODULE = Deliantra::Client PACKAGE = dc::Channel 2390MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2391
2372PROTOTYPES: DISABLE 2392PROTOTYPES: DISABLE
2373 2393
2374dc::Channel 2394DC::Channel
2375find () 2395find ()
2376 CODE: 2396 CODE:
2377{ 2397{
2378 RETVAL = Mix_GroupAvailable (-1); 2398 RETVAL = Mix_GroupAvailable (-1);
2379 2399
2392} 2412}
2393 OUTPUT: 2413 OUTPUT:
2394 RETVAL 2414 RETVAL
2395 2415
2396void 2416void
2397halt (dc::Channel self) 2417halt (DC::Channel self)
2398 CODE: 2418 CODE:
2399 Mix_HaltChannel (self); 2419 Mix_HaltChannel (self);
2400 2420
2401void 2421void
2402expire (dc::Channel self, int ticks = -1) 2422expire (DC::Channel self, int ticks = -1)
2403 CODE: 2423 CODE:
2404 Mix_ExpireChannel (self, ticks); 2424 Mix_ExpireChannel (self, ticks);
2405 2425
2406void 2426void
2407fade_out (dc::Channel self, int ticks = -1) 2427fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2428 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2429 Mix_FadeOutChannel (self, ticks);
2410 2430
2411int 2431int
2412volume (dc::Channel self, int volume) 2432volume (DC::Channel self, int volume)
2413 CODE: 2433 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2434 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2435 OUTPUT:
2416 RETVAL 2436 RETVAL
2417 2437
2418void 2438void
2419unregister_all_effects (dc::Channel self) 2439unregister_all_effects (DC::Channel self)
2420 CODE: 2440 CODE:
2421 Mix_UnregisterAllEffects (self); 2441 Mix_UnregisterAllEffects (self);
2422 2442
2423void 2443void
2424set_panning (dc::Channel self, int left, int right) 2444set_panning (DC::Channel self, int left, int right)
2425 CODE: 2445 CODE:
2426 left = CLAMP (left , 0, 255); 2446 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2447 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2448 Mix_SetPanning (self, left, right);
2429 2449
2430void 2450void
2431set_distance (dc::Channel self, int distance) 2451set_distance (DC::Channel self, int distance)
2432 CODE: 2452 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2453 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2454
2435void 2455void
2436set_position (dc::Channel self, int angle, int distance) 2456set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2457 CODE:
2438 2458
2439void 2459void
2440set_position_r (dc::Channel self, int dx, int dy, int maxdistance) 2460set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2461 CODE:
2442{ 2462{
2443 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));
2444 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);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2465 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2466}
2447 2467
2448void 2468void
2449set_reverse_stereo (dc::Channel self, int flip) 2469set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2470 CODE:
2451 Mix_SetReverseStereo (self, flip); 2471 Mix_SetReverseStereo (self, flip);
2452 2472
2453MODULE = Deliantra::Client PACKAGE = dc::MixChunk 2473MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2474
2455PROTOTYPES: DISABLE 2475PROTOTYPES: DISABLE
2456 2476
2457dc::MixChunk 2477DC::MixChunk
2458new (SV *class, dc::RW rwops) 2478new (SV *class, DC::RW rwops)
2459 CODE: 2479 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2480 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2481 OUTPUT:
2462 RETVAL 2482 RETVAL
2463 2483
2464void 2484void
2465DESTROY (dc::MixChunk self) 2485DESTROY (DC::MixChunk self)
2466 CODE: 2486 CODE:
2467 Mix_FreeChunk (self); 2487 Mix_FreeChunk (self);
2468 2488
2469int 2489int
2470volume (dc::MixChunk self, int volume = -1) 2490volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2491 CODE:
2472 if (items > 1) 2492 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2493 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2494 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2495 OUTPUT:
2476 RETVAL 2496 RETVAL
2477 2497
2478dc::Channel 2498DC::Channel
2479play (dc::MixChunk self, dc::Channel channel = -1, int loops = 0, int ticks = -1) 2499play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2500 CODE:
2481{ 2501{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2502 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2503
2484 if (RETVAL < 0) 2504 if (RETVAL < 0)
2491 } 2511 }
2492} 2512}
2493 OUTPUT: 2513 OUTPUT:
2494 RETVAL 2514 RETVAL
2495 2515
2496MODULE = Deliantra::Client PACKAGE = dc::MixMusic 2516MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2517
2498int 2518int
2499volume (int volume = -1) 2519volume (int volume = -1)
2500 PROTOTYPE: ;$ 2520 PROTOTYPE: ;$
2501 CODE: 2521 CODE:
2513void 2533void
2514halt () 2534halt ()
2515 CODE: 2535 CODE:
2516 Mix_HaltMusic (); 2536 Mix_HaltMusic ();
2517 2537
2518dc::MixMusic 2538DC::MixMusic
2519new (SV *class, dc::RW rwops) 2539new (SV *class, DC::RW rwops)
2520 CODE: 2540 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2541 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2542 OUTPUT:
2523 RETVAL 2543 RETVAL
2524 2544
2525void 2545void
2526DESTROY (dc::MixMusic self) 2546DESTROY (DC::MixMusic self)
2527 CODE: 2547 CODE:
2528 Mix_FreeMusic (self); 2548 Mix_FreeMusic (self);
2529 2549
2530int 2550int
2531play (dc::MixMusic self, int loops = -1) 2551play (DC::MixMusic self, int loops = -1)
2532 CODE: 2552 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2553 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2554 OUTPUT:
2535 RETVAL 2555 RETVAL
2536 2556
2537void 2557void
2538fade_in_pos (dc::MixMusic self, int loops, int ms, double position) 2558fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2559 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2560 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2561
2542MODULE = Deliantra::Client PACKAGE = dc::OpenGL 2562MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2563
2544PROTOTYPES: ENABLE 2564PROTOTYPES: ENABLE
2545 2565
2546BOOT: 2566BOOT:
2547{ 2567{
2548 HV *stash = gv_stashpv ("dc::OpenGL", 1); 2568 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2569 static const struct {
2550 const char *name; 2570 const char *name;
2551 IV iv; 2571 IV iv;
2552 } *civ, const_iv[] = { 2572 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2573# define const_iv(name) { # name, (IV)name }
2846void 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)
2847 CODE: 2867 CODE:
2848 if (gl.SeparableFilter2D) 2868 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2869 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 2870
2851void 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)
2852 2872
2853void 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)
2854 2874
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 2875void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 2876
2882 2902
2883void glEndList () 2903void glEndList ()
2884 2904
2885void glCallList (int list) 2905void glCallList (int list)
2886 2906
2887MODULE = Deliantra::Client PACKAGE = dc::UI::Base 2907MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 2908
2889PROTOTYPES: DISABLE 2909PROTOTYPES: DISABLE
2890 2910
2891void 2911void
2892find_widget (SV *self, NV x, NV y) 2912find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 2916 XPUSHs (self);
2897} 2917}
2898 2918
2899BOOT: 2919BOOT:
2900{ 2920{
2901 hover_gv = gv_fetchpv ("dc::UI::HOVER", 1, SVt_NV); 2921 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 2922
2903 draw_x_gv = gv_fetchpv ("dc::UI::Base::draw_x", 1, SVt_NV); 2923 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("dc::UI::Base::draw_y", 1, SVt_NV); 2924 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("dc::UI::Base::draw_w", 1, SVt_NV); 2925 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("dc::UI::Base::draw_h", 1, SVt_NV); 2926 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 2927}
2908 2928
2909void 2929void
2910draw (SV *self) 2930draw (SV *self)
2911 CODE: 2931 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 2938 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 2939 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 2940 double draw_x, draw_y;
2921 2941
2922 if (!SvROK (self)) 2942 if (!SvROK (self))
2923 croak ("dc::Base::draw: %s not a reference", SvPV_nolen (self)); 2943 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 2944
2925 hv = (HV *)SvRV (self); 2945 hv = (HV *)SvRV (self);
2926 2946
2927 if (SvTYPE (hv) != SVt_PVHV) 2947 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("dc::Base::draw: %s not a hashref", SvPV_nolen (self)); 2948 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 2949
2930 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.;
2931 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.;
2932 2952
2933 if (!h || !w) 2953 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines