ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtperl.xs
(Generate patch)

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.120 by root, Fri Jan 25 16:04:57 2008 UTC vs.
Revision 1.132 by sf-exg, Sat Jul 24 10:20:26 2010 UTC

… …
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->scrollBar.leftptr_cursor 44#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 45
50#undef LINENO 46#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 47#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 48#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 49#define ROW(n) THIS->row_buf [LINENO (n)]
… …
111 107
112///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
113 109
114#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
115 111
116class overlay { 112class overlay : overlay_base
113{
117 rxvt_term *THIS; 114 rxvt_term *THIS;
118 AV *overlay_av; 115 AV *overlay_av;
119 int x, y, w, h;
120 int border; 116 int border;
121 text_t **text;
122 rend_t **rend;
123 117
124public: 118public:
125 HV *self; 119 HV *self;
126 120
127 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 121 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
134 128
135 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
136}; 130};
137 131
138overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 132overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
139: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 133: THIS(THIS), border(border == 2), overlay_av (0)
140{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
141 if (w < 0) w = 0; 140 if (w < 0) w = 0;
142 if (h < 0) h = 0; 141 if (h < 0) h = 0;
143 142
144 if (border == 2) 143 if (border == 2)
145 { 144 {
… …
249 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 248 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
250 249
251 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
252 int ov_h = min (h, THIS->nrow - ov_y); 251 int ov_h = min (h, THIS->nrow - ov_y);
253 252
253 // hide cursor if it is within the overlay area
254 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
255 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
256 THIS->screen.flags &= ~Screen_VisibleCursor;
257
254 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
255 { 259 {
256 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
257 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
258 262
… …
314{ 318{
315 if (perl) 319 if (perl)
316 { 320 {
317 perl_destruct (perl); 321 perl_destruct (perl);
318 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
319 } 324 }
320} 325}
321 326
322void 327void
323rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
327 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
328 333
329 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
330 swap (perl_environ, environ); 335 swap (perl_environ, environ);
331 336
332 char *argv[] = { 337 char *args[] = {
333 "", 338 "",
334 "-e" 339 "-e"
335 "BEGIN {" 340 "BEGIN {"
336 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
337 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
338 "}" 343 "}"
339 "" 344 ""
340 "use urxvt;" 345 "use urxvt;"
341 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
342 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
343 perl = perl_alloc (); 351 perl = perl_alloc ();
344 perl_construct (perl); 352 perl_construct (perl);
345 353
346 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
347 || perl_run (perl)) 355 || perl_run (perl))
348 { 356 {
349 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
350 358
351 perl_destruct (perl); 359 perl_destruct (perl);
… …
643 static const struct { 651 static const struct {
644 const char *name; 652 const char *name;
645 IV iv; 653 IV iv;
646 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
647# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
648 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
649 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
659 const_iv (Color_Bits),
660 const_iv (RS_bgShift), const_iv (RS_bgMask),
661 const_iv (RS_fgShift), const_iv (RS_fgMask),
662 const_iv (RS_Careful),
663 const_iv (RS_fontCount),
664 const_iv (RS_fontShift),
665 const_iv (RS_fontMask),
666 const_iv (RS_baseattrMask),
667 const_iv (RS_attrMask),
668 const_iv (RS_redraw),
669 const_iv (RS_Sel),
650 const_iv (RS_Bold), 670 const_iv (RS_Bold),
651 const_iv (RS_Italic), 671 const_iv (RS_Italic),
652 const_iv (RS_Blink), 672 const_iv (RS_Blink),
653 const_iv (RS_RVid), 673 const_iv (RS_RVid),
654 const_iv (RS_Uline), 674 const_iv (RS_Uline),
… …
1046 OUTPUT: 1066 OUTPUT:
1047 RETVAL 1067 RETVAL
1048 1068
1049#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1069#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1050 1070
1051#define TERM_OFFSET_width TERM_OFFSET(width) 1071#define TERM_OFFSET_width TERM_OFFSET(width)
1052#define TERM_OFFSET_height TERM_OFFSET(height) 1072#define TERM_OFFSET_height TERM_OFFSET(height)
1053#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1073#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1054#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1074#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1055#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1075#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1056#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1076#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1057#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1077#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1058#define TERM_OFFSET_focus TERM_OFFSET(focus) 1078#define TERM_OFFSET_focus TERM_OFFSET(focus)
1059#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1079#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1060#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1080#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1061#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1081#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1062#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1082#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1083#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1063#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1084#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1064#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1085#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1065#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1086#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1066 1087
1067int 1088int
1068rxvt_term::width () 1089rxvt_term::width ()
1069 ALIAS: 1090 ALIAS:
1070 width = TERM_OFFSET_width 1091 width = TERM_OFFSET_width
1071 height = TERM_OFFSET_height 1092 height = TERM_OFFSET_height
1072 fwidth = TERM_OFFSET_fwidth 1093 fwidth = TERM_OFFSET_fwidth
1073 fheight = TERM_OFFSET_fheight 1094 fheight = TERM_OFFSET_fheight
1074 fbase = TERM_OFFSET_fbase 1095 fbase = TERM_OFFSET_fbase
1075 nrow = TERM_OFFSET_nrow 1096 nrow = TERM_OFFSET_nrow
1076 ncol = TERM_OFFSET_ncol 1097 ncol = TERM_OFFSET_ncol
1077 focus = TERM_OFFSET_focus 1098 focus = TERM_OFFSET_focus
1078 mapped = TERM_OFFSET_mapped 1099 mapped = TERM_OFFSET_mapped
1079 int_bwidth = TERM_OFFSET_int_bwidth 1100 int_bwidth = TERM_OFFSET_int_bwidth
1080 ext_bwidth = TERM_OFFSET_ext_bwidth 1101 ext_bwidth = TERM_OFFSET_ext_bwidth
1081 lineSpace = TERM_OFFSET_lineSpace 1102 lineSpace = TERM_OFFSET_lineSpace
1103 letterSpace = TERM_OFFSET_letterSpace
1082 saveLines = TERM_OFFSET_saveLines 1104 saveLines = TERM_OFFSET_saveLines
1083 total_rows = TERM_OFFSET_total_rows 1105 total_rows = TERM_OFFSET_total_rows
1084 top_row = TERM_OFFSET_top_row 1106 top_row = TERM_OFFSET_top_row
1085 CODE: 1107 CODE:
1086 RETVAL = *(int *)((char *)THIS + ix); 1108 RETVAL = *(int *)((char *)THIS + ix);
1087 OUTPUT: 1109 OUTPUT:
1088 RETVAL 1110 RETVAL
1089 1111
… …
1100 { 1122 {
1101 case 0: RETVAL = THIS->ModLevel3Mask; break; 1123 case 0: RETVAL = THIS->ModLevel3Mask; break;
1102 case 1: RETVAL = THIS->ModMetaMask; break; 1124 case 1: RETVAL = THIS->ModMetaMask; break;
1103 case 2: RETVAL = THIS->ModNumLockMask; break; 1125 case 2: RETVAL = THIS->ModNumLockMask; break;
1104 case 3: RETVAL = THIS->current_screen; break; 1126 case 3: RETVAL = THIS->current_screen; break;
1127#ifdef CURSOR_BLINK
1105 case 4: RETVAL = THIS->hidden_cursor; break; 1128 case 4: RETVAL = THIS->hidden_cursor; break;
1129#endif
1106 } 1130 }
1107 OUTPUT: 1131 OUTPUT:
1108 RETVAL 1132 RETVAL
1109 1133
1110char * 1134char *
… …
1434# undef reserve 1458# undef reserve
1435 }; 1459 };
1436 1460
1437 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1461 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1438 1462
1463 if (*name)
1439 do { 1464 {
1465 do {
1440 if (rs-- == rslist) 1466 if (rs-- == rslist)
1441 croak ("no such resource '%s', requested", name); 1467 croak ("no such resource '%s', requested", name);
1442 } while (strcmp (name, rs->name)); 1468 } while (strcmp (name, rs->name));
1443 1469
1444 index += rs->value; 1470 index += rs->value;
1471 }
1472 else
1473 {
1474 --rs;
1475 name = "";
1476 }
1445 1477
1446 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1478 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1447 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1479 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1448 1480
1449 if (GIMME_V != G_VOID) 1481 if (GIMME_V != G_VOID)
… …
1529 EXTEND (SP, 2); 1561 EXTEND (SP, 2);
1530 PUSHs (sv_2mortal (newSViv (rc.row))); 1562 PUSHs (sv_2mortal (newSViv (rc.row)));
1531 PUSHs (sv_2mortal (newSViv (rc.col))); 1563 PUSHs (sv_2mortal (newSViv (rc.col)));
1532 } 1564 }
1533 1565
1534 if (items == 3) 1566 if (items >= 3)
1535 { 1567 {
1536 rc.row = SvIV (ST (1)); 1568 rc.row = SvIV (ST (1));
1537 rc.col = SvIV (ST (2)); 1569 rc.col = SvIV (ST (2));
1538 1570
1539 if (ix == 2) 1571 if (ix == 2)
… …
1555 clamp_it (rc.col, 0, THIS->ncol); 1587 clamp_it (rc.col, 0, THIS->ncol);
1556 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1588 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1557 1589
1558 if (ix) 1590 if (ix)
1559 { 1591 {
1592 THIS->selection.screen = THIS->current_screen;
1593
1560 THIS->want_refresh = 1; 1594 THIS->want_refresh = 1;
1561 THIS->refresh_check (); 1595 THIS->refresh_check ();
1562 } 1596 }
1563 } 1597 }
1564} 1598}
1565 1599
1566char 1600int
1567rxvt_term::cur_charset () 1601rxvt_term::selection_screen (int screen = -1)
1568 CODE: 1602 CODE:
1569 RETVAL = THIS->charsets [THIS->screen.charset]; 1603 RETVAL = THIS->selection.screen;
1570 OUTPUT: 1604 if (screen >= 0)
1605 THIS->selection.screen = screen;
1606 OUTPUT:
1571 RETVAL 1607 RETVAL
1572 1608
1573void 1609void
1574rxvt_term::selection_clear () 1610rxvt_term::selection_clear (bool clipboard = false)
1575 1611
1576void 1612void
1577rxvt_term::selection_make (Time eventtime, bool rect = false) 1613rxvt_term::selection_make (Time eventtime, bool rect = false)
1578 CODE: 1614 CODE:
1579 THIS->selection.op = SELECTION_CONT; 1615 THIS->selection.op = SELECTION_CONT;
1580 THIS->selection.rect = rect; 1616 THIS->selection.rect = rect;
1581 THIS->selection_make (eventtime); 1617 THIS->selection_make (eventtime);
1582 1618
1583int 1619int
1584rxvt_term::selection_grab (Time eventtime) 1620rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1585 1621
1586void 1622void
1587rxvt_term::selection (SV *newtext = 0) 1623rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1588 PPCODE: 1624 PPCODE:
1589{ 1625{
1626 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1627 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1628
1590 if (GIMME_V != G_VOID) 1629 if (GIMME_V != G_VOID)
1591 XPUSHs (THIS->selection.text 1630 XPUSHs (text
1592 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1631 ? sv_2mortal (wcs2sv (text, len))
1593 : &PL_sv_undef); 1632 : &PL_sv_undef);
1594 1633
1595 if (newtext) 1634 if (newtext)
1596 { 1635 {
1597 free (THIS->selection.text); 1636 free (text);
1598 1637
1599 THIS->selection.text = sv2wcs (newtext); 1638 text = sv2wcs (newtext);
1600 THIS->selection.len = wcslen (THIS->selection.text); 1639 len = wcslen (text);
1601 } 1640 }
1602} 1641}
1642
1643char
1644rxvt_term::cur_charset ()
1645 CODE:
1646 RETVAL = THIS->charsets [THIS->screen.charset];
1647 OUTPUT:
1648 RETVAL
1603 1649
1604void 1650void
1605rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) 1651rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1606 1652
1607void 1653void
… …
1629 char *str = SvPVbyte (octets, len); 1675 char *str = SvPVbyte (octets, len);
1630 C_ARGS: 1676 C_ARGS:
1631 str, len 1677 str, len
1632 1678
1633void 1679void
1680rxvt_term::tt_paste (SV *octets)
1681 INIT:
1682 STRLEN len;
1683 char *str = SvPVbyte (octets, len);
1684 C_ARGS:
1685 str, len
1686
1687void
1634rxvt_term::cmd_parse (SV *octets) 1688rxvt_term::cmd_parse (SV *octets)
1635 CODE: 1689 CODE:
1636{ 1690{
1637 STRLEN len; 1691 STRLEN len;
1638 char *str = SvPVbyte (octets, len); 1692 char *str = SvPVbyte (octets, len);
… …
1707 XFree (prop); 1761 XFree (prop);
1708 } 1762 }
1709} 1763}
1710 1764
1711void 1765void
1712rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1766rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1713 CODE: 1767 CODE:
1714{ 1768{
1715 STRLEN len; 1769 STRLEN len;
1716 char *data_ = SvPVbyte (data, len); 1770 char *data_ = SvPVbyte (data, len);
1717 1771

Diff Legend

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