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.113 by ayin, Tue May 1 21:10:04 2007 UTC vs.
Revision 1.131 by root, Sun May 23 00:08:53 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)]
… …
73 69
74 return sv; 70 return sv;
75} 71}
76 72
77static SV * 73static SV *
78new_ref (HV *hv, const char *klass)
79{
80 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
81}
82
83static SV *
84newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
85{ 75{
86 HV *hv = newHV (); 76 HV *hv = newHV ();
87 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 77 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
88 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 78 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
117 107
118///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
119 109
120#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
121 111
122class overlay { 112class overlay : overlay_base
113{
123 rxvt_term *THIS; 114 rxvt_term *THIS;
124 AV *overlay_av; 115 AV *overlay_av;
125 int x, y, w, h;
126 int border; 116 int border;
127 text_t **text;
128 rend_t **rend;
129 117
130public: 118public:
131 HV *self; 119 HV *self;
132 120
133 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);
… …
140 128
141 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
142}; 130};
143 131
144overlay::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)
145: 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)
146{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
147 if (w < 0) w = 0; 140 if (w < 0) w = 0;
148 if (h < 0) h = 0; 141 if (h < 0) h = 0;
149 142
150 if (border == 2) 143 if (border == 2)
151 { 144 {
… …
220 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
221 )); 214 ));
222 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
223 216
224 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
225} 219}
226 220
227void 221void
228overlay::hide () 222overlay::hide ()
229{ 223{
… …
243 237
244 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
245 overlay_av = 0; 239 overlay_av = 0;
246 240
247 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
248} 243}
249 244
250void overlay::swap () 245void overlay::swap ()
251{ 246{
252 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));
253 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));
254 249
255 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
256 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;
257 257
258 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
259 { 259 {
260 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
261 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
299 } 299 }
300 300
301 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
302} 303}
303 304
304///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
305 306
306#define IOM_CLASS "urxvt" 307#define IOM_CLASS "urxvt"
307#define IOM_WARN rxvt_warn 308#define IOM_WARN rxvt_warn
308#include <iom_perl.h> 309#include "iom_perl.h"
309 310
310///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
311 312
312struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
313 314
… …
317{ 318{
318 if (perl) 319 if (perl)
319 { 320 {
320 perl_destruct (perl); 321 perl_destruct (perl);
321 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
322 } 324 }
323} 325}
324 326
325void 327void
326rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
330 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
331 333
332 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
333 swap (perl_environ, environ); 335 swap (perl_environ, environ);
334 336
335 char *argv[] = { 337 char *args[] = {
336 "", 338 "",
337 "-e" 339 "-e"
338 "BEGIN {" 340 "BEGIN {"
339 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
340 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
341 "}" 343 "}"
342 "" 344 ""
343 "use urxvt;" 345 "use urxvt;"
344 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
345 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
346 perl = perl_alloc (); 351 perl = perl_alloc ();
347 perl_construct (perl); 352 perl_construct (perl);
348 353
349 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
350 || perl_run (perl)) 355 || perl_run (perl))
351 { 356 {
352 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
353 358
354 perl_destruct (perl); 359 perl_destruct (perl);
… …
388 393
389 // pre-handling of some events 394 // pre-handling of some events
390 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
391 { 396 {
392 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 397 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
393 398
394 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
395 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
396 } 401 }
397 402
398 swap (perl_environ, environ); 403 swap (perl_environ, environ);
… …
597 602
598 // post-handling of some events 603 // post-handling of some events
599 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
600 { 605 {
601 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 606 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
602 607
603 for (int i = AvFILL (av); i >= 0; i--) 608 for (int i = AvFILL (av); i >= 0; i--)
604 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
605 } 610 }
606 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
607 { 612 {
608 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
609 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
610 615
611 // don't allow further calls 616 // don't allow further calls
612 term->perl.self = 0; 617 term->perl.self = 0;
613 } 618 }
614 619
615 swap (perl_environ, environ); 620 swap (perl_environ, environ);
… …
646 static const struct { 651 static const struct {
647 const char *name; 652 const char *name;
648 IV iv; 653 IV iv;
649 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
650# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
651 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
652 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),
653 const_iv (RS_Bold), 670 const_iv (RS_Bold),
654 const_iv (RS_Italic), 671 const_iv (RS_Italic),
655 const_iv (RS_Blink), 672 const_iv (RS_Blink),
656 const_iv (RS_RVid), 673 const_iv (RS_RVid),
657 const_iv (RS_Uline), 674 const_iv (RS_Uline),
… …
781_exit (int status) 798_exit (int status)
782 799
783NV 800NV
784NOW () 801NOW ()
785 CODE: 802 CODE:
786 RETVAL = NOW; 803 RETVAL = ev::now ();
787 OUTPUT: 804 OUTPUT:
788 RETVAL 805 RETVAL
789 806
790int 807int
791GET_BASEFG (int rend) 808GET_BASEFG (int rend)
… …
863 for (int i = AvFILL (env) + 1; i--; ) 880 for (int i = AvFILL (env) + 1; i--; )
864 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 881 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
865 882
866 envv->push_back (0); 883 envv->push_back (0);
867 884
868 bool success;
869
870 try 885 try
871 { 886 {
872 success = term->init (argv, envv); 887 term->init (argv, envv);
873 } 888 }
874 catch (const class rxvt_failure_exception &e) 889 catch (const class rxvt_failure_exception &e)
875 {
876 success = false;
877 }
878
879 if (!success)
880 { 890 {
881 term->destroy (); 891 term->destroy ();
882 croak ("error while initializing new terminal instance"); 892 croak ("error while initializing new terminal instance");
883 } 893 }
884 894
… …
1056 OUTPUT: 1066 OUTPUT:
1057 RETVAL 1067 RETVAL
1058 1068
1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1069#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1060 1070
1061#define TERM_OFFSET_width TERM_OFFSET(width) 1071#define TERM_OFFSET_width TERM_OFFSET(width)
1062#define TERM_OFFSET_height TERM_OFFSET(height) 1072#define TERM_OFFSET_height TERM_OFFSET(height)
1063#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1073#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1064#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1074#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1065#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1075#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1066#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1076#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1067#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1077#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1068#define TERM_OFFSET_focus TERM_OFFSET(focus) 1078#define TERM_OFFSET_focus TERM_OFFSET(focus)
1069#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1079#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1070#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1080#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1071#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1081#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1072#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1082#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1083#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1084#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1085#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1086#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1076 1087
1077int 1088int
1078rxvt_term::width () 1089rxvt_term::width ()
1079 ALIAS: 1090 ALIAS:
1080 width = TERM_OFFSET_width 1091 width = TERM_OFFSET_width
1081 height = TERM_OFFSET_height 1092 height = TERM_OFFSET_height
1082 fwidth = TERM_OFFSET_fwidth 1093 fwidth = TERM_OFFSET_fwidth
1083 fheight = TERM_OFFSET_fheight 1094 fheight = TERM_OFFSET_fheight
1084 fbase = TERM_OFFSET_fbase 1095 fbase = TERM_OFFSET_fbase
1085 nrow = TERM_OFFSET_nrow 1096 nrow = TERM_OFFSET_nrow
1086 ncol = TERM_OFFSET_ncol 1097 ncol = TERM_OFFSET_ncol
1087 focus = TERM_OFFSET_focus 1098 focus = TERM_OFFSET_focus
1088 mapped = TERM_OFFSET_mapped 1099 mapped = TERM_OFFSET_mapped
1089 int_bwidth = TERM_OFFSET_int_bwidth 1100 int_bwidth = TERM_OFFSET_int_bwidth
1090 ext_bwidth = TERM_OFFSET_ext_bwidth 1101 ext_bwidth = TERM_OFFSET_ext_bwidth
1091 lineSpace = TERM_OFFSET_lineSpace 1102 lineSpace = TERM_OFFSET_lineSpace
1103 letterSpace = TERM_OFFSET_letterSpace
1092 saveLines = TERM_OFFSET_saveLines 1104 saveLines = TERM_OFFSET_saveLines
1093 total_rows = TERM_OFFSET_total_rows 1105 total_rows = TERM_OFFSET_total_rows
1094 top_row = TERM_OFFSET_top_row 1106 top_row = TERM_OFFSET_top_row
1095 CODE: 1107 CODE:
1096 RETVAL = *(int *)((char *)THIS + ix); 1108 RETVAL = *(int *)((char *)THIS + ix);
1097 OUTPUT: 1109 OUTPUT:
1098 RETVAL 1110 RETVAL
1099 1111
… …
1110 { 1122 {
1111 case 0: RETVAL = THIS->ModLevel3Mask; break; 1123 case 0: RETVAL = THIS->ModLevel3Mask; break;
1112 case 1: RETVAL = THIS->ModMetaMask; break; 1124 case 1: RETVAL = THIS->ModMetaMask; break;
1113 case 2: RETVAL = THIS->ModNumLockMask; break; 1125 case 2: RETVAL = THIS->ModNumLockMask; break;
1114 case 3: RETVAL = THIS->current_screen; break; 1126 case 3: RETVAL = THIS->current_screen; break;
1127#ifdef CURSOR_BLINK
1115 case 4: RETVAL = THIS->hidden_cursor; break; 1128 case 4: RETVAL = THIS->hidden_cursor; break;
1129#endif
1116 } 1130 }
1117 OUTPUT: 1131 OUTPUT:
1118 RETVAL 1132 RETVAL
1119 1133
1120char * 1134char *
… …
1145 if (*i) 1159 if (*i)
1146 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1160 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1147} 1161}
1148 1162
1149int 1163int
1150rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1164rxvt_term::pty_ev_events (int events = ev::UNDEF)
1151 CODE: 1165 CODE:
1152 RETVAL = THIS->pty_ev.events; 1166 RETVAL = THIS->pty_ev.events;
1153 if (events != EVENT_UNDEF) 1167 if (events != ev::UNDEF)
1154 THIS->pty_ev.set (events); 1168 THIS->pty_ev.set (events);
1155 OUTPUT: 1169 OUTPUT:
1156 RETVAL 1170 RETVAL
1157 1171
1158int 1172int
… …
1237 1251
1238void 1252void
1239rxvt_term::want_refresh () 1253rxvt_term::want_refresh ()
1240 CODE: 1254 CODE:
1241 THIS->want_refresh = 1; 1255 THIS->want_refresh = 1;
1256 THIS->refresh_check ();
1242 1257
1243void 1258void
1244rxvt_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)
1245 PPCODE: 1260 PPCODE:
1246{ 1261{
… …
1401SV * 1416SV *
1402rxvt_term::special_decode (SV *text) 1417rxvt_term::special_decode (SV *text)
1403 CODE: 1418 CODE:
1404{ 1419{
1405 wchar_t *wstr = sv2wcs (text); 1420 wchar_t *wstr = sv2wcs (text);
1406 int wlen = wcslen (wstr);
1407 int dlen = 0; 1421 int dlen = 0;
1408 1422
1409 // find length 1423 // find length
1410 for (wchar_t *s = wstr; *s; s++) 1424 for (wchar_t *s = wstr; *s; s++)
1411 if (*s == NOCHAR) 1425 if (*s == NOCHAR)
… …
1444# undef reserve 1458# undef reserve
1445 }; 1459 };
1446 1460
1447 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1461 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1448 1462
1463 if (*name)
1449 do { 1464 {
1465 do {
1450 if (rs-- == rslist) 1466 if (rs-- == rslist)
1451 croak ("no such resource '%s', requested", name); 1467 croak ("no such resource '%s', requested", name);
1452 } while (strcmp (name, rs->name)); 1468 } while (strcmp (name, rs->name));
1453 1469
1454 index += rs->value; 1470 index += rs->value;
1471 }
1472 else
1473 {
1474 --rs;
1475 name = "";
1476 }
1455 1477
1456 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1478 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1457 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);
1458 1480
1459 if (GIMME_V != G_VOID) 1481 if (GIMME_V != G_VOID)
… …
1483 1505
1484 if (set >= 0) 1506 if (set >= 0)
1485 { 1507 {
1486 THIS->set_option (optval, set); 1508 THIS->set_option (optval, set);
1487 1509
1488 if (THIS->check_ev.is_active ()) // avoid doing this before START 1510 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1489 switch (optval) 1511 switch (optval)
1490 { 1512 {
1491 case Opt_skipBuiltinGlyphs: 1513 case Opt_skipBuiltinGlyphs:
1492 THIS->set_fonts (); 1514 THIS->set_fonts ();
1493 THIS->scr_remap_chars (); 1515 THIS->scr_remap_chars ();
1494 THIS->scr_touch (true); 1516 THIS->scr_touch (true);
1495 THIS->want_refresh = 1; 1517 THIS->want_refresh = 1;
1518 THIS->refresh_check ();
1496 break; 1519 break;
1497 1520
1498 case Opt_cursorUnderline: 1521 case Opt_cursorUnderline:
1499 THIS->want_refresh = 1; 1522 THIS->want_refresh = 1;
1523 THIS->refresh_check ();
1500 break; 1524 break;
1501 1525
1502# case Opt_scrollBar_floating: 1526# case Opt_scrollBar_floating:
1503# case Opt_scrollBar_right: 1527# case Opt_scrollBar_right:
1504# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1528# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1537 EXTEND (SP, 2); 1561 EXTEND (SP, 2);
1538 PUSHs (sv_2mortal (newSViv (rc.row))); 1562 PUSHs (sv_2mortal (newSViv (rc.row)));
1539 PUSHs (sv_2mortal (newSViv (rc.col))); 1563 PUSHs (sv_2mortal (newSViv (rc.col)));
1540 } 1564 }
1541 1565
1542 if (items == 3) 1566 if (items >= 3)
1543 { 1567 {
1544 rc.row = SvIV (ST (1)); 1568 rc.row = SvIV (ST (1));
1545 rc.col = SvIV (ST (2)); 1569 rc.col = SvIV (ST (2));
1546 1570
1547 if (ix == 2) 1571 if (ix == 2)
… …
1562 1586
1563 clamp_it (rc.col, 0, THIS->ncol); 1587 clamp_it (rc.col, 0, THIS->ncol);
1564 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1588 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1565 1589
1566 if (ix) 1590 if (ix)
1591 {
1592 THIS->selection.screen = THIS->current_screen;
1593
1567 THIS->want_refresh = 1; 1594 THIS->want_refresh = 1;
1595 THIS->refresh_check ();
1568 } 1596 }
1597 }
1569} 1598}
1570 1599
1571char 1600int
1572rxvt_term::cur_charset () 1601rxvt_term::selection_screen (int screen = -1)
1573 CODE: 1602 CODE:
1574 RETVAL = THIS->charsets [THIS->screen.charset]; 1603 RETVAL = THIS->selection.screen;
1575 OUTPUT: 1604 if (screen >= 0)
1605 THIS->selection.screen = screen;
1606 OUTPUT:
1576 RETVAL 1607 RETVAL
1577 1608
1578void 1609void
1579rxvt_term::selection_clear () 1610rxvt_term::selection_clear (bool clipboard = false)
1580 1611
1581void 1612void
1582rxvt_term::selection_make (Time eventtime, bool rect = false) 1613rxvt_term::selection_make (Time eventtime, bool rect = false)
1583 CODE: 1614 CODE:
1584 THIS->selection.op = SELECTION_CONT; 1615 THIS->selection.op = SELECTION_CONT;
1585 THIS->selection.rect = rect; 1616 THIS->selection.rect = rect;
1586 THIS->selection_make (eventtime); 1617 THIS->selection_make (eventtime);
1587 1618
1588int 1619int
1589rxvt_term::selection_grab (Time eventtime) 1620rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1590 1621
1591void 1622void
1592rxvt_term::selection (SV *newtext = 0) 1623rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1593 PPCODE: 1624 PPCODE:
1594{ 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
1595 if (GIMME_V != G_VOID) 1629 if (GIMME_V != G_VOID)
1596 XPUSHs (THIS->selection.text 1630 XPUSHs (text
1597 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1631 ? sv_2mortal (wcs2sv (text, len))
1598 : &PL_sv_undef); 1632 : &PL_sv_undef);
1599 1633
1600 if (newtext) 1634 if (newtext)
1601 { 1635 {
1602 free (THIS->selection.text); 1636 free (text);
1603 1637
1604 THIS->selection.text = sv2wcs (newtext); 1638 text = sv2wcs (newtext);
1605 THIS->selection.len = wcslen (THIS->selection.text); 1639 len = wcslen (text);
1606 } 1640 }
1607} 1641}
1642
1643char
1644rxvt_term::cur_charset ()
1645 CODE:
1646 RETVAL = THIS->charsets [THIS->screen.charset];
1647 OUTPUT:
1648 RETVAL
1608 1649
1609void 1650void
1610rxvt_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)
1611 1652
1612void 1653void
… …
1679 Atom *props = XListProperties (THIS->dpy, window, &count); 1720 Atom *props = XListProperties (THIS->dpy, window, &count);
1680 1721
1681 EXTEND (SP, count); 1722 EXTEND (SP, count);
1682 while (count--) 1723 while (count--)
1683 PUSHs (newSVuv ((U32)props [count])); 1724 PUSHs (newSVuv ((U32)props [count]));
1684 1725
1685 XFree (props); 1726 XFree (props);
1686} 1727}
1687 1728
1688void 1729void
1689rxvt_term::XGetWindowProperty (Window window, Atom property) 1730rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1712 XFree (prop); 1753 XFree (prop);
1713 } 1754 }
1714} 1755}
1715 1756
1716void 1757void
1717rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1758rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1718 CODE: 1759 CODE:
1719{ 1760{
1720 STRLEN len; 1761 STRLEN len;
1721 char *data_ = SvPVbyte (data, len); 1762 char *data_ = SvPVbyte (data, len);
1722 1763

Diff Legend

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