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.159 by root, Sun Oct 8 21:22:29 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC

… …
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
8#endif 9#endif
9 10
10#include "EXTERN.h" 11#include "EXTERN.h"
11#include "perl.h" 12#include "perl.h"
12#include "XSUB.h" 13#include "XSUB.h"
… …
37# include <sys/types.h> 38# include <sys/types.h>
38# include <sys/socket.h> 39# include <sys/socket.h>
39# include <netinet/in.h> 40# include <netinet/in.h>
40# include <netinet/tcp.h> 41# include <netinet/tcp.h>
41# include <inttypes.h> 42# include <inttypes.h>
42#else
43 typedef unsigned char uint8_t;
44 typedef unsigned short uint16_t;
45 typedef unsigned int uint32_t;
46 typedef signed char int8_t;
47 typedef signed short int16_t;
48 typedef signed int int32_t;
49#endif 43#endif
50 44
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 46
53#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
54 48
55#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
… …
365 n |= n >> 16; 359 n |= n >> 16;
366 360
367 return n + 1; 361 return n + 1;
368} 362}
369 363
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
367
370MODULE = CFPlus PACKAGE = CFPlus 368MODULE = CFPlus PACKAGE = CFPlus
371 369
372PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
373 371
374BOOT: 372BOOT:
… …
377 static const struct { 375 static const struct {
378 const char *name; 376 const char *name;
379 IV iv; 377 IV iv;
380 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
381# define const_iv(name) { # name, (IV)name } 379# define const_iv(name) { # name, (IV)name }
380 const_iv (SDLK_MODIFIER_MIN),
381 const_iv (SDLK_MODIFIER_MAX),
382
382 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
383 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
384 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
385 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
386 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
… …
395 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
396 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
397 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
398 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
399 const_iv (SDL_USEREVENT), 400 const_iv (SDL_USEREVENT),
401
402 const_iv (SDL_APPINPUTFOCUS),
403 const_iv (SDL_APPMOUSEFOCUS),
404 const_iv (SDL_APPACTIVE),
405
400 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
401 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
402 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
403 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
404 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
… …
459 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
460 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
461 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
462 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
463 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
464 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
465 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
466 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
467 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
468 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
469 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
470 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
471 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
472 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
473 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
474 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
475 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
476 const_iv (KMOD_CTRL),
477 const_iv (KMOD_SHIFT),
478 const_iv (KMOD_ALT),
479 const_iv (KMOD_META)
480# undef const_iv 487# undef const_iv
481 }; 488 };
482 489
483 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 490 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
484 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
492
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
485} 495}
486 496
487int 497int
488in_destruct () 498in_destruct ()
489 CODE: 499 CODE:
… …
593 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
594 case SDL_KEYUP: 604 case SDL_KEYUP:
595 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 607 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
608 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
598 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599 break; 610 break;
600 611
601 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
602 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
794 _exit (1); 805 _exit (1);
795 806
796void 807void
797_exit (int retval = 0) 808_exit (int retval = 0)
798 CODE: 809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
812#else
799 _exit (retval); 813 _exit (retval);
814#endif
800 815
801MODULE = CFPlus PACKAGE = CFPlus::Font 816MODULE = CFPlus PACKAGE = CFPlus::Font
802 817
803CFPlus::Font 818CFPlus::Font
804new_from_file (SV *class, char *path, int id = 0) 819new_from_file (SV *class, char *path, int id = 0)
… …
1051xy_to_index (CFPlus::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
1052 CODE: 1067 CODE:
1053{ 1068{
1054 int index, trailing; 1069 int index, trailing;
1055 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1070 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1056 RETVAL = index; 1071 RETVAL = index + trailing;
1057} 1072}
1058 OUTPUT: 1073 OUTPUT:
1059 RETVAL 1074 RETVAL
1060 1075
1061void 1076void
… …
1067 1082
1068 EXTEND (SP, 3); 1083 EXTEND (SP, 3);
1069 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1084 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1087}
1088
1089void
1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1091 PPCODE:
1092{
1093 int line, x;
1094
1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1097
1098 EXTEND (SP, 2);
1099 PUSHs (sv_2mortal (newSViv (line - 1)));
1100 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1101}
1102
1103void
1104line_x_to_index (CFPlus::Layout self, int line, int x)
1105 PPCODE:
1106{
1107 PangoLayoutLine *lp;
1108 int index, trailing;
1109
1110 if (line < 0)
1111 XSRETURN_EMPTY;
1112
1113 if (!(lp = pango_layout_get_line (self->pl, line)))
1114 XSRETURN_EMPTY; /* do better */
1115
1116 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1117
1118 EXTEND (SP, 2);
1119 if (GIMME_V == G_SCALAR)
1120 PUSHs (sv_2mortal (newSViv (index + trailing)));
1121 else
1122 {
1123 PUSHs (sv_2mortal (newSViv (index)));
1124 PUSHs (sv_2mortal (newSViv (trailing)));
1125 }
1072} 1126}
1073 1127
1074void 1128void
1075render (CFPlus::Layout self, float x, float y, int flags = 0) 1129render (CFPlus::Layout self, float x, float y, int flags = 0)
1076 PPCODE: 1130 PPCODE:
… …
1170} 1224}
1171 1225
1172MODULE = CFPlus PACKAGE = CFPlus::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1173 1227
1174CFPlus::Map 1228CFPlus::Map
1175new (SV *class, int map_width, int map_height) 1229new (SV *class)
1176 CODE: 1230 CODE:
1177 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1178 RETVAL->x = 0; 1232 RETVAL->x = 0;
1179 RETVAL->y = 0; 1233 RETVAL->y = 0;
1180 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1181 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1182 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1183 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1184 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1185 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1186 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
… …
1197 map_clear (self); 1251 map_clear (self);
1198 Safefree (self->face); 1252 Safefree (self->face);
1199 Safefree (self->tex); 1253 Safefree (self->tex);
1200 Safefree (self); 1254 Safefree (self);
1201} 1255}
1256
1257void
1258resize (CFPlus::Map self, int map_width, int map_height)
1259 CODE:
1260 self->w = map_width;
1261 self->h = map_height;
1202 1262
1203void 1263void
1204clear (CFPlus::Map self) 1264clear (CFPlus::Map self)
1205 CODE: 1265 CODE:
1206 map_clear (self); 1266 map_clear (self);
… …
1446} 1506}
1447 OUTPUT: 1507 OUTPUT:
1448 RETVAL 1508 RETVAL
1449 1509
1450void 1510void
1451draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1511draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1452 CODE: 1512 CODE:
1453{ 1513{
1454 int vx, vy;
1455 int x, y, z; 1514 int x, y, z;
1456 int last_name; 1515 int last_name;
1457 mapface face; 1516 mapface face;
1458
1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1461
1462 /*
1463 int vx = self->vx = self->w >= sw
1464 ? self->x + (self->w - sw) / 2
1465 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1466
1467 int vy = self->vy = self->h >= sh
1468 ? self->y + (self->h - sh) / 2
1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1470 */
1471 1517
1472 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1473 1519
1474 glEnable (GL_BLEND); 1520 glEnable (GL_BLEND);
1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1478 1524
1479 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1480 1526
1481 last_name = 0; 1527 last_name = 0;
1482 1528
1529 mx += self->x;
1530 my += self->y;
1531
1483 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1484 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1485 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1486 { 1535 {
1487 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1488 1537
1489 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1490 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1491 { 1540 {
1492 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1493 1542
1494 face = cell->face [z]; 1543 face = cell->face [z];
1495 1544
1496 if (face && face < self->texs) 1545 if (face && face < self->texs)
1497 { 1546 {
… …
1538 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1539 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1540 1589
1541 // top layer: overlays such as the health bar 1590 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++) 1591 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows) 1592 if (0 <= y + my && y + my < self->rows)
1544 { 1593 {
1545 maprow *row = self->row + (y + vy); 1594 maprow *row = self->row + (y + my);
1546 1595
1547 for (x = 0; x < sw; x++) 1596 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1) 1597 if (row->c0 <= x + mx && x + mx < row->c1)
1549 { 1598 {
1550 mapcell *cell = row->col + (x + vx - row->c0); 1599 mapcell *cell = row->col + (x + mx - row->c0);
1551 1600
1552 int px = x * 32; 1601 int px = x * 32;
1553 int py = y * 32; 1602 int py = y * 32;
1554 1603
1555 if (cell->stat_hp) 1604 if (cell->stat_hp)
… …
1629 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1631} 1680}
1632 1681
1633void 1682void
1634fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1635 PPCODE: 1684 PPCODE:
1636{ 1685{
1637 int vx, vy;
1638 int x, y; 1686 int x, y;
1639 int sw4 = (sw + 3) & ~3; 1687 int sw4 = (sw + 3) & ~3;
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1642 1690
1643 memset (darkness, 255, sw4 * sh); 1691 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv); 1692 SvPOK_only (darkness_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh); 1693 SvCUR_set (darkness_sv, sw4 * sh);
1646 1694
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1695 mx += self->x;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1696 my += self->y;
1649 1697
1650 for (y = 0; y < sh; y++) 1698 for (y = 0; y < sh; y++)
1651 if (0 <= y + vy && y + vy < self->rows) 1699 if (0 <= y + my && y + my < self->rows)
1652 { 1700 {
1653 maprow *row = self->row + (y + vy); 1701 maprow *row = self->row + (y + my);
1654 1702
1655 for (x = 0; x < sw; x++) 1703 for (x = 0; x < sw; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1) 1704 if (row->c0 <= x + mx && x + mx < row->c1)
1657 { 1705 {
1658 mapcell *cell = row->col + (x + vx - row->c0); 1706 mapcell *cell = row->col + (x + mx - row->c0);
1659 1707
1660 darkness[y * sw4 + x] = cell->darkness 1708 darkness[y * sw4 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1) 1709 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS; 1710 : 255 - FOW_DARKNESS;
1663 } 1711 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines