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.110 by root, Thu Dec 14 17:22:04 2006 UTC vs.
Revision 1.128 by root, Sat Dec 26 09:42:16 2009 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)]
54 50
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 51/////////////////////////////////////////////////////////////////////////////
58 52
59static wchar_t * 53static wchar_t *
60sv2wcs (SV *sv) 54sv2wcs (SV *sv)
61{ 55{
… …
75 69
76 return sv; 70 return sv;
77} 71}
78 72
79static SV * 73static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85static SV *
86newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
87{ 75{
88 HV *hv = newHV (); 76 HV *hv = newHV ();
89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 77 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
90 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 78 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
119 107
120///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
121 109
122#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
123 111
124class overlay { 112class overlay : overlay_base
113{
125 rxvt_term *THIS; 114 rxvt_term *THIS;
126 AV *overlay_av; 115 AV *overlay_av;
127 int x, y, w, h;
128 int border; 116 int border;
129 text_t **text;
130 rend_t **rend;
131 117
132public: 118public:
133 HV *self; 119 HV *self;
134 120
135 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);
… …
142 128
143 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
144}; 130};
145 131
146overlay::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)
147: 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)
148{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
149 if (w < 0) w = 0; 140 if (w < 0) w = 0;
150 if (h < 0) h = 0; 141 if (h < 0) h = 0;
151 142
152 if (border == 2) 143 if (border == 2)
153 { 144 {
… …
222 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
223 )); 214 ));
224 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
225 216
226 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
227} 219}
228 220
229void 221void
230overlay::hide () 222overlay::hide ()
231{ 223{
… …
245 237
246 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
247 overlay_av = 0; 239 overlay_av = 0;
248 240
249 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
250} 243}
251 244
252void overlay::swap () 245void overlay::swap ()
253{ 246{
254 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));
255 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));
256 249
257 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
258 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;
259 257
260 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
261 { 259 {
262 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
263 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
299 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
300 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
301 } 299 }
302 300
303 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
304} 303}
305 304
306///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
307 306
308#define IOM_CLASS "urxvt" 307#define IOM_CLASS "urxvt"
308#define IOM_WARN rxvt_warn
309#include <iom_perl.h> 309#include "iom_perl.h"
310 310
311///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
312 312
313struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
314 314
… …
318{ 318{
319 if (perl) 319 if (perl)
320 { 320 {
321 perl_destruct (perl); 321 perl_destruct (perl);
322 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
323 } 324 }
324} 325}
325 326
326void 327void
327rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
331 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
332 333
333 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
334 swap (perl_environ, environ); 335 swap (perl_environ, environ);
335 336
336 char *argv[] = { 337 char *args[] = {
337 "", 338 "",
338 "-e" 339 "-e"
339 "BEGIN {" 340 "BEGIN {"
340 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
341 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
342 "}" 343 "}"
343 "" 344 ""
344 "use urxvt;" 345 "use urxvt;"
345 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
346 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
347 perl = perl_alloc (); 351 perl = perl_alloc ();
348 perl_construct (perl); 352 perl_construct (perl);
349 353
350 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
351 || perl_run (perl)) 355 || perl_run (perl))
352 { 356 {
353 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
354 358
355 perl_destruct (perl); 359 perl_destruct (perl);
… …
389 393
390 // pre-handling of some events 394 // pre-handling of some events
391 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
392 { 396 {
393 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));
394 398
395 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
396 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
397 } 401 }
398 402
399 swap (perl_environ, environ); 403 swap (perl_environ, environ);
… …
598 602
599 // post-handling of some events 603 // post-handling of some events
600 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
601 { 605 {
602 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));
603 607
604 for (int i = AvFILL (av); i >= 0; i--) 608 for (int i = AvFILL (av); i >= 0; i--)
605 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
606 } 610 }
607 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
608 { 612 {
609 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
610 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
611 615
612 // don't allow further calls 616 // don't allow further calls
613 term->perl.self = 0; 617 term->perl.self = 0;
614 } 618 }
615 619
616 swap (perl_environ, environ); 620 swap (perl_environ, environ);
… …
647 static const struct { 651 static const struct {
648 const char *name; 652 const char *name;
649 IV iv; 653 IV iv;
650 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
651# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
652 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
653 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
654 const_iv (RS_Bold), 659 const_iv (RS_Bold),
655 const_iv (RS_Italic), 660 const_iv (RS_Italic),
656 const_iv (RS_Blink), 661 const_iv (RS_Blink),
… …
782_exit (int status) 787_exit (int status)
783 788
784NV 789NV
785NOW () 790NOW ()
786 CODE: 791 CODE:
787 RETVAL = NOW; 792 RETVAL = ev::now ();
788 OUTPUT: 793 OUTPUT:
789 RETVAL 794 RETVAL
790 795
791int 796int
792GET_BASEFG (int rend) 797GET_BASEFG (int rend)
… …
864 for (int i = AvFILL (env) + 1; i--; ) 869 for (int i = AvFILL (env) + 1; i--; )
865 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 870 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
866 871
867 envv->push_back (0); 872 envv->push_back (0);
868 873
869 bool success;
870
871 try 874 try
872 { 875 {
873 success = term->init (argv, envv); 876 term->init (argv, envv);
874 } 877 }
875 catch (const class rxvt_failure_exception &e) 878 catch (const class rxvt_failure_exception &e)
876 {
877 success = false;
878 }
879
880 if (!success)
881 { 879 {
882 term->destroy (); 880 term->destroy ();
883 croak ("error while initializing new terminal instance"); 881 croak ("error while initializing new terminal instance");
884 } 882 }
885 883
… …
1057 OUTPUT: 1055 OUTPUT:
1058 RETVAL 1056 RETVAL
1059 1057
1060#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1061 1059
1062#define TERM_OFFSET_width TERM_OFFSET(width) 1060#define TERM_OFFSET_width TERM_OFFSET(width)
1063#define TERM_OFFSET_height TERM_OFFSET(height) 1061#define TERM_OFFSET_height TERM_OFFSET(height)
1064#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1065#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1066#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1067#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1068#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1069#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1070#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1071#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1072#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1073#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1072#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1074#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1075#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1076#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1077 1076
1078int 1077int
1079rxvt_term::width () 1078rxvt_term::width ()
1080 ALIAS: 1079 ALIAS:
1081 width = TERM_OFFSET_width 1080 width = TERM_OFFSET_width
1082 height = TERM_OFFSET_height 1081 height = TERM_OFFSET_height
1083 fwidth = TERM_OFFSET_fwidth 1082 fwidth = TERM_OFFSET_fwidth
1084 fheight = TERM_OFFSET_fheight 1083 fheight = TERM_OFFSET_fheight
1085 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1086 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1087 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1088 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1089 mapped = TERM_OFFSET_mapped 1088 mapped = TERM_OFFSET_mapped
1090 int_bwidth = TERM_OFFSET_int_bwidth 1089 int_bwidth = TERM_OFFSET_int_bwidth
1091 ext_bwidth = TERM_OFFSET_ext_bwidth 1090 ext_bwidth = TERM_OFFSET_ext_bwidth
1092 lineSpace = TERM_OFFSET_lineSpace 1091 lineSpace = TERM_OFFSET_lineSpace
1092 letterSpace = TERM_OFFSET_letterSpace
1093 saveLines = TERM_OFFSET_saveLines 1093 saveLines = TERM_OFFSET_saveLines
1094 total_rows = TERM_OFFSET_total_rows 1094 total_rows = TERM_OFFSET_total_rows
1095 top_row = TERM_OFFSET_top_row 1095 top_row = TERM_OFFSET_top_row
1096 CODE: 1096 CODE:
1097 RETVAL = *(int *)((char *)THIS + ix); 1097 RETVAL = *(int *)((char *)THIS + ix);
1098 OUTPUT: 1098 OUTPUT:
1099 RETVAL 1099 RETVAL
1100 1100
… …
1111 { 1111 {
1112 case 0: RETVAL = THIS->ModLevel3Mask; break; 1112 case 0: RETVAL = THIS->ModLevel3Mask; break;
1113 case 1: RETVAL = THIS->ModMetaMask; break; 1113 case 1: RETVAL = THIS->ModMetaMask; break;
1114 case 2: RETVAL = THIS->ModNumLockMask; break; 1114 case 2: RETVAL = THIS->ModNumLockMask; break;
1115 case 3: RETVAL = THIS->current_screen; break; 1115 case 3: RETVAL = THIS->current_screen; break;
1116#ifdef CURSOR_BLINK
1116 case 4: RETVAL = THIS->hidden_cursor; break; 1117 case 4: RETVAL = THIS->hidden_cursor; break;
1118#endif
1117 } 1119 }
1118 OUTPUT: 1120 OUTPUT:
1119 RETVAL 1121 RETVAL
1120 1122
1121char * 1123char *
… …
1146 if (*i) 1148 if (*i)
1147 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1149 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1148} 1150}
1149 1151
1150int 1152int
1151rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1153rxvt_term::pty_ev_events (int events = ev::UNDEF)
1152 CODE: 1154 CODE:
1153 RETVAL = THIS->pty_ev.events; 1155 RETVAL = THIS->pty_ev.events;
1154 if (events != EVENT_UNDEF) 1156 if (events != ev::UNDEF)
1155 THIS->pty_ev.set (events); 1157 THIS->pty_ev.set (events);
1156 OUTPUT: 1158 OUTPUT:
1157 RETVAL 1159 RETVAL
1158 1160
1159int 1161int
… …
1238 1240
1239void 1241void
1240rxvt_term::want_refresh () 1242rxvt_term::want_refresh ()
1241 CODE: 1243 CODE:
1242 THIS->want_refresh = 1; 1244 THIS->want_refresh = 1;
1245 THIS->refresh_check ();
1243 1246
1244void 1247void
1245rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1248rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1246 PPCODE: 1249 PPCODE:
1247{ 1250{
… …
1402SV * 1405SV *
1403rxvt_term::special_decode (SV *text) 1406rxvt_term::special_decode (SV *text)
1404 CODE: 1407 CODE:
1405{ 1408{
1406 wchar_t *wstr = sv2wcs (text); 1409 wchar_t *wstr = sv2wcs (text);
1407 int wlen = wcslen (wstr);
1408 int dlen = 0; 1410 int dlen = 0;
1409 1411
1410 // find length 1412 // find length
1411 for (wchar_t *s = wstr; *s; s++) 1413 for (wchar_t *s = wstr; *s; s++)
1412 if (*s == NOCHAR) 1414 if (*s == NOCHAR)
… …
1445# undef reserve 1447# undef reserve
1446 }; 1448 };
1447 1449
1448 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1450 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1449 1451
1452 if (*name)
1450 do { 1453 {
1454 do {
1451 if (rs-- == rslist) 1455 if (rs-- == rslist)
1452 croak ("no such resource '%s', requested", name); 1456 croak ("no such resource '%s', requested", name);
1453 } while (strcmp (name, rs->name)); 1457 } while (strcmp (name, rs->name));
1454 1458
1455 index += rs->value; 1459 index += rs->value;
1460 }
1461 else
1462 {
1463 --rs;
1464 name = "";
1465 }
1456 1466
1457 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1467 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1458 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1468 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1459 1469
1460 if (GIMME_V != G_VOID) 1470 if (GIMME_V != G_VOID)
… …
1475 1485
1476const char * 1486const char *
1477rxvt_term::x_resource (const char *name) 1487rxvt_term::x_resource (const char *name)
1478 1488
1479bool 1489bool
1480rxvt_term::option (U32 optval, int set = -1) 1490rxvt_term::option (U8 optval, int set = -1)
1481 CODE: 1491 CODE:
1482{ 1492{
1483 RETVAL = THIS->options & optval; 1493 RETVAL = THIS->option (optval);
1484 1494
1485 if (set >= 0) 1495 if (set >= 0)
1486 { 1496 {
1487 if (set)
1488 THIS->options |= optval; 1497 THIS->set_option (optval, set);
1489 else
1490 THIS->options &= ~optval;
1491 1498
1492 if (THIS->check_ev.is_active ()) // avoid doing this before START 1499 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1493 switch (optval) 1500 switch (optval)
1494 { 1501 {
1495 case Opt_skipBuiltinGlyphs: 1502 case Opt_skipBuiltinGlyphs:
1496 THIS->set_fonts (); 1503 THIS->set_fonts ();
1497 THIS->scr_remap_chars (); 1504 THIS->scr_remap_chars ();
1498 THIS->scr_touch (true); 1505 THIS->scr_touch (true);
1499 THIS->want_refresh = 1; 1506 THIS->want_refresh = 1;
1507 THIS->refresh_check ();
1500 break; 1508 break;
1501 1509
1502 case Opt_cursorUnderline: 1510 case Opt_cursorUnderline:
1503 THIS->want_refresh = 1; 1511 THIS->want_refresh = 1;
1512 THIS->refresh_check ();
1504 break; 1513 break;
1505 1514
1506# case Opt_scrollBar_floating: 1515# case Opt_scrollBar_floating:
1507# case Opt_scrollBar_right: 1516# case Opt_scrollBar_right:
1508# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1517# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1541 EXTEND (SP, 2); 1550 EXTEND (SP, 2);
1542 PUSHs (sv_2mortal (newSViv (rc.row))); 1551 PUSHs (sv_2mortal (newSViv (rc.row)));
1543 PUSHs (sv_2mortal (newSViv (rc.col))); 1552 PUSHs (sv_2mortal (newSViv (rc.col)));
1544 } 1553 }
1545 1554
1546 if (items == 3) 1555 if (items >= 3)
1547 { 1556 {
1548 rc.row = SvIV (ST (1)); 1557 rc.row = SvIV (ST (1));
1549 rc.col = SvIV (ST (2)); 1558 rc.col = SvIV (ST (2));
1550 1559
1551 if (ix == 2) 1560 if (ix == 2)
… …
1566 1575
1567 clamp_it (rc.col, 0, THIS->ncol); 1576 clamp_it (rc.col, 0, THIS->ncol);
1568 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1577 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1569 1578
1570 if (ix) 1579 if (ix)
1580 {
1581 THIS->selection.screen = THIS->current_screen;
1582
1571 THIS->want_refresh = 1; 1583 THIS->want_refresh = 1;
1584 THIS->refresh_check ();
1572 } 1585 }
1586 }
1573} 1587}
1574 1588
1575char 1589int
1576rxvt_term::cur_charset () 1590rxvt_term::selection_screen (int screen = -1)
1577 CODE: 1591 CODE:
1578 RETVAL = THIS->charsets [THIS->screen.charset]; 1592 RETVAL = THIS->selection.screen;
1579 OUTPUT: 1593 if (screen >= 0)
1594 THIS->selection.screen = screen;
1595 OUTPUT:
1580 RETVAL 1596 RETVAL
1581 1597
1582void 1598void
1583rxvt_term::selection_clear () 1599rxvt_term::selection_clear ()
1584 1600
… …
1607 1623
1608 THIS->selection.text = sv2wcs (newtext); 1624 THIS->selection.text = sv2wcs (newtext);
1609 THIS->selection.len = wcslen (THIS->selection.text); 1625 THIS->selection.len = wcslen (THIS->selection.text);
1610 } 1626 }
1611} 1627}
1628
1629char
1630rxvt_term::cur_charset ()
1631 CODE:
1632 RETVAL = THIS->charsets [THIS->screen.charset];
1633 OUTPUT:
1634 RETVAL
1612 1635
1613void 1636void
1614rxvt_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) 1637rxvt_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)
1615 1638
1616void 1639void
… …
1683 Atom *props = XListProperties (THIS->dpy, window, &count); 1706 Atom *props = XListProperties (THIS->dpy, window, &count);
1684 1707
1685 EXTEND (SP, count); 1708 EXTEND (SP, count);
1686 while (count--) 1709 while (count--)
1687 PUSHs (newSVuv ((U32)props [count])); 1710 PUSHs (newSVuv ((U32)props [count]));
1688 1711
1689 XFree (props); 1712 XFree (props);
1690} 1713}
1691 1714
1692void 1715void
1693rxvt_term::XGetWindowProperty (Window window, Atom property) 1716rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1716 XFree (prop); 1739 XFree (prop);
1717 } 1740 }
1718} 1741}
1719 1742
1720void 1743void
1721rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1744rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1722 CODE: 1745 CODE:
1723{ 1746{
1724 STRLEN len; 1747 STRLEN len;
1725 char *data_ = SvPVbyte (data, len); 1748 char *data_ = SvPVbyte (data, len);
1726 1749

Diff Legend

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