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.103 by root, Mon Aug 7 21:38:24 2006 UTC vs.
Revision 1.130 by sf-exg, Sun Feb 14 19:34:42 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)]
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
273 if (w < 0) w = 0; 140 if (w < 0) w = 0;
274 if (h < 0) h = 0; 141 if (h < 0) h = 0;
275 142
276 if (border == 2) 143 if (border == 2)
277 { 144 {
… …
346 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
347 )); 214 ));
348 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
349 216
350 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
351} 219}
352 220
353void 221void
354overlay::hide () 222overlay::hide ()
355{ 223{
… …
369 237
370 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
371 overlay_av = 0; 239 overlay_av = 0;
372 240
373 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
374} 243}
375 244
376void overlay::swap () 245void overlay::swap ()
377{ 246{
378 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));
379 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));
380 249
381 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
382 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;
383 257
384 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
385 { 259 {
386 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
387 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
423 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
424 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
425 } 299 }
426 300
427 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
428} 303}
429 304
305/////////////////////////////////////////////////////////////////////////////
306
307#define IOM_CLASS "urxvt"
308#define IOM_WARN rxvt_warn
309#include "iom_perl.h"
430 310
431///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
432 312
433struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
434 314
… …
438{ 318{
439 if (perl) 319 if (perl)
440 { 320 {
441 perl_destruct (perl); 321 perl_destruct (perl);
442 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
443 } 324 }
444} 325}
445 326
446void 327void
447rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
451 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
452 333
453 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
454 swap (perl_environ, environ); 335 swap (perl_environ, environ);
455 336
456 char *argv[] = { 337 char *args[] = {
457 "", 338 "",
458 "-e" 339 "-e"
459 "BEGIN {" 340 "BEGIN {"
460 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
461 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
462 "}" 343 "}"
463 "" 344 ""
464 "use urxvt;" 345 "use urxvt;"
465 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
466 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
467 perl = perl_alloc (); 351 perl = perl_alloc ();
468 perl_construct (perl); 352 perl_construct (perl);
469 353
470 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
471 || perl_run (perl)) 355 || perl_run (perl))
472 { 356 {
473 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
474 358
475 perl_destruct (perl); 359 perl_destruct (perl);
… …
509 393
510 // pre-handling of some events 394 // pre-handling of some events
511 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
512 { 396 {
513 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));
514 398
515 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
516 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
517 } 401 }
518 402
519 swap (perl_environ, environ); 403 swap (perl_environ, environ);
… …
718 602
719 // post-handling of some events 603 // post-handling of some events
720 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
721 { 605 {
722 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));
723 607
724 for (int i = AvFILL (av); i >= 0; i--) 608 for (int i = AvFILL (av); i >= 0; i--)
725 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
726 } 610 }
727 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
728 { 612 {
729 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
730 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
731 615
732 // don't allow further calls 616 // don't allow further calls
733 term->perl.self = 0; 617 term->perl.self = 0;
734 } 618 }
735 619
736 swap (perl_environ, environ); 620 swap (perl_environ, environ);
… …
767 static const struct { 651 static const struct {
768 const char *name; 652 const char *name;
769 IV iv; 653 IV iv;
770 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
771# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
772 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
773 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
774 const_iv (RS_Bold), 659 const_iv (RS_Bold),
775 const_iv (RS_Italic), 660 const_iv (RS_Italic),
776 const_iv (RS_Blink), 661 const_iv (RS_Blink),
… …
794 const_iv (AnyModifier), 679 const_iv (AnyModifier),
795 680
796 const_iv (NoSymbol), 681 const_iv (NoSymbol),
797 const_iv (GrabModeSync), 682 const_iv (GrabModeSync),
798 const_iv (GrabModeAsync), 683 const_iv (GrabModeAsync),
799
800 const_iv (EVENT_NONE),
801 const_iv (EVENT_READ),
802 const_iv (EVENT_WRITE),
803 684
804 const_iv (NoEventMask), 685 const_iv (NoEventMask),
805 const_iv (KeyPressMask), 686 const_iv (KeyPressMask),
806 const_iv (KeyReleaseMask), 687 const_iv (KeyReleaseMask),
807 const_iv (ButtonPressMask), 688 const_iv (ButtonPressMask),
… …
906_exit (int status) 787_exit (int status)
907 788
908NV 789NV
909NOW () 790NOW ()
910 CODE: 791 CODE:
911 RETVAL = NOW; 792 RETVAL = ev::now ();
912 OUTPUT: 793 OUTPUT:
913 RETVAL 794 RETVAL
914 795
915int 796int
916GET_BASEFG (int rend) 797GET_BASEFG (int rend)
… …
941 RETVAL 822 RETVAL
942 823
943int 824int
944GET_CUSTOM (int rend) 825GET_CUSTOM (int rend)
945 CODE: 826 CODE:
946 RETVAL = (rend && RS_customMask) >> RS_customShift; 827 RETVAL = (rend & RS_customMask) >> RS_customShift;
947 OUTPUT: 828 OUTPUT:
948 RETVAL 829 RETVAL
949 830
950int 831int
951SET_CUSTOM (int rend, int new_value) 832SET_CUSTOM (int rend, int new_value)
… …
988 for (int i = AvFILL (env) + 1; i--; ) 869 for (int i = AvFILL (env) + 1; i--; )
989 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 870 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
990 871
991 envv->push_back (0); 872 envv->push_back (0);
992 873
993 bool success;
994
995 try 874 try
996 { 875 {
997 success = term->init (argv, envv); 876 term->init (argv, envv);
998 } 877 }
999 catch (const class rxvt_failure_exception &e) 878 catch (const class rxvt_failure_exception &e)
1000 {
1001 success = false;
1002 }
1003
1004 if (!success)
1005 { 879 {
1006 term->destroy (); 880 term->destroy ();
1007 croak ("error while initializing new terminal instance"); 881 croak ("error while initializing new terminal instance");
1008 } 882 }
1009 883
… …
1122 CODE: 996 CODE:
1123{ 997{
1124 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1125 999
1126 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1127 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 }
1128 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1129 1010
1130 free (wstr); 1011 free (wstr);
1131} 1012}
1132 OUTPUT: 1013 OUTPUT:
… …
1165 free (wstr); 1046 free (wstr);
1166} 1047}
1167 OUTPUT: 1048 OUTPUT:
1168 RETVAL 1049 RETVAL
1169 1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1055 OUTPUT:
1056 RETVAL
1057
1170#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1171 1059
1172#define TERM_OFFSET_width TERM_OFFSET(width) 1060#define TERM_OFFSET_width TERM_OFFSET(width)
1173#define TERM_OFFSET_height TERM_OFFSET(height) 1061#define TERM_OFFSET_height TERM_OFFSET(height)
1174#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1175#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1176#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1177#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1178#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1179#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1180#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1181#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1182#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1183#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1072#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1184#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1185#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1186#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1187 1076
1188int 1077int
1189rxvt_term::width () 1078rxvt_term::width ()
1190 ALIAS: 1079 ALIAS:
1191 width = TERM_OFFSET_width 1080 width = TERM_OFFSET_width
1192 height = TERM_OFFSET_height 1081 height = TERM_OFFSET_height
1193 fwidth = TERM_OFFSET_fwidth 1082 fwidth = TERM_OFFSET_fwidth
1194 fheight = TERM_OFFSET_fheight 1083 fheight = TERM_OFFSET_fheight
1195 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1196 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1197 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1198 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1199 mapped = TERM_OFFSET_mapped 1088 mapped = TERM_OFFSET_mapped
1200 int_bwidth = TERM_OFFSET_int_bwidth 1089 int_bwidth = TERM_OFFSET_int_bwidth
1201 ext_bwidth = TERM_OFFSET_ext_bwidth 1090 ext_bwidth = TERM_OFFSET_ext_bwidth
1202 lineSpace = TERM_OFFSET_lineSpace 1091 lineSpace = TERM_OFFSET_lineSpace
1092 letterSpace = TERM_OFFSET_letterSpace
1203 saveLines = TERM_OFFSET_saveLines 1093 saveLines = TERM_OFFSET_saveLines
1204 total_rows = TERM_OFFSET_total_rows 1094 total_rows = TERM_OFFSET_total_rows
1205 top_row = TERM_OFFSET_top_row 1095 top_row = TERM_OFFSET_top_row
1206 CODE: 1096 CODE:
1207 RETVAL = *(int *)((char *)THIS + ix); 1097 RETVAL = *(int *)((char *)THIS + ix);
1208 OUTPUT: 1098 OUTPUT:
1209 RETVAL 1099 RETVAL
1210 1100
… …
1221 { 1111 {
1222 case 0: RETVAL = THIS->ModLevel3Mask; break; 1112 case 0: RETVAL = THIS->ModLevel3Mask; break;
1223 case 1: RETVAL = THIS->ModMetaMask; break; 1113 case 1: RETVAL = THIS->ModMetaMask; break;
1224 case 2: RETVAL = THIS->ModNumLockMask; break; 1114 case 2: RETVAL = THIS->ModNumLockMask; break;
1225 case 3: RETVAL = THIS->current_screen; break; 1115 case 3: RETVAL = THIS->current_screen; break;
1116#ifdef CURSOR_BLINK
1226 case 4: RETVAL = THIS->hidden_cursor; break; 1117 case 4: RETVAL = THIS->hidden_cursor; break;
1118#endif
1227 } 1119 }
1228 OUTPUT: 1120 OUTPUT:
1229 RETVAL 1121 RETVAL
1230 1122
1231char * 1123char *
… …
1256 if (*i) 1148 if (*i)
1257 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1149 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1258} 1150}
1259 1151
1260int 1152int
1261rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1153rxvt_term::pty_ev_events (int events = ev::UNDEF)
1262 CODE: 1154 CODE:
1263 RETVAL = THIS->pty_ev.events; 1155 RETVAL = THIS->pty_ev.events;
1264 if (events != EVENT_UNDEF) 1156 if (events != ev::UNDEF)
1265 THIS->pty_ev.set (events); 1157 THIS->pty_ev.set (events);
1266 OUTPUT: 1158 OUTPUT:
1267 RETVAL 1159 RETVAL
1268 1160
1269int 1161int
… …
1348 1240
1349void 1241void
1350rxvt_term::want_refresh () 1242rxvt_term::want_refresh ()
1351 CODE: 1243 CODE:
1352 THIS->want_refresh = 1; 1244 THIS->want_refresh = 1;
1245 THIS->refresh_check ();
1353 1246
1354void 1247void
1355rxvt_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)
1356 PPCODE: 1249 PPCODE:
1357{ 1250{
… …
1512SV * 1405SV *
1513rxvt_term::special_decode (SV *text) 1406rxvt_term::special_decode (SV *text)
1514 CODE: 1407 CODE:
1515{ 1408{
1516 wchar_t *wstr = sv2wcs (text); 1409 wchar_t *wstr = sv2wcs (text);
1517 int wlen = wcslen (wstr);
1518 int dlen = 0; 1410 int dlen = 0;
1519 1411
1520 // find length 1412 // find length
1521 for (wchar_t *s = wstr; *s; s++) 1413 for (wchar_t *s = wstr; *s; s++)
1522 if (*s == NOCHAR) 1414 if (*s == NOCHAR)
… …
1555# undef reserve 1447# undef reserve
1556 }; 1448 };
1557 1449
1558 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1450 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1559 1451
1452 if (*name)
1560 do { 1453 {
1454 do {
1561 if (rs-- == rslist) 1455 if (rs-- == rslist)
1562 croak ("no such resource '%s', requested", name); 1456 croak ("no such resource '%s', requested", name);
1563 } while (strcmp (name, rs->name)); 1457 } while (strcmp (name, rs->name));
1564 1458
1565 index += rs->value; 1459 index += rs->value;
1460 }
1461 else
1462 {
1463 --rs;
1464 name = "";
1465 }
1566 1466
1567 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1467 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1568 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);
1569 1469
1570 if (GIMME_V != G_VOID) 1470 if (GIMME_V != G_VOID)
… …
1585 1485
1586const char * 1486const char *
1587rxvt_term::x_resource (const char *name) 1487rxvt_term::x_resource (const char *name)
1588 1488
1589bool 1489bool
1590rxvt_term::option (U32 optval, int set = -1) 1490rxvt_term::option (U8 optval, int set = -1)
1591 CODE: 1491 CODE:
1592{ 1492{
1593 RETVAL = THIS->options & optval; 1493 RETVAL = THIS->option (optval);
1594 1494
1595 if (set >= 0) 1495 if (set >= 0)
1596 { 1496 {
1597 if (set)
1598 THIS->options |= optval; 1497 THIS->set_option (optval, set);
1599 else
1600 THIS->options &= ~optval;
1601 1498
1602 if (THIS->check_ev.is_active ()) // avoid doing this before START 1499 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1603 switch (optval) 1500 switch (optval)
1604 { 1501 {
1605 case Opt_skipBuiltinGlyphs: 1502 case Opt_skipBuiltinGlyphs:
1606 THIS->set_fonts (); 1503 THIS->set_fonts ();
1607 THIS->scr_remap_chars (); 1504 THIS->scr_remap_chars ();
1608 THIS->scr_touch (true); 1505 THIS->scr_touch (true);
1609 THIS->want_refresh = 1; 1506 THIS->want_refresh = 1;
1507 THIS->refresh_check ();
1610 break; 1508 break;
1611 1509
1612 case Opt_cursorUnderline: 1510 case Opt_cursorUnderline:
1613 THIS->want_refresh = 1; 1511 THIS->want_refresh = 1;
1512 THIS->refresh_check ();
1614 break; 1513 break;
1615 1514
1616# case Opt_scrollBar_floating: 1515# case Opt_scrollBar_floating:
1617# case Opt_scrollBar_right: 1516# case Opt_scrollBar_right:
1618# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1517# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1651 EXTEND (SP, 2); 1550 EXTEND (SP, 2);
1652 PUSHs (sv_2mortal (newSViv (rc.row))); 1551 PUSHs (sv_2mortal (newSViv (rc.row)));
1653 PUSHs (sv_2mortal (newSViv (rc.col))); 1552 PUSHs (sv_2mortal (newSViv (rc.col)));
1654 } 1553 }
1655 1554
1656 if (items == 3) 1555 if (items >= 3)
1657 { 1556 {
1658 rc.row = SvIV (ST (1)); 1557 rc.row = SvIV (ST (1));
1659 rc.col = SvIV (ST (2)); 1558 rc.col = SvIV (ST (2));
1660 1559
1661 if (ix == 2) 1560 if (ix == 2)
… …
1676 1575
1677 clamp_it (rc.col, 0, THIS->ncol); 1576 clamp_it (rc.col, 0, THIS->ncol);
1678 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1577 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1679 1578
1680 if (ix) 1579 if (ix)
1580 {
1581 THIS->selection.screen = THIS->current_screen;
1582
1681 THIS->want_refresh = 1; 1583 THIS->want_refresh = 1;
1584 THIS->refresh_check ();
1682 } 1585 }
1586 }
1683} 1587}
1684 1588
1685char 1589int
1686rxvt_term::cur_charset () 1590rxvt_term::selection_screen (int screen = -1)
1687 CODE: 1591 CODE:
1688 RETVAL = THIS->charsets [THIS->screen.charset]; 1592 RETVAL = THIS->selection.screen;
1689 OUTPUT: 1593 if (screen >= 0)
1594 THIS->selection.screen = screen;
1595 OUTPUT:
1690 RETVAL 1596 RETVAL
1691 1597
1692void 1598void
1693rxvt_term::selection_clear () 1599rxvt_term::selection_clear (bool clipboard = false)
1694 1600
1695void 1601void
1696rxvt_term::selection_make (Time eventtime, bool rect = false) 1602rxvt_term::selection_make (Time eventtime, bool rect = false)
1697 CODE: 1603 CODE:
1698 THIS->selection.op = SELECTION_CONT; 1604 THIS->selection.op = SELECTION_CONT;
1699 THIS->selection.rect = rect; 1605 THIS->selection.rect = rect;
1700 THIS->selection_make (eventtime); 1606 THIS->selection_make (eventtime);
1701 1607
1702int 1608int
1703rxvt_term::selection_grab (Time eventtime) 1609rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1704 1610
1705void 1611void
1706rxvt_term::selection (SV *newtext = 0) 1612rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1707 PPCODE: 1613 PPCODE:
1708{ 1614{
1615 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1616 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1617
1709 if (GIMME_V != G_VOID) 1618 if (GIMME_V != G_VOID)
1710 XPUSHs (THIS->selection.text 1619 XPUSHs (text
1711 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1620 ? sv_2mortal (wcs2sv (text, len))
1712 : &PL_sv_undef); 1621 : &PL_sv_undef);
1713 1622
1714 if (newtext) 1623 if (newtext)
1715 { 1624 {
1716 free (THIS->selection.text); 1625 free (text);
1717 1626
1718 THIS->selection.text = sv2wcs (newtext); 1627 text = sv2wcs (newtext);
1719 THIS->selection.len = wcslen (THIS->selection.text); 1628 len = wcslen (text);
1720 } 1629 }
1721} 1630}
1631
1632char
1633rxvt_term::cur_charset ()
1634 CODE:
1635 RETVAL = THIS->charsets [THIS->screen.charset];
1636 OUTPUT:
1637 RETVAL
1722 1638
1723void 1639void
1724rxvt_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) 1640rxvt_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)
1725 1641
1726void 1642void
… …
1793 Atom *props = XListProperties (THIS->dpy, window, &count); 1709 Atom *props = XListProperties (THIS->dpy, window, &count);
1794 1710
1795 EXTEND (SP, count); 1711 EXTEND (SP, count);
1796 while (count--) 1712 while (count--)
1797 PUSHs (newSVuv ((U32)props [count])); 1713 PUSHs (newSVuv ((U32)props [count]));
1798 1714
1799 XFree (props); 1715 XFree (props);
1800} 1716}
1801 1717
1802void 1718void
1803rxvt_term::XGetWindowProperty (Window window, Atom property) 1719rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1826 XFree (prop); 1742 XFree (prop);
1827 } 1743 }
1828} 1744}
1829 1745
1830void 1746void
1831rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1747rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1832 CODE: 1748 CODE:
1833{ 1749{
1834 STRLEN len; 1750 STRLEN len;
1835 char *data_ = SvPVbyte (data, len); 1751 char *data_ = SvPVbyte (data, len);
1836 1752
… …
1932overlay::hide () 1848overlay::hide ()
1933 1849
1934void 1850void
1935overlay::DESTROY () 1851overlay::DESTROY ()
1936 1852
1937############################################################################# 1853INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1938# urxvt::watcher
1939#############################################################################
1940 1854
1941MODULE = urxvt PACKAGE = urxvt::watcher
1942
1943CHAINED
1944perl_watcher::cb (SV *cb)
1945 CODE:
1946 THIS->cb (cb);
1947 OUTPUT:
1948 RETVAL
1949
1950#############################################################################
1951# urxvt::timer
1952#############################################################################
1953
1954MODULE = urxvt PACKAGE = urxvt::timer
1955
1956SV *
1957timer::new ()
1958 CODE:
1959 timer *w = new timer;
1960 w->start (NOW);
1961 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1962 w->self = (HV *)SvRV (RETVAL);
1963 OUTPUT:
1964 RETVAL
1965
1966NV
1967timer::at ()
1968 CODE:
1969 RETVAL = THIS->at;
1970 OUTPUT:
1971 RETVAL
1972
1973CHAINED
1974timer::interval (NV interval)
1975 CODE:
1976 THIS->interval = interval;
1977 OUTPUT:
1978 RETVAL
1979
1980CHAINED
1981timer::set (NV tstamp)
1982 CODE:
1983 THIS->set (tstamp);
1984 OUTPUT:
1985 RETVAL
1986
1987CHAINED
1988timer::start (NV tstamp = THIS->at)
1989 CODE:
1990 THIS->start (tstamp);
1991 OUTPUT:
1992 RETVAL
1993
1994CHAINED
1995timer::after (NV delay)
1996 CODE:
1997 THIS->start (NOW + delay);
1998 OUTPUT:
1999 RETVAL
2000
2001CHAINED
2002timer::stop ()
2003 CODE:
2004 THIS->stop ();
2005 OUTPUT:
2006 RETVAL
2007
2008void
2009timer::DESTROY ()
2010
2011#############################################################################
2012# urxvt::iow
2013#############################################################################
2014
2015MODULE = urxvt PACKAGE = urxvt::iow
2016
2017SV *
2018iow::new ()
2019 CODE:
2020 iow *w = new iow;
2021 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
2022 w->self = (HV *)SvRV (RETVAL);
2023 OUTPUT:
2024 RETVAL
2025
2026CHAINED
2027iow::fd (int fd)
2028 CODE:
2029 THIS->fd = fd;
2030 OUTPUT:
2031 RETVAL
2032
2033CHAINED
2034iow::events (short events)
2035 CODE:
2036 THIS->events = events;
2037 OUTPUT:
2038 RETVAL
2039
2040CHAINED
2041iow::start ()
2042 CODE:
2043 THIS->start ();
2044 OUTPUT:
2045 RETVAL
2046
2047CHAINED
2048iow::stop ()
2049 CODE:
2050 THIS->stop ();
2051 OUTPUT:
2052 RETVAL
2053
2054void
2055iow::DESTROY ()
2056
2057#############################################################################
2058# urxvt::iw
2059#############################################################################
2060
2061MODULE = urxvt PACKAGE = urxvt::iw
2062
2063SV *
2064iw::new ()
2065 CODE:
2066 iw *w = new iw;
2067 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2068 w->self = (HV *)SvRV (RETVAL);
2069 OUTPUT:
2070 RETVAL
2071
2072CHAINED
2073iw::start ()
2074 CODE:
2075 THIS->start ();
2076 OUTPUT:
2077 RETVAL
2078
2079CHAINED
2080iw::stop ()
2081 CODE:
2082 THIS->stop ();
2083 OUTPUT:
2084 RETVAL
2085
2086void
2087iw::DESTROY ()
2088
2089#############################################################################
2090# urxvt::pw
2091#############################################################################
2092
2093MODULE = urxvt PACKAGE = urxvt::pw
2094
2095SV *
2096pw::new ()
2097 CODE:
2098 pw *w = new pw;
2099 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2100 w->self = (HV *)SvRV (RETVAL);
2101 OUTPUT:
2102 RETVAL
2103
2104CHAINED
2105pw::start (int pid)
2106 CODE:
2107 THIS->start (pid);
2108 OUTPUT:
2109 RETVAL
2110
2111CHAINED
2112pw::stop ()
2113 CODE:
2114 THIS->stop ();
2115 OUTPUT:
2116 RETVAL
2117
2118void
2119pw::DESTROY ()
2120
2121

Diff Legend

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