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.102 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.126 by root, Wed Nov 5 14:43:54 2008 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));
… …
117#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self) 105#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
118#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term") 106#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
119 107
120///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
121 109
122#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
123
124struct perl_watcher
125{
126 SV *cbsv;
127 HV *self;
128
129 perl_watcher ()
130 : cbsv (0)
131 {
132 }
133
134 ~perl_watcher ()
135 {
136 SvREFCNT_dec (cbsv);
137 }
138
139 void cb (SV *cb)
140 {
141 SvREFCNT_dec (cbsv);
142 cbsv = newSVsv (cb);
143 }
144
145 void invoke (const char *type, SV *self, int arg = -1);
146};
147
148void
149perl_watcher::invoke (const char *type, SV *self, int arg)
150{
151 dSP;
152
153 ENTER;
154 SAVETMPS;
155
156 PUSHMARK (SP);
157
158 XPUSHs (sv_2mortal (self));
159
160 if (arg >= 0)
161 XPUSHs (sv_2mortal (newSViv (arg)));
162
163 PUTBACK;
164 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
165 SPAGAIN;
166
167 PUTBACK;
168 FREETMPS;
169 LEAVE;
170
171 if (SvTRUE (ERRSV))
172 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
173}
174
175#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
176#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR ((sv), "urxvt::timer")
177
178struct timer : perl_watcher, time_watcher
179{
180 tstamp interval;
181
182 timer ()
183 : time_watcher (this, &timer::execute)
184 {
185 }
186
187 void execute (time_watcher &w)
188 {
189 if (interval)
190 start (at + interval);
191
192 invoke ("urxvt::timer", newSVtimer (this));
193 }
194};
195
196#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
197#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR ((sv), "urxvt::iow")
198
199struct iow : perl_watcher, io_watcher
200{
201 iow ()
202 : io_watcher (this, &iow::execute)
203 {
204 }
205
206 void execute (io_watcher &w, short revents)
207 {
208 invoke ("urxvt::iow", newSViow (this), revents);
209 }
210};
211
212#define newSViw(iw) new_ref ((iw)->self, "urxvt::iw")
213#define SvIW(sv) (iw *)(perl_watcher *)SvPTR ((sv), "urxvt::iw")
214
215struct iw : perl_watcher, idle_watcher
216{
217 iw ()
218 : idle_watcher (this, &iw::execute)
219 {
220 }
221
222 void execute (idle_watcher &w)
223 {
224 invoke ("urxvt::iw", newSViw (this));
225 }
226};
227
228#define newSVpw(pw) new_ref ((pw)->self, "urxvt::pw")
229#define SvPW(sv) (pw *)(perl_watcher *)SvPTR ((sv), "urxvt::pw")
230
231struct pw : perl_watcher, child_watcher
232{
233 pw ()
234 : child_watcher (this, &pw::execute)
235 {
236 }
237
238 void execute (child_watcher &w, int status)
239 {
240 invoke ("urxvt::pw", newSVpw (this), status);
241 }
242};
243
244/////////////////////////////////////////////////////////////////////////////
245
246#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
247 111
248class overlay { 112class overlay : overlay_base
113{
249 rxvt_term *THIS; 114 rxvt_term *THIS;
250 AV *overlay_av; 115 AV *overlay_av;
251 int x, y, w, h;
252 int border; 116 int border;
253 text_t **text;
254 rend_t **rend;
255 117
256public: 118public:
257 HV *self; 119 HV *self;
258 120
259 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);
… …
266 128
267 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
268}; 130};
269 131
270overlay::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)
271: 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)
272{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
140 if (w < 0) w = 0;
141 if (h < 0) h = 0;
142
273 if (border == 2) 143 if (border == 2)
274 { 144 {
275 w += 2; 145 w += 2;
276 h += 2; 146 h += 2;
277 } 147 }
… …
343 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
344 )); 214 ));
345 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
346 216
347 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
348} 219}
349 220
350void 221void
351overlay::hide () 222overlay::hide ()
352{ 223{
… …
366 237
367 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
368 overlay_av = 0; 239 overlay_av = 0;
369 240
370 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
371} 243}
372 244
373void overlay::swap () 245void overlay::swap ()
374{ 246{
375 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));
376 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));
377 249
378 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
379 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;
380 257
381 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
382 { 259 {
383 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
384 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
420 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
421 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
422 } 299 }
423 300
424 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
425} 303}
426 304
305/////////////////////////////////////////////////////////////////////////////
306
307#define IOM_CLASS "urxvt"
308#define IOM_WARN rxvt_warn
309#include "iom_perl.h"
427 310
428///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
429 312
430struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
431 314
… …
435{ 318{
436 if (perl) 319 if (perl)
437 { 320 {
438 perl_destruct (perl); 321 perl_destruct (perl);
439 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
440 } 324 }
441} 325}
442 326
443void 327void
444rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
448 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
449 333
450 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
451 swap (perl_environ, environ); 335 swap (perl_environ, environ);
452 336
453 char *argv[] = { 337 char *args[] = {
454 "", 338 "",
455 "-e" 339 "-e"
456 "BEGIN {" 340 "BEGIN {"
457 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
458 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
459 "}" 343 "}"
460 "" 344 ""
461 "use urxvt;" 345 "use urxvt;"
462 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
463 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
464 perl = perl_alloc (); 351 perl = perl_alloc ();
465 perl_construct (perl); 352 perl_construct (perl);
466 353
467 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
468 || perl_run (perl)) 355 || perl_run (perl))
469 { 356 {
470 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
471 358
472 perl_destruct (perl); 359 perl_destruct (perl);
… …
506 393
507 // pre-handling of some events 394 // pre-handling of some events
508 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
509 { 396 {
510 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));
511 398
512 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
513 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
514 } 401 }
515 402
516 swap (perl_environ, environ); 403 swap (perl_environ, environ);
… …
715 602
716 // post-handling of some events 603 // post-handling of some events
717 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
718 { 605 {
719 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));
720 607
721 for (int i = AvFILL (av); i >= 0; i--) 608 for (int i = AvFILL (av); i >= 0; i--)
722 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
723 } 610 }
724 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
725 { 612 {
726 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
727 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
728 615
729 // don't allow further calls 616 // don't allow further calls
730 term->perl.self = 0; 617 term->perl.self = 0;
731 } 618 }
732 619
733 swap (perl_environ, environ); 620 swap (perl_environ, environ);
… …
764 static const struct { 651 static const struct {
765 const char *name; 652 const char *name;
766 IV iv; 653 IV iv;
767 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
768# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
769 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
770 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
771 const_iv (RS_Bold), 659 const_iv (RS_Bold),
772 const_iv (RS_Italic), 660 const_iv (RS_Italic),
773 const_iv (RS_Blink), 661 const_iv (RS_Blink),
… …
791 const_iv (AnyModifier), 679 const_iv (AnyModifier),
792 680
793 const_iv (NoSymbol), 681 const_iv (NoSymbol),
794 const_iv (GrabModeSync), 682 const_iv (GrabModeSync),
795 const_iv (GrabModeAsync), 683 const_iv (GrabModeAsync),
796
797 const_iv (EVENT_NONE),
798 const_iv (EVENT_READ),
799 const_iv (EVENT_WRITE),
800 684
801 const_iv (NoEventMask), 685 const_iv (NoEventMask),
802 const_iv (KeyPressMask), 686 const_iv (KeyPressMask),
803 const_iv (KeyReleaseMask), 687 const_iv (KeyReleaseMask),
804 const_iv (ButtonPressMask), 688 const_iv (ButtonPressMask),
… …
903_exit (int status) 787_exit (int status)
904 788
905NV 789NV
906NOW () 790NOW ()
907 CODE: 791 CODE:
908 RETVAL = NOW; 792 RETVAL = ev::now ();
909 OUTPUT: 793 OUTPUT:
910 RETVAL 794 RETVAL
911 795
912int 796int
913GET_BASEFG (int rend) 797GET_BASEFG (int rend)
… …
938 RETVAL 822 RETVAL
939 823
940int 824int
941GET_CUSTOM (int rend) 825GET_CUSTOM (int rend)
942 CODE: 826 CODE:
943 RETVAL = (rend && RS_customMask) >> RS_customShift; 827 RETVAL = (rend & RS_customMask) >> RS_customShift;
944 OUTPUT: 828 OUTPUT:
945 RETVAL 829 RETVAL
946 830
947int 831int
948SET_CUSTOM (int rend, int new_value) 832SET_CUSTOM (int rend, int new_value)
… …
985 for (int i = AvFILL (env) + 1; i--; ) 869 for (int i = AvFILL (env) + 1; i--; )
986 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 870 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
987 871
988 envv->push_back (0); 872 envv->push_back (0);
989 873
990 bool success;
991
992 try 874 try
993 { 875 {
994 success = term->init (argv, envv); 876 term->init (argv, envv);
995 } 877 }
996 catch (const class rxvt_failure_exception &e) 878 catch (const class rxvt_failure_exception &e)
997 {
998 success = false;
999 }
1000
1001 if (!success)
1002 { 879 {
1003 term->destroy (); 880 term->destroy ();
1004 croak ("error while initializing new terminal instance"); 881 croak ("error while initializing new terminal instance");
1005 } 882 }
1006 883
… …
1119 CODE: 996 CODE:
1120{ 997{
1121 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1122 999
1123 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1124 RETVAL = wcswidth (wstr, wcslen (wstr)); 1001 RETVAL = 0;
1002 for (wchar_t *wc = wstr; *wc; wc++)
1003 {
1004 int w = WCWIDTH (*wc);
1005
1006 if (w)
1007 RETVAL += max (w, 1);
1008 }
1125 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1126 1010
1127 free (wstr); 1011 free (wstr);
1128} 1012}
1129 OUTPUT: 1013 OUTPUT:
… …
1159 rxvt_pop_locale (); 1043 rxvt_pop_locale ();
1160 1044
1161 RETVAL = wcs2sv (wstr); 1045 RETVAL = wcs2sv (wstr);
1162 free (wstr); 1046 free (wstr);
1163} 1047}
1048 OUTPUT:
1049 RETVAL
1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1164 OUTPUT: 1055 OUTPUT:
1165 RETVAL 1056 RETVAL
1166 1057
1167#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1168 1059
… …
1218 { 1109 {
1219 case 0: RETVAL = THIS->ModLevel3Mask; break; 1110 case 0: RETVAL = THIS->ModLevel3Mask; break;
1220 case 1: RETVAL = THIS->ModMetaMask; break; 1111 case 1: RETVAL = THIS->ModMetaMask; break;
1221 case 2: RETVAL = THIS->ModNumLockMask; break; 1112 case 2: RETVAL = THIS->ModNumLockMask; break;
1222 case 3: RETVAL = THIS->current_screen; break; 1113 case 3: RETVAL = THIS->current_screen; break;
1114#ifdef CURSOR_BLINK
1223 case 4: RETVAL = THIS->hidden_cursor; break; 1115 case 4: RETVAL = THIS->hidden_cursor; break;
1116#endif
1224 } 1117 }
1225 OUTPUT: 1118 OUTPUT:
1226 RETVAL 1119 RETVAL
1227 1120
1228char * 1121char *
… …
1253 if (*i) 1146 if (*i)
1254 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1147 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1255} 1148}
1256 1149
1257int 1150int
1258rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1151rxvt_term::pty_ev_events (int events = ev::UNDEF)
1259 CODE: 1152 CODE:
1260 RETVAL = THIS->pty_ev.events; 1153 RETVAL = THIS->pty_ev.events;
1261 if (events != EVENT_UNDEF) 1154 if (events != ev::UNDEF)
1262 THIS->pty_ev.set (events); 1155 THIS->pty_ev.set (events);
1263 OUTPUT: 1156 OUTPUT:
1264 RETVAL 1157 RETVAL
1265 1158
1266int 1159int
… …
1345 1238
1346void 1239void
1347rxvt_term::want_refresh () 1240rxvt_term::want_refresh ()
1348 CODE: 1241 CODE:
1349 THIS->want_refresh = 1; 1242 THIS->want_refresh = 1;
1243 THIS->refresh_check ();
1350 1244
1351void 1245void
1352rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1246rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1353 PPCODE: 1247 PPCODE:
1354{ 1248{
… …
1509SV * 1403SV *
1510rxvt_term::special_decode (SV *text) 1404rxvt_term::special_decode (SV *text)
1511 CODE: 1405 CODE:
1512{ 1406{
1513 wchar_t *wstr = sv2wcs (text); 1407 wchar_t *wstr = sv2wcs (text);
1514 int wlen = wcslen (wstr);
1515 int dlen = 0; 1408 int dlen = 0;
1516 1409
1517 // find length 1410 // find length
1518 for (wchar_t *s = wstr; *s; s++) 1411 for (wchar_t *s = wstr; *s; s++)
1519 if (*s == NOCHAR) 1412 if (*s == NOCHAR)
… …
1552# undef reserve 1445# undef reserve
1553 }; 1446 };
1554 1447
1555 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1448 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1556 1449
1450 if (*name)
1557 do { 1451 {
1452 do {
1558 if (rs-- == rslist) 1453 if (rs-- == rslist)
1559 croak ("no such resource '%s', requested", name); 1454 croak ("no such resource '%s', requested", name);
1560 } while (strcmp (name, rs->name)); 1455 } while (strcmp (name, rs->name));
1561 1456
1562 index += rs->value; 1457 index += rs->value;
1458 }
1459 else
1460 {
1461 --rs;
1462 name = "";
1463 }
1563 1464
1564 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1465 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1565 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1466 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1566 1467
1567 if (GIMME_V != G_VOID) 1468 if (GIMME_V != G_VOID)
… …
1582 1483
1583const char * 1484const char *
1584rxvt_term::x_resource (const char *name) 1485rxvt_term::x_resource (const char *name)
1585 1486
1586bool 1487bool
1587rxvt_term::option (U32 optval, int set = -1) 1488rxvt_term::option (U8 optval, int set = -1)
1588 CODE: 1489 CODE:
1589{ 1490{
1590 RETVAL = THIS->options & optval; 1491 RETVAL = THIS->option (optval);
1591 1492
1592 if (set >= 0) 1493 if (set >= 0)
1593 { 1494 {
1594 if (set)
1595 THIS->options |= optval; 1495 THIS->set_option (optval, set);
1596 else
1597 THIS->options &= ~optval;
1598 1496
1599 if (THIS->check_ev.is_active ()) // avoid doing this before START 1497 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1600 switch (optval) 1498 switch (optval)
1601 { 1499 {
1602 case Opt_skipBuiltinGlyphs: 1500 case Opt_skipBuiltinGlyphs:
1603 THIS->set_fonts (); 1501 THIS->set_fonts ();
1604 THIS->scr_remap_chars (); 1502 THIS->scr_remap_chars ();
1605 THIS->scr_touch (true); 1503 THIS->scr_touch (true);
1606 THIS->want_refresh = 1; 1504 THIS->want_refresh = 1;
1505 THIS->refresh_check ();
1607 break; 1506 break;
1608 1507
1609 case Opt_cursorUnderline: 1508 case Opt_cursorUnderline:
1610 THIS->want_refresh = 1; 1509 THIS->want_refresh = 1;
1510 THIS->refresh_check ();
1611 break; 1511 break;
1612 1512
1613# case Opt_scrollBar_floating: 1513# case Opt_scrollBar_floating:
1614# case Opt_scrollBar_right: 1514# case Opt_scrollBar_right:
1615# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1515# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1673 1573
1674 clamp_it (rc.col, 0, THIS->ncol); 1574 clamp_it (rc.col, 0, THIS->ncol);
1675 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1575 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1676 1576
1677 if (ix) 1577 if (ix)
1578 {
1678 THIS->want_refresh = 1; 1579 THIS->want_refresh = 1;
1580 THIS->refresh_check ();
1581 }
1679 } 1582 }
1680} 1583}
1681 1584
1682char 1585char
1683rxvt_term::cur_charset () 1586rxvt_term::cur_charset ()
… …
1790 Atom *props = XListProperties (THIS->dpy, window, &count); 1693 Atom *props = XListProperties (THIS->dpy, window, &count);
1791 1694
1792 EXTEND (SP, count); 1695 EXTEND (SP, count);
1793 while (count--) 1696 while (count--)
1794 PUSHs (newSVuv ((U32)props [count])); 1697 PUSHs (newSVuv ((U32)props [count]));
1795 1698
1796 XFree (props); 1699 XFree (props);
1797} 1700}
1798 1701
1799void 1702void
1800rxvt_term::XGetWindowProperty (Window window, Atom property) 1703rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1823 XFree (prop); 1726 XFree (prop);
1824 } 1727 }
1825} 1728}
1826 1729
1827void 1730void
1828rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1731rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1829 CODE: 1732 CODE:
1830{ 1733{
1831 STRLEN len; 1734 STRLEN len;
1832 char *data_ = SvPVbyte (data, len); 1735 char *data_ = SvPVbyte (data, len);
1833 1736
… …
1929overlay::hide () 1832overlay::hide ()
1930 1833
1931void 1834void
1932overlay::DESTROY () 1835overlay::DESTROY ()
1933 1836
1934############################################################################# 1837INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1935# urxvt::watcher
1936#############################################################################
1937 1838
1938MODULE = urxvt PACKAGE = urxvt::watcher
1939
1940CHAINED
1941perl_watcher::cb (SV *cb)
1942 CODE:
1943 THIS->cb (cb);
1944 OUTPUT:
1945 RETVAL
1946
1947#############################################################################
1948# urxvt::timer
1949#############################################################################
1950
1951MODULE = urxvt PACKAGE = urxvt::timer
1952
1953SV *
1954timer::new ()
1955 CODE:
1956 timer *w = new timer;
1957 w->start (NOW);
1958 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1959 w->self = (HV *)SvRV (RETVAL);
1960 OUTPUT:
1961 RETVAL
1962
1963NV
1964timer::at ()
1965 CODE:
1966 RETVAL = THIS->at;
1967 OUTPUT:
1968 RETVAL
1969
1970CHAINED
1971timer::interval (NV interval)
1972 CODE:
1973 THIS->interval = interval;
1974 OUTPUT:
1975 RETVAL
1976
1977CHAINED
1978timer::set (NV tstamp)
1979 CODE:
1980 THIS->set (tstamp);
1981 OUTPUT:
1982 RETVAL
1983
1984CHAINED
1985timer::start (NV tstamp = THIS->at)
1986 CODE:
1987 THIS->start (tstamp);
1988 OUTPUT:
1989 RETVAL
1990
1991CHAINED
1992timer::after (NV delay)
1993 CODE:
1994 THIS->start (NOW + delay);
1995 OUTPUT:
1996 RETVAL
1997
1998CHAINED
1999timer::stop ()
2000 CODE:
2001 THIS->stop ();
2002 OUTPUT:
2003 RETVAL
2004
2005void
2006timer::DESTROY ()
2007
2008#############################################################################
2009# urxvt::iow
2010#############################################################################
2011
2012MODULE = urxvt PACKAGE = urxvt::iow
2013
2014SV *
2015iow::new ()
2016 CODE:
2017 iow *w = new iow;
2018 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
2019 w->self = (HV *)SvRV (RETVAL);
2020 OUTPUT:
2021 RETVAL
2022
2023CHAINED
2024iow::fd (int fd)
2025 CODE:
2026 THIS->fd = fd;
2027 OUTPUT:
2028 RETVAL
2029
2030CHAINED
2031iow::events (short events)
2032 CODE:
2033 THIS->events = events;
2034 OUTPUT:
2035 RETVAL
2036
2037CHAINED
2038iow::start ()
2039 CODE:
2040 THIS->start ();
2041 OUTPUT:
2042 RETVAL
2043
2044CHAINED
2045iow::stop ()
2046 CODE:
2047 THIS->stop ();
2048 OUTPUT:
2049 RETVAL
2050
2051void
2052iow::DESTROY ()
2053
2054#############################################################################
2055# urxvt::iw
2056#############################################################################
2057
2058MODULE = urxvt PACKAGE = urxvt::iw
2059
2060SV *
2061iw::new ()
2062 CODE:
2063 iw *w = new iw;
2064 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2065 w->self = (HV *)SvRV (RETVAL);
2066 OUTPUT:
2067 RETVAL
2068
2069CHAINED
2070iw::start ()
2071 CODE:
2072 THIS->start ();
2073 OUTPUT:
2074 RETVAL
2075
2076CHAINED
2077iw::stop ()
2078 CODE:
2079 THIS->stop ();
2080 OUTPUT:
2081 RETVAL
2082
2083void
2084iw::DESTROY ()
2085
2086#############################################################################
2087# urxvt::pw
2088#############################################################################
2089
2090MODULE = urxvt PACKAGE = urxvt::pw
2091
2092SV *
2093pw::new ()
2094 CODE:
2095 pw *w = new pw;
2096 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2097 w->self = (HV *)SvRV (RETVAL);
2098 OUTPUT:
2099 RETVAL
2100
2101CHAINED
2102pw::start (int pid)
2103 CODE:
2104 THIS->start (pid);
2105 OUTPUT:
2106 RETVAL
2107
2108CHAINED
2109pw::stop ()
2110 CODE:
2111 THIS->stop ();
2112 OUTPUT:
2113 RETVAL
2114
2115void
2116pw::DESTROY ()
2117
2118

Diff Legend

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