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.111 by root, Thu Dec 14 17:33:53 2006 UTC vs.
Revision 1.127 by root, Sat May 30 08:51:23 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)]
… …
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"
308#define IOM_WARN rxvt_warn
307#include <iom_perl.h> 309#include "iom_perl.h"
308 310
309///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
310 312
311struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
312 314
… …
316{ 318{
317 if (perl) 319 if (perl)
318 { 320 {
319 perl_destruct (perl); 321 perl_destruct (perl);
320 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
321 } 324 }
322} 325}
323 326
324void 327void
325rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
329 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
330 333
331 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
332 swap (perl_environ, environ); 335 swap (perl_environ, environ);
333 336
334 char *argv[] = { 337 char *args[] = {
335 "", 338 "",
336 "-e" 339 "-e"
337 "BEGIN {" 340 "BEGIN {"
338 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
339 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
340 "}" 343 "}"
341 "" 344 ""
342 "use urxvt;" 345 "use urxvt;"
343 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
344 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
345 perl = perl_alloc (); 351 perl = perl_alloc ();
346 perl_construct (perl); 352 perl_construct (perl);
347 353
348 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
349 || perl_run (perl)) 355 || perl_run (perl))
350 { 356 {
351 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
352 358
353 perl_destruct (perl); 359 perl_destruct (perl);
… …
387 393
388 // pre-handling of some events 394 // pre-handling of some events
389 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
390 { 396 {
391 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));
392 398
393 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
394 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
395 } 401 }
396 402
397 swap (perl_environ, environ); 403 swap (perl_environ, environ);
… …
596 602
597 // post-handling of some events 603 // post-handling of some events
598 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
599 { 605 {
600 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));
601 607
602 for (int i = AvFILL (av); i >= 0; i--) 608 for (int i = AvFILL (av); i >= 0; i--)
603 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
604 } 610 }
605 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
606 { 612 {
607 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
608 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
609 615
610 // don't allow further calls 616 // don't allow further calls
611 term->perl.self = 0; 617 term->perl.self = 0;
612 } 618 }
613 619
614 swap (perl_environ, environ); 620 swap (perl_environ, environ);
… …
645 static const struct { 651 static const struct {
646 const char *name; 652 const char *name;
647 IV iv; 653 IV iv;
648 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
649# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
650 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
651 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
652 const_iv (RS_Bold), 659 const_iv (RS_Bold),
653 const_iv (RS_Italic), 660 const_iv (RS_Italic),
654 const_iv (RS_Blink), 661 const_iv (RS_Blink),
… …
780_exit (int status) 787_exit (int status)
781 788
782NV 789NV
783NOW () 790NOW ()
784 CODE: 791 CODE:
785 RETVAL = NOW; 792 RETVAL = ev::now ();
786 OUTPUT: 793 OUTPUT:
787 RETVAL 794 RETVAL
788 795
789int 796int
790GET_BASEFG (int rend) 797GET_BASEFG (int rend)
… …
862 for (int i = AvFILL (env) + 1; i--; ) 869 for (int i = AvFILL (env) + 1; i--; )
863 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 870 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
864 871
865 envv->push_back (0); 872 envv->push_back (0);
866 873
867 bool success;
868
869 try 874 try
870 { 875 {
871 success = term->init (argv, envv); 876 term->init (argv, envv);
872 } 877 }
873 catch (const class rxvt_failure_exception &e) 878 catch (const class rxvt_failure_exception &e)
874 {
875 success = false;
876 }
877
878 if (!success)
879 { 879 {
880 term->destroy (); 880 term->destroy ();
881 croak ("error while initializing new terminal instance"); 881 croak ("error while initializing new terminal instance");
882 } 882 }
883 883
… …
1055 OUTPUT: 1055 OUTPUT:
1056 RETVAL 1056 RETVAL
1057 1057
1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1059 1059
1060#define TERM_OFFSET_width TERM_OFFSET(width) 1060#define TERM_OFFSET_width TERM_OFFSET(width)
1061#define TERM_OFFSET_height TERM_OFFSET(height) 1061#define TERM_OFFSET_height TERM_OFFSET(height)
1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1067#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1072#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1072#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1073#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1074#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1075 1076
1076int 1077int
1077rxvt_term::width () 1078rxvt_term::width ()
1078 ALIAS: 1079 ALIAS:
1079 width = TERM_OFFSET_width 1080 width = TERM_OFFSET_width
1080 height = TERM_OFFSET_height 1081 height = TERM_OFFSET_height
1081 fwidth = TERM_OFFSET_fwidth 1082 fwidth = TERM_OFFSET_fwidth
1082 fheight = TERM_OFFSET_fheight 1083 fheight = TERM_OFFSET_fheight
1083 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1084 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1085 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1086 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1087 mapped = TERM_OFFSET_mapped 1088 mapped = TERM_OFFSET_mapped
1088 int_bwidth = TERM_OFFSET_int_bwidth 1089 int_bwidth = TERM_OFFSET_int_bwidth
1089 ext_bwidth = TERM_OFFSET_ext_bwidth 1090 ext_bwidth = TERM_OFFSET_ext_bwidth
1090 lineSpace = TERM_OFFSET_lineSpace 1091 lineSpace = TERM_OFFSET_lineSpace
1092 letterSpace = TERM_OFFSET_letterSpace
1091 saveLines = TERM_OFFSET_saveLines 1093 saveLines = TERM_OFFSET_saveLines
1092 total_rows = TERM_OFFSET_total_rows 1094 total_rows = TERM_OFFSET_total_rows
1093 top_row = TERM_OFFSET_top_row 1095 top_row = TERM_OFFSET_top_row
1094 CODE: 1096 CODE:
1095 RETVAL = *(int *)((char *)THIS + ix); 1097 RETVAL = *(int *)((char *)THIS + ix);
1096 OUTPUT: 1098 OUTPUT:
1097 RETVAL 1099 RETVAL
1098 1100
… …
1109 { 1111 {
1110 case 0: RETVAL = THIS->ModLevel3Mask; break; 1112 case 0: RETVAL = THIS->ModLevel3Mask; break;
1111 case 1: RETVAL = THIS->ModMetaMask; break; 1113 case 1: RETVAL = THIS->ModMetaMask; break;
1112 case 2: RETVAL = THIS->ModNumLockMask; break; 1114 case 2: RETVAL = THIS->ModNumLockMask; break;
1113 case 3: RETVAL = THIS->current_screen; break; 1115 case 3: RETVAL = THIS->current_screen; break;
1116#ifdef CURSOR_BLINK
1114 case 4: RETVAL = THIS->hidden_cursor; break; 1117 case 4: RETVAL = THIS->hidden_cursor; break;
1118#endif
1115 } 1119 }
1116 OUTPUT: 1120 OUTPUT:
1117 RETVAL 1121 RETVAL
1118 1122
1119char * 1123char *
… …
1144 if (*i) 1148 if (*i)
1145 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1149 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1146} 1150}
1147 1151
1148int 1152int
1149rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1153rxvt_term::pty_ev_events (int events = ev::UNDEF)
1150 CODE: 1154 CODE:
1151 RETVAL = THIS->pty_ev.events; 1155 RETVAL = THIS->pty_ev.events;
1152 if (events != EVENT_UNDEF) 1156 if (events != ev::UNDEF)
1153 THIS->pty_ev.set (events); 1157 THIS->pty_ev.set (events);
1154 OUTPUT: 1158 OUTPUT:
1155 RETVAL 1159 RETVAL
1156 1160
1157int 1161int
… …
1236 1240
1237void 1241void
1238rxvt_term::want_refresh () 1242rxvt_term::want_refresh ()
1239 CODE: 1243 CODE:
1240 THIS->want_refresh = 1; 1244 THIS->want_refresh = 1;
1245 THIS->refresh_check ();
1241 1246
1242void 1247void
1243rxvt_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)
1244 PPCODE: 1249 PPCODE:
1245{ 1250{
… …
1400SV * 1405SV *
1401rxvt_term::special_decode (SV *text) 1406rxvt_term::special_decode (SV *text)
1402 CODE: 1407 CODE:
1403{ 1408{
1404 wchar_t *wstr = sv2wcs (text); 1409 wchar_t *wstr = sv2wcs (text);
1405 int wlen = wcslen (wstr);
1406 int dlen = 0; 1410 int dlen = 0;
1407 1411
1408 // find length 1412 // find length
1409 for (wchar_t *s = wstr; *s; s++) 1413 for (wchar_t *s = wstr; *s; s++)
1410 if (*s == NOCHAR) 1414 if (*s == NOCHAR)
… …
1443# undef reserve 1447# undef reserve
1444 }; 1448 };
1445 1449
1446 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1450 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1447 1451
1452 if (*name)
1448 do { 1453 {
1454 do {
1449 if (rs-- == rslist) 1455 if (rs-- == rslist)
1450 croak ("no such resource '%s', requested", name); 1456 croak ("no such resource '%s', requested", name);
1451 } while (strcmp (name, rs->name)); 1457 } while (strcmp (name, rs->name));
1452 1458
1453 index += rs->value; 1459 index += rs->value;
1460 }
1461 else
1462 {
1463 --rs;
1464 name = "";
1465 }
1454 1466
1455 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1467 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1456 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);
1457 1469
1458 if (GIMME_V != G_VOID) 1470 if (GIMME_V != G_VOID)
… …
1473 1485
1474const char * 1486const char *
1475rxvt_term::x_resource (const char *name) 1487rxvt_term::x_resource (const char *name)
1476 1488
1477bool 1489bool
1478rxvt_term::option (U32 optval, int set = -1) 1490rxvt_term::option (U8 optval, int set = -1)
1479 CODE: 1491 CODE:
1480{ 1492{
1481 RETVAL = THIS->options & optval; 1493 RETVAL = THIS->option (optval);
1482 1494
1483 if (set >= 0) 1495 if (set >= 0)
1484 { 1496 {
1485 if (set)
1486 THIS->options |= optval; 1497 THIS->set_option (optval, set);
1487 else
1488 THIS->options &= ~optval;
1489 1498
1490 if (THIS->check_ev.is_active ()) // avoid doing this before START 1499 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1491 switch (optval) 1500 switch (optval)
1492 { 1501 {
1493 case Opt_skipBuiltinGlyphs: 1502 case Opt_skipBuiltinGlyphs:
1494 THIS->set_fonts (); 1503 THIS->set_fonts ();
1495 THIS->scr_remap_chars (); 1504 THIS->scr_remap_chars ();
1496 THIS->scr_touch (true); 1505 THIS->scr_touch (true);
1497 THIS->want_refresh = 1; 1506 THIS->want_refresh = 1;
1507 THIS->refresh_check ();
1498 break; 1508 break;
1499 1509
1500 case Opt_cursorUnderline: 1510 case Opt_cursorUnderline:
1501 THIS->want_refresh = 1; 1511 THIS->want_refresh = 1;
1512 THIS->refresh_check ();
1502 break; 1513 break;
1503 1514
1504# case Opt_scrollBar_floating: 1515# case Opt_scrollBar_floating:
1505# case Opt_scrollBar_right: 1516# case Opt_scrollBar_right:
1506# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1517# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1564 1575
1565 clamp_it (rc.col, 0, THIS->ncol); 1576 clamp_it (rc.col, 0, THIS->ncol);
1566 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1577 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1567 1578
1568 if (ix) 1579 if (ix)
1580 {
1569 THIS->want_refresh = 1; 1581 THIS->want_refresh = 1;
1582 THIS->refresh_check ();
1583 }
1570 } 1584 }
1571} 1585}
1572 1586
1573char 1587char
1574rxvt_term::cur_charset () 1588rxvt_term::cur_charset ()
… …
1681 Atom *props = XListProperties (THIS->dpy, window, &count); 1695 Atom *props = XListProperties (THIS->dpy, window, &count);
1682 1696
1683 EXTEND (SP, count); 1697 EXTEND (SP, count);
1684 while (count--) 1698 while (count--)
1685 PUSHs (newSVuv ((U32)props [count])); 1699 PUSHs (newSVuv ((U32)props [count]));
1686 1700
1687 XFree (props); 1701 XFree (props);
1688} 1702}
1689 1703
1690void 1704void
1691rxvt_term::XGetWindowProperty (Window window, Atom property) 1705rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1714 XFree (prop); 1728 XFree (prop);
1715 } 1729 }
1716} 1730}
1717 1731
1718void 1732void
1719rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1733rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1720 CODE: 1734 CODE:
1721{ 1735{
1722 STRLEN len; 1736 STRLEN len;
1723 char *data_ = SvPVbyte (data, len); 1737 char *data_ = SvPVbyte (data, len);
1724 1738

Diff Legend

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