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.161 by root, Mon Oct 9 23:30:44 2006 UTC vs.
Revision 1.172 by root, Mon Apr 2 19:29:27 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // 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"
13 14
14#ifdef _WIN32 15#ifdef _WIN32
15# undef pipe 16# undef pipe
16#endif 17#endif
17 18
19#include <assert.h>
18#include <math.h> 20#include <math.h>
19#include <string.h> 21#include <string.h>
20#include <stdio.h> 22#include <stdio.h>
21#include <stdlib.h> 23#include <stdlib.h>
22 24
… …
37# include <sys/types.h> 39# include <sys/types.h>
38# include <sys/socket.h> 40# include <sys/socket.h>
39# include <netinet/in.h> 41# include <netinet/in.h>
40# include <netinet/tcp.h> 42# include <netinet/tcp.h>
41# include <inttypes.h> 43# 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 44#endif
50 45
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 47
53#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
54 49
55#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
… …
365 n |= n >> 16; 360 n |= n >> 16;
366 361
367 return n + 1; 362 return n + 1;
368} 363}
369 364
365/* SDL should provide this, really. */
366#define SDLK_MODIFIER_MIN 300
367#define SDLK_MODIFIER_MAX 314
368
370MODULE = CFPlus PACKAGE = CFPlus 369MODULE = CFPlus PACKAGE = CFPlus
371 370
372PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
373 372
374BOOT: 373BOOT:
… …
377 static const struct { 376 static const struct {
378 const char *name; 377 const char *name;
379 IV iv; 378 IV iv;
380 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
381# define const_iv(name) { # name, (IV)name } 380# define const_iv(name) { # name, (IV)name }
381 const_iv (SDLK_MODIFIER_MIN),
382 const_iv (SDLK_MODIFIER_MAX),
383
382 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
383 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
384 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
385 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
386 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
… …
395 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
396 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
397 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
398 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
399 const_iv (SDL_USEREVENT), 401 const_iv (SDL_USEREVENT),
402
403 const_iv (SDL_APPINPUTFOCUS),
404 const_iv (SDL_APPMOUSEFOCUS),
405 const_iv (SDL_APPACTIVE),
406
400 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
401 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
402 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
403 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
404 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
… …
459 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
460 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
461 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
462 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
463 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
464 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
465 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
466 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
467 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
468 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
469 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
470 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
471 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
472 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
473 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
474 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
475 const_iv (KMOD_MODE), 487 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 488# undef const_iv
481 }; 489 };
482 490
483 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 491 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
484 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 492 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
493
494 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
495 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
485} 496}
497
498void
499weaken (SV *rv)
500 PROTOTYPE: $
501 CODE:
502 sv_rvweaken (rv);
486 503
487int 504int
488in_destruct () 505in_destruct ()
489 CODE: 506 CODE:
490 RETVAL = PL_main_cv == Nullcv; 507 RETVAL = PL_main_cv == Nullcv;
… …
593 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
594 case SDL_KEYUP: 611 case SDL_KEYUP:
595 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 614 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
615 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
598 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599 break; 617 break;
600 618
601 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
602 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
1055xy_to_index (CFPlus::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
1056 CODE: 1074 CODE:
1057{ 1075{
1058 int index, trailing; 1076 int index, trailing;
1059 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1077 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1060 RETVAL = index; 1078 RETVAL = index + trailing;
1061} 1079}
1062 OUTPUT: 1080 OUTPUT:
1063 RETVAL 1081 RETVAL
1064 1082
1065void 1083void
… …
1071 1089
1072 EXTEND (SP, 3); 1090 EXTEND (SP, 3);
1073 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1091 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1074 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1075 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1094}
1095
1096void
1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1098 PPCODE:
1099{
1100 int line, x;
1101
1102 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1103 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1104
1105 EXTEND (SP, 2);
1106 PUSHs (sv_2mortal (newSViv (line - 1)));
1107 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1108}
1109
1110void
1111line_x_to_index (CFPlus::Layout self, int line, int x)
1112 PPCODE:
1113{
1114 PangoLayoutLine *lp;
1115 int index, trailing;
1116
1117 if (line < 0)
1118 XSRETURN_EMPTY;
1119
1120 if (!(lp = pango_layout_get_line (self->pl, line)))
1121 XSRETURN_EMPTY; /* do better */
1122
1123 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1124
1125 EXTEND (SP, 2);
1126 if (GIMME_V == G_SCALAR)
1127 PUSHs (sv_2mortal (newSViv (index + trailing)));
1128 else
1129 {
1130 PUSHs (sv_2mortal (newSViv (index)));
1131 PUSHs (sv_2mortal (newSViv (trailing)));
1132 }
1076} 1133}
1077 1134
1078void 1135void
1079render (CFPlus::Layout self, float x, float y, int flags = 0) 1136render (CFPlus::Layout self, float x, float y, int flags = 0)
1080 PPCODE: 1137 PPCODE:
… …
1174} 1231}
1175 1232
1176MODULE = CFPlus PACKAGE = CFPlus::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
1177 1234
1178CFPlus::Map 1235CFPlus::Map
1179new (SV *class, int map_width, int map_height) 1236new (SV *class)
1180 CODE: 1237 CODE:
1181 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
1182 RETVAL->x = 0; 1239 RETVAL->x = 0;
1183 RETVAL->y = 0; 1240 RETVAL->y = 0;
1184 RETVAL->w = map_width; 1241 RETVAL->w = 0;
1185 RETVAL->h = map_height; 1242 RETVAL->h = 0;
1186 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
1187 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
1188 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
1189 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1190 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
… …
1201 map_clear (self); 1258 map_clear (self);
1202 Safefree (self->face); 1259 Safefree (self->face);
1203 Safefree (self->tex); 1260 Safefree (self->tex);
1204 Safefree (self); 1261 Safefree (self);
1205} 1262}
1263
1264void
1265resize (CFPlus::Map self, int map_width, int map_height)
1266 CODE:
1267 self->w = map_width;
1268 self->h = map_height;
1206 1269
1207void 1270void
1208clear (CFPlus::Map self) 1271clear (CFPlus::Map self)
1209 CODE: 1272 CODE:
1210 map_clear (self); 1273 map_clear (self);
… …
1349 cell->stat_width = 1; 1412 cell->stat_width = 1;
1350 cell->stat_hp = *data++; 1413 cell->stat_hp = *data++;
1351 } 1414 }
1352 else if (cmd == 6) // monster width 1415 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1; 1416 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width 1417 else if (cmd == 0x47)
1355 { 1418 {
1356 if (*data == 4) 1419 if (*data == 8)
1357 ; // decode player tag 1420 ; // decode player uuid
1358 1421
1359 data += *data + 1; 1422 data += *data + 1;
1360 } 1423 }
1361 else if (cmd == 8) // cell flags 1424 else if (cmd == 8) // cell flags
1362 cell->flags = *data++; 1425 cell->flags = *data++;
… …
1423 1486
1424 for (z = 0; z <= 0; z++) 1487 for (z = 0; z <= 0; z++)
1425 { 1488 {
1426 mapface face = cell->face [z]; 1489 mapface face = cell->face [z];
1427 1490
1428 if (face) 1491 if (face > 0 && face < self->texs)
1429 { 1492 {
1430 maptex tex = self->tex [face]; 1493 maptex tex = self->tex [face];
1431 int a0 = 255 - tex.a; 1494 int a0 = 255 - tex.a;
1432 int a1 = tex.a; 1495 int a1 = tex.a;
1433 1496
… …
1450} 1513}
1451 OUTPUT: 1514 OUTPUT:
1452 RETVAL 1515 RETVAL
1453 1516
1454void 1517void
1455draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1518draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1456 CODE: 1519 CODE:
1457{ 1520{
1458 int vx, vy;
1459 int x, y, z; 1521 int x, y, z;
1460 int last_name; 1522 int last_name;
1461 mapface face; 1523 mapface face;
1462
1463 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1464 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1465
1466 /*
1467 int vx = self->vx = self->w >= sw
1468 ? self->x + (self->w - sw) / 2
1469 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1470
1471 int vy = self->vy = self->h >= sh
1472 ? self->y + (self->h - sh) / 2
1473 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1474 */
1475 1524
1476 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1477 1526
1478 glEnable (GL_BLEND); 1527 glEnable (GL_BLEND);
1479 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1482 1531
1483 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1484 1533
1485 last_name = 0; 1534 last_name = 0;
1486 1535
1536 mx += self->x;
1537 my += self->y;
1538
1487 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1488 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1489 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1490 { 1542 {
1491 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1492 1544
1493 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1494 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1495 { 1547 {
1496 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1497 1549
1498 face = cell->face [z]; 1550 face = cell->face [z];
1499 1551
1500 if (face && face < self->texs) 1552 if (face > 0 && face < self->texs)
1501 { 1553 {
1502 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1503 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * T - tex.w;
1504 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * T - tex.h;
1505 1557
1506 if (last_name != tex.name) 1558 if (last_name != tex.name)
1507 { 1559 {
1508 glEnd (); 1560 glEnd ();
1509 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
… …
1519 if (cell->flags && z == 2) 1571 if (cell->flags && z == 2)
1520 { 1572 {
1521 if (cell->flags & 1) 1573 if (cell->flags & 1)
1522 { 1574 {
1523 maptex tex = self->tex [1]; 1575 maptex tex = self->tex [1];
1524 int px = (x + 1) * 32 - tex.w + 2; 1576 int px = (x + 1) * T - tex.w + 2;
1525 int py = (y + 1) * 32 - tex.h - 6; 1577 int py = (y + 1) * T - tex.h - 6;
1526 1578
1527 glEnd (); 1579 glEnd ();
1528 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1580 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1529 glBegin (GL_QUADS); 1581 glBegin (GL_QUADS);
1530 1582
… …
1542 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1543 glDisable (GL_BLEND); 1595 glDisable (GL_BLEND);
1544 1596
1545 // top layer: overlays such as the health bar 1597 // top layer: overlays such as the health bar
1546 for (y = 0; y < sh; y++) 1598 for (y = 0; y < sh; y++)
1547 if (0 <= y + vy && y + vy < self->rows) 1599 if (0 <= y + my && y + my < self->rows)
1548 { 1600 {
1549 maprow *row = self->row + (y + vy); 1601 maprow *row = self->row + (y + my);
1550 1602
1551 for (x = 0; x < sw; x++) 1603 for (x = 0; x < sw; x++)
1552 if (row->c0 <= x + vx && x + vx < row->c1) 1604 if (row->c0 <= x + mx && x + mx < row->c1)
1553 { 1605 {
1554 mapcell *cell = row->col + (x + vx - row->c0); 1606 mapcell *cell = row->col + (x + mx - row->c0);
1555 1607
1556 int px = x * 32; 1608 int px = x * T;
1557 int py = y * 32; 1609 int py = y * T;
1558 1610
1559 if (cell->stat_hp) 1611 if (cell->stat_hp)
1560 { 1612 {
1561 int width = cell->stat_width * 32; 1613 int width = cell->stat_width * T;
1562 int thick = sh / 28 + 1 + cell->stat_width; 1614 int thick = sh / 28 + 1 + cell->stat_width;
1563 1615
1564 glColor3ub (0, 0, 0); 1616 glColor3ub (0, 0, 0);
1565 glRectf (px + 1, py - thick - 2, 1617 glRectf (px + 1, py - thick - 2,
1566 px + width - 1, py); 1618 px + width - 1, py);
… …
1633 glDisable (GL_BLEND); 1685 glDisable (GL_BLEND);
1634 glDisable (GL_TEXTURE_2D); 1686 glDisable (GL_TEXTURE_2D);
1635} 1687}
1636 1688
1637void 1689void
1638fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1690fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1639 PPCODE: 1691 PPCODE:
1640{ 1692{
1641 int vx, vy;
1642 int x, y; 1693 int x, y;
1643 int sw4 = (sw + 3) & ~3; 1694 int sw4 = (sw + 3) & ~3;
1644 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1695 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1645 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1696 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1646 1697
1647 memset (darkness, 255, sw4 * sh); 1698 memset (darkness, 255, sw4 * sh);
1648 SvPOK_only (darkness_sv); 1699 SvPOK_only (darkness_sv);
1649 SvCUR_set (darkness_sv, sw4 * sh); 1700 SvCUR_set (darkness_sv, sw4 * sh);
1650 1701
1651 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1702 mx += self->x;
1652 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1703 my += self->y;
1653 1704
1654 for (y = 0; y < sh; y++) 1705 for (y = 0; y < sh; y++)
1655 if (0 <= y + vy && y + vy < self->rows) 1706 if (0 <= y + my && y + my < self->rows)
1656 { 1707 {
1657 maprow *row = self->row + (y + vy); 1708 maprow *row = self->row + (y + my);
1658 1709
1659 for (x = 0; x < sw; x++) 1710 for (x = 0; x < sw; x++)
1660 if (row->c0 <= x + vx && x + vx < row->c1) 1711 if (row->c0 <= x + mx && x + mx < row->c1)
1661 { 1712 {
1662 mapcell *cell = row->col + (x + vx - row->c0); 1713 mapcell *cell = row->col + (x + mx - row->c0);
1663 1714
1664 darkness[y * sw4 + x] = cell->darkness 1715 darkness[y * sw4 + x] = cell->darkness
1665 ? 255 - (cell->darkness - 1) 1716 ? 255 - (cell->darkness - 1)
1666 : 255 - FOW_DARKNESS; 1717 : 255 - FOW_DARKNESS;
1667 } 1718 }

Diff Legend

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