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.115 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.133 by root, Tue Dec 7 17:51:27 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h" 34#include "unistd.h"
35 35
36#include "iom.h" 36#include "ev_cpp.h"
37#include "rxvt.h" 37#include "rxvt.h"
38#include "keyboard.h" 38#include "keyboard.h"
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->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 {
… …
214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
215 )); 214 ));
216 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
217 216
218 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
219} 219}
220 220
221void 221void
222overlay::hide () 222overlay::hide ()
223{ 223{
… …
237 237
238 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
239 overlay_av = 0; 239 overlay_av = 0;
240 240
241 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
242} 243}
243 244
244void overlay::swap () 245void overlay::swap ()
245{ 246{
246 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 247 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
247 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));
248 249
249 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
250 int ov_h = min (h, THIS->nrow - ov_y); 251 int ov_h = min (h, THIS->nrow - ov_y);
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;
251 257
252 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
253 { 259 {
254 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
255 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
291 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
292 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
293 } 299 }
294 300
295 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
296} 303}
297 304
298///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
299 306
300#define IOM_CLASS "urxvt" 307#define IOM_CLASS "urxvt"
301#define IOM_WARN rxvt_warn 308#define IOM_WARN rxvt_warn
302#include <iom_perl.h> 309#include "iom_perl.h"
303 310
304///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
305 312
306struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
307 314
… …
311{ 318{
312 if (perl) 319 if (perl)
313 { 320 {
314 perl_destruct (perl); 321 perl_destruct (perl);
315 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
316 } 324 }
317} 325}
318 326
319void 327void
320rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
324 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
325 333
326 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
327 swap (perl_environ, environ); 335 swap (perl_environ, environ);
328 336
329 char *argv[] = { 337 char *args[] = {
330 "", 338 "",
331 "-e" 339 "-e"
332 "BEGIN {" 340 "BEGIN {"
333 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
334 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
335 "}" 343 "}"
336 "" 344 ""
337 "use urxvt;" 345 "use urxvt;"
338 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
339 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
340 perl = perl_alloc (); 351 perl = perl_alloc ();
341 perl_construct (perl); 352 perl_construct (perl);
342 353
343 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
344 || perl_run (perl)) 355 || perl_run (perl))
345 { 356 {
346 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
347 358
348 perl_destruct (perl); 359 perl_destruct (perl);
… …
628# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 639# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
629# include "hookinc.h" 640# include "hookinc.h"
630# undef def 641# undef def
631 642
632 HV *option = get_hv ("urxvt::OPTION", 1); 643 HV *option = get_hv ("urxvt::OPTION", 1);
633# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 644# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
634# define nodef(name) 645# define nodef(name)
635# include "optinc.h" 646# include "optinc.h"
636# undef nodef 647# undef nodef
637# undef def 648# undef def
638 649
… …
640 static const struct { 651 static const struct {
641 const char *name; 652 const char *name;
642 IV iv; 653 IV iv;
643 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
644# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
645 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
646 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),
647 const_iv (RS_Bold), 670 const_iv (RS_Bold),
648 const_iv (RS_Italic), 671 const_iv (RS_Italic),
649 const_iv (RS_Blink), 672 const_iv (RS_Blink),
650 const_iv (RS_RVid), 673 const_iv (RS_RVid),
651 const_iv (RS_Uline), 674 const_iv (RS_Uline),
… …
775_exit (int status) 798_exit (int status)
776 799
777NV 800NV
778NOW () 801NOW ()
779 CODE: 802 CODE:
780 RETVAL = NOW; 803 RETVAL = ev::now ();
781 OUTPUT: 804 OUTPUT:
782 RETVAL 805 RETVAL
783 806
784int 807int
785GET_BASEFG (int rend) 808GET_BASEFG (int rend)
… …
857 for (int i = AvFILL (env) + 1; i--; ) 880 for (int i = AvFILL (env) + 1; i--; )
858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 881 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
859 882
860 envv->push_back (0); 883 envv->push_back (0);
861 884
862 bool success;
863
864 try 885 try
865 { 886 {
866 success = term->init (argv, envv); 887 term->init (argv, envv);
867 } 888 }
868 catch (const class rxvt_failure_exception &e) 889 catch (const class rxvt_failure_exception &e)
869 {
870 success = false;
871 }
872
873 if (!success)
874 { 890 {
875 term->destroy (); 891 term->destroy ();
876 croak ("error while initializing new terminal instance"); 892 croak ("error while initializing new terminal instance");
877 } 893 }
878 894
… …
1050 OUTPUT: 1066 OUTPUT:
1051 RETVAL 1067 RETVAL
1052 1068
1053#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1069#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1054 1070
1055#define TERM_OFFSET_width TERM_OFFSET(width) 1071#define TERM_OFFSET_width TERM_OFFSET(width)
1056#define TERM_OFFSET_height TERM_OFFSET(height) 1072#define TERM_OFFSET_height TERM_OFFSET(height)
1057#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1073#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1058#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1074#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1059#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1075#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1060#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1076#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1061#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1077#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1062#define TERM_OFFSET_focus TERM_OFFSET(focus) 1078#define TERM_OFFSET_focus TERM_OFFSET(focus)
1063#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1079#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1064#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1080#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1065#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1081#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1066#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1082#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1083#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1067#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1084#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1068#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1085#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1069#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1086#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1070 1087
1071int 1088int
1072rxvt_term::width () 1089rxvt_term::width ()
1073 ALIAS: 1090 ALIAS:
1074 width = TERM_OFFSET_width 1091 width = TERM_OFFSET_width
1075 height = TERM_OFFSET_height 1092 height = TERM_OFFSET_height
1076 fwidth = TERM_OFFSET_fwidth 1093 fwidth = TERM_OFFSET_fwidth
1077 fheight = TERM_OFFSET_fheight 1094 fheight = TERM_OFFSET_fheight
1078 fbase = TERM_OFFSET_fbase 1095 fbase = TERM_OFFSET_fbase
1079 nrow = TERM_OFFSET_nrow 1096 nrow = TERM_OFFSET_nrow
1080 ncol = TERM_OFFSET_ncol 1097 ncol = TERM_OFFSET_ncol
1081 focus = TERM_OFFSET_focus 1098 focus = TERM_OFFSET_focus
1082 mapped = TERM_OFFSET_mapped 1099 mapped = TERM_OFFSET_mapped
1083 int_bwidth = TERM_OFFSET_int_bwidth 1100 int_bwidth = TERM_OFFSET_int_bwidth
1084 ext_bwidth = TERM_OFFSET_ext_bwidth 1101 ext_bwidth = TERM_OFFSET_ext_bwidth
1085 lineSpace = TERM_OFFSET_lineSpace 1102 lineSpace = TERM_OFFSET_lineSpace
1103 letterSpace = TERM_OFFSET_letterSpace
1086 saveLines = TERM_OFFSET_saveLines 1104 saveLines = TERM_OFFSET_saveLines
1087 total_rows = TERM_OFFSET_total_rows 1105 total_rows = TERM_OFFSET_total_rows
1088 top_row = TERM_OFFSET_top_row 1106 top_row = TERM_OFFSET_top_row
1089 CODE: 1107 CODE:
1090 RETVAL = *(int *)((char *)THIS + ix); 1108 RETVAL = *(int *)((char *)THIS + ix);
1091 OUTPUT: 1109 OUTPUT:
1092 RETVAL 1110 RETVAL
1093 1111
… …
1104 { 1122 {
1105 case 0: RETVAL = THIS->ModLevel3Mask; break; 1123 case 0: RETVAL = THIS->ModLevel3Mask; break;
1106 case 1: RETVAL = THIS->ModMetaMask; break; 1124 case 1: RETVAL = THIS->ModMetaMask; break;
1107 case 2: RETVAL = THIS->ModNumLockMask; break; 1125 case 2: RETVAL = THIS->ModNumLockMask; break;
1108 case 3: RETVAL = THIS->current_screen; break; 1126 case 3: RETVAL = THIS->current_screen; break;
1127#ifdef CURSOR_BLINK
1109 case 4: RETVAL = THIS->hidden_cursor; break; 1128 case 4: RETVAL = THIS->hidden_cursor; break;
1129#endif
1110 } 1130 }
1111 OUTPUT: 1131 OUTPUT:
1112 RETVAL 1132 RETVAL
1113 1133
1114char * 1134char *
… …
1139 if (*i) 1159 if (*i)
1140 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1160 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1141} 1161}
1142 1162
1143int 1163int
1144rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1164rxvt_term::pty_ev_events (int events = ev::UNDEF)
1145 CODE: 1165 CODE:
1146 RETVAL = THIS->pty_ev.events; 1166 RETVAL = THIS->pty_ev.events;
1147 if (events != EVENT_UNDEF) 1167 if (events != ev::UNDEF)
1148 THIS->pty_ev.set (events); 1168 THIS->pty_ev.set (events);
1149 OUTPUT: 1169 OUTPUT:
1150 RETVAL 1170 RETVAL
1151 1171
1152int 1172int
… …
1231 1251
1232void 1252void
1233rxvt_term::want_refresh () 1253rxvt_term::want_refresh ()
1234 CODE: 1254 CODE:
1235 THIS->want_refresh = 1; 1255 THIS->want_refresh = 1;
1256 THIS->refresh_check ();
1236 1257
1237void 1258void
1238rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1259rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1239 PPCODE: 1260 PPCODE:
1240{ 1261{
… …
1437# undef reserve 1458# undef reserve
1438 }; 1459 };
1439 1460
1440 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1461 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1441 1462
1463 if (*name)
1442 do { 1464 {
1465 do {
1443 if (rs-- == rslist) 1466 if (rs-- == rslist)
1444 croak ("no such resource '%s', requested", name); 1467 croak ("no such resource '%s', requested", name);
1445 } while (strcmp (name, rs->name)); 1468 } while (strcmp (name, rs->name));
1446 1469
1447 index += rs->value; 1470 index += rs->value;
1471 }
1472 else
1473 {
1474 --rs;
1475 name = "";
1476 }
1448 1477
1449 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1478 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1450 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);
1451 1480
1452 if (GIMME_V != G_VOID) 1481 if (GIMME_V != G_VOID)
… …
1476 1505
1477 if (set >= 0) 1506 if (set >= 0)
1478 { 1507 {
1479 THIS->set_option (optval, set); 1508 THIS->set_option (optval, set);
1480 1509
1481 if (THIS->check_ev.is_active ()) // avoid doing this before START 1510 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1482 switch (optval) 1511 switch (optval)
1483 { 1512 {
1484 case Opt_skipBuiltinGlyphs: 1513 case Opt_skipBuiltinGlyphs:
1485 THIS->set_fonts (); 1514 THIS->set_fonts ();
1486 THIS->scr_remap_chars (); 1515 THIS->scr_remap_chars ();
1487 THIS->scr_touch (true); 1516 THIS->scr_touch (true);
1488 THIS->want_refresh = 1; 1517 THIS->want_refresh = 1;
1518 THIS->refresh_check ();
1489 break; 1519 break;
1490 1520
1491 case Opt_cursorUnderline: 1521 case Opt_cursorUnderline:
1492 THIS->want_refresh = 1; 1522 THIS->want_refresh = 1;
1523 THIS->refresh_check ();
1493 break; 1524 break;
1494 1525
1495# case Opt_scrollBar_floating: 1526# case Opt_scrollBar_floating:
1496# case Opt_scrollBar_right: 1527# case Opt_scrollBar_right:
1497# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1528# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1530 EXTEND (SP, 2); 1561 EXTEND (SP, 2);
1531 PUSHs (sv_2mortal (newSViv (rc.row))); 1562 PUSHs (sv_2mortal (newSViv (rc.row)));
1532 PUSHs (sv_2mortal (newSViv (rc.col))); 1563 PUSHs (sv_2mortal (newSViv (rc.col)));
1533 } 1564 }
1534 1565
1535 if (items == 3) 1566 if (items >= 3)
1536 { 1567 {
1537 rc.row = SvIV (ST (1)); 1568 rc.row = SvIV (ST (1));
1538 rc.col = SvIV (ST (2)); 1569 rc.col = SvIV (ST (2));
1539 1570
1540 if (ix == 2) 1571 if (ix == 2)
… …
1555 1586
1556 clamp_it (rc.col, 0, THIS->ncol); 1587 clamp_it (rc.col, 0, THIS->ncol);
1557 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1588 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1558 1589
1559 if (ix) 1590 if (ix)
1591 {
1592 THIS->selection.screen = THIS->current_screen;
1593
1560 THIS->want_refresh = 1; 1594 THIS->want_refresh = 1;
1595 THIS->refresh_check ();
1561 } 1596 }
1597 }
1562} 1598}
1563 1599
1564char 1600int
1565rxvt_term::cur_charset () 1601rxvt_term::selection_screen (int screen = -1)
1566 CODE: 1602 CODE:
1567 RETVAL = THIS->charsets [THIS->screen.charset]; 1603 RETVAL = THIS->selection.screen;
1568 OUTPUT: 1604 if (screen >= 0)
1605 THIS->selection.screen = screen;
1606 OUTPUT:
1569 RETVAL 1607 RETVAL
1570 1608
1571void 1609void
1572rxvt_term::selection_clear () 1610rxvt_term::selection_clear (bool clipboard = false)
1573 1611
1574void 1612void
1575rxvt_term::selection_make (Time eventtime, bool rect = false) 1613rxvt_term::selection_make (Time eventtime, bool rect = false)
1576 CODE: 1614 CODE:
1577 THIS->selection.op = SELECTION_CONT; 1615 THIS->selection.op = SELECTION_CONT;
1578 THIS->selection.rect = rect; 1616 THIS->selection.rect = rect;
1579 THIS->selection_make (eventtime); 1617 THIS->selection_make (eventtime);
1580 1618
1581int 1619int
1582rxvt_term::selection_grab (Time eventtime) 1620rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1583 1621
1584void 1622void
1585rxvt_term::selection (SV *newtext = 0) 1623rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1586 PPCODE: 1624 PPCODE:
1587{ 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
1588 if (GIMME_V != G_VOID) 1629 if (GIMME_V != G_VOID)
1589 XPUSHs (THIS->selection.text 1630 XPUSHs (text
1590 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1631 ? sv_2mortal (wcs2sv (text, len))
1591 : &PL_sv_undef); 1632 : &PL_sv_undef);
1592 1633
1593 if (newtext) 1634 if (newtext)
1594 { 1635 {
1595 free (THIS->selection.text); 1636 free (text);
1596 1637
1597 THIS->selection.text = sv2wcs (newtext); 1638 text = sv2wcs (newtext);
1598 THIS->selection.len = wcslen (THIS->selection.text); 1639 len = wcslen (text);
1599 } 1640 }
1600} 1641}
1642
1643char
1644rxvt_term::cur_charset ()
1645 CODE:
1646 RETVAL = THIS->charsets [THIS->screen.charset];
1647 OUTPUT:
1648 RETVAL
1601 1649
1602void 1650void
1603rxvt_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)
1604 1652
1605void 1653void
… …
1627 char *str = SvPVbyte (octets, len); 1675 char *str = SvPVbyte (octets, len);
1628 C_ARGS: 1676 C_ARGS:
1629 str, len 1677 str, len
1630 1678
1631void 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
1632rxvt_term::cmd_parse (SV *octets) 1688rxvt_term::cmd_parse (SV *octets)
1633 CODE: 1689 CODE:
1634{ 1690{
1635 STRLEN len; 1691 STRLEN len;
1636 char *str = SvPVbyte (octets, len); 1692 char *str = SvPVbyte (octets, len);
… …
1705 XFree (prop); 1761 XFree (prop);
1706 } 1762 }
1707} 1763}
1708 1764
1709void 1765void
1710rxvt_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)
1711 CODE: 1767 CODE:
1712{ 1768{
1713 STRLEN len; 1769 STRLEN len;
1714 char *data_ = SvPVbyte (data, len); 1770 char *data_ = SvPVbyte (data, len);
1715 1771

Diff Legend

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