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.101 by root, Wed Jul 5 23:34:14 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)]
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),
… …
788 const_iv (Button3Mask), 676 const_iv (Button3Mask),
789 const_iv (Button4Mask), 677 const_iv (Button4Mask),
790 const_iv (Button5Mask), 678 const_iv (Button5Mask),
791 const_iv (AnyModifier), 679 const_iv (AnyModifier),
792 680
793 const_iv (EVENT_NONE), 681 const_iv (NoSymbol),
794 const_iv (EVENT_READ), 682 const_iv (GrabModeSync),
795 const_iv (EVENT_WRITE), 683 const_iv (GrabModeAsync),
796 684
797 const_iv (NoEventMask), 685 const_iv (NoEventMask),
798 const_iv (KeyPressMask), 686 const_iv (KeyPressMask),
799 const_iv (KeyReleaseMask), 687 const_iv (KeyReleaseMask),
800 const_iv (ButtonPressMask), 688 const_iv (ButtonPressMask),
… …
899_exit (int status) 787_exit (int status)
900 788
901NV 789NV
902NOW () 790NOW ()
903 CODE: 791 CODE:
904 RETVAL = NOW; 792 RETVAL = ev::now ();
905 OUTPUT: 793 OUTPUT:
906 RETVAL 794 RETVAL
907 795
908int 796int
909GET_BASEFG (int rend) 797GET_BASEFG (int rend)
… …
934 RETVAL 822 RETVAL
935 823
936int 824int
937GET_CUSTOM (int rend) 825GET_CUSTOM (int rend)
938 CODE: 826 CODE:
939 RETVAL = (rend && RS_customMask) >> RS_customShift; 827 RETVAL = (rend & RS_customMask) >> RS_customShift;
940 OUTPUT: 828 OUTPUT:
941 RETVAL 829 RETVAL
942 830
943int 831int
944SET_CUSTOM (int rend, int new_value) 832SET_CUSTOM (int rend, int new_value)
… …
981 for (int i = AvFILL (env) + 1; i--; ) 869 for (int i = AvFILL (env) + 1; i--; )
982 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 870 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
983 871
984 envv->push_back (0); 872 envv->push_back (0);
985 873
986 bool success;
987
988 try 874 try
989 { 875 {
990 success = term->init (argv, envv); 876 term->init (argv, envv);
991 } 877 }
992 catch (const class rxvt_failure_exception &e) 878 catch (const class rxvt_failure_exception &e)
993 {
994 success = false;
995 }
996
997 if (!success)
998 { 879 {
999 term->destroy (); 880 term->destroy ();
1000 croak ("error while initializing new terminal instance"); 881 croak ("error while initializing new terminal instance");
1001 } 882 }
1002 883
… …
1012void 893void
1013rxvt_term::set_should_invoke (int htype, int inc) 894rxvt_term::set_should_invoke (int htype, int inc)
1014 CODE: 895 CODE:
1015 THIS->perl.should_invoke [htype] += inc; 896 THIS->perl.should_invoke [htype] += inc;
1016 897
1017void 898int
1018rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 899rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1019 CODE: 900 CODE:
1020 XGrabButton (THIS->dpy, button, modifiers, window, 1, 901 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1021 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 902 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1022 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 903 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
904 OUTPUT: RETVAL
1023 905
1024void 906int
1025rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt) 907rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1026 CODE: 908 CODE:
1027 XUngrabButton (THIS->dpy, button, modifiers, window); 909 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
910 OUTPUT: RETVAL
1028 911
1029#if 0
1030
1031void 912void
1032XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 913rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1033 C_ARGS: 914 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1034 THIS->dpy, keycode, modifiers, window, 1, 915 CODE:
1035 GrabModeSync, GrabModeSync 916 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1036 917
1037void 918void
1038XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 919rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
920 CODE:
1039 C_ARGS: THIS->dpy, keycode, modifiers, window 921 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1040 922
1041#endif 923void
924rxvt_term::XUngrabKeyboard (Time eventtime)
925 CODE:
926 XUngrabKeyboard (THIS->dpy, eventtime);
1042 927
1043bool 928bool
1044rxvt_term::grab (Time eventtime, int sync = 0) 929rxvt_term::grab (Time eventtime, int sync = 0)
1045 CODE: 930 CODE:
1046{ 931{
… …
1081rxvt_term::ungrab () 966rxvt_term::ungrab ()
1082 CODE: 967 CODE:
1083 ungrab (THIS); 968 ungrab (THIS);
1084 969
1085int 970int
971rxvt_term::XStringToKeysym (char *string)
972 CODE:
973 RETVAL = XStringToKeysym (string);
974 OUTPUT: RETVAL
975
976char *
977rxvt_term::XKeysymToString (int sym)
978 CODE:
979 RETVAL = XKeysymToString (sym);
980 OUTPUT: RETVAL
981
982int
983rxvt_term::XKeysymToKeycode (int sym)
984 CODE:
985 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
986 OUTPUT: RETVAL
987
988int
989rxvt_term::XKeycodeToKeysym (int code, int index)
990 CODE:
991 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
992 OUTPUT: RETVAL
993
994int
1086rxvt_term::strwidth (SV *str) 995rxvt_term::strwidth (SV *str)
1087 CODE: 996 CODE:
1088{ 997{
1089 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1090 999
1091 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1092 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 }
1093 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1094 1010
1095 free (wstr); 1011 free (wstr);
1096} 1012}
1097 OUTPUT: 1013 OUTPUT:
… …
1130 free (wstr); 1046 free (wstr);
1131} 1047}
1132 OUTPUT: 1048 OUTPUT:
1133 RETVAL 1049 RETVAL
1134 1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1055 OUTPUT:
1056 RETVAL
1057
1135#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1136 1059
1137#define TERM_OFFSET_width TERM_OFFSET(width) 1060#define TERM_OFFSET_width TERM_OFFSET(width)
1138#define TERM_OFFSET_height TERM_OFFSET(height) 1061#define TERM_OFFSET_height TERM_OFFSET(height)
1139#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1140#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1141#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1142#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1143#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1144#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1145#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1146#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1147#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1148#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1072#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1149#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1150#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1151#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1152 1076
1153int 1077int
1154rxvt_term::width () 1078rxvt_term::width ()
1155 ALIAS: 1079 ALIAS:
1156 width = TERM_OFFSET_width 1080 width = TERM_OFFSET_width
1157 height = TERM_OFFSET_height 1081 height = TERM_OFFSET_height
1158 fwidth = TERM_OFFSET_fwidth 1082 fwidth = TERM_OFFSET_fwidth
1159 fheight = TERM_OFFSET_fheight 1083 fheight = TERM_OFFSET_fheight
1160 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1161 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1162 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1163 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1164 mapped = TERM_OFFSET_mapped 1088 mapped = TERM_OFFSET_mapped
1165 int_bwidth = TERM_OFFSET_int_bwidth 1089 int_bwidth = TERM_OFFSET_int_bwidth
1166 ext_bwidth = TERM_OFFSET_ext_bwidth 1090 ext_bwidth = TERM_OFFSET_ext_bwidth
1167 lineSpace = TERM_OFFSET_lineSpace 1091 lineSpace = TERM_OFFSET_lineSpace
1092 letterSpace = TERM_OFFSET_letterSpace
1168 saveLines = TERM_OFFSET_saveLines 1093 saveLines = TERM_OFFSET_saveLines
1169 total_rows = TERM_OFFSET_total_rows 1094 total_rows = TERM_OFFSET_total_rows
1170 top_row = TERM_OFFSET_top_row 1095 top_row = TERM_OFFSET_top_row
1171 CODE: 1096 CODE:
1172 RETVAL = *(int *)((char *)THIS + ix); 1097 RETVAL = *(int *)((char *)THIS + ix);
1173 OUTPUT: 1098 OUTPUT:
1174 RETVAL 1099 RETVAL
1175 1100
… …
1186 { 1111 {
1187 case 0: RETVAL = THIS->ModLevel3Mask; break; 1112 case 0: RETVAL = THIS->ModLevel3Mask; break;
1188 case 1: RETVAL = THIS->ModMetaMask; break; 1113 case 1: RETVAL = THIS->ModMetaMask; break;
1189 case 2: RETVAL = THIS->ModNumLockMask; break; 1114 case 2: RETVAL = THIS->ModNumLockMask; break;
1190 case 3: RETVAL = THIS->current_screen; break; 1115 case 3: RETVAL = THIS->current_screen; break;
1116#ifdef CURSOR_BLINK
1191 case 4: RETVAL = THIS->hidden_cursor; break; 1117 case 4: RETVAL = THIS->hidden_cursor; break;
1118#endif
1192 } 1119 }
1193 OUTPUT: 1120 OUTPUT:
1194 RETVAL 1121 RETVAL
1195 1122
1196char * 1123char *
… …
1221 if (*i) 1148 if (*i)
1222 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1149 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1223} 1150}
1224 1151
1225int 1152int
1226rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1153rxvt_term::pty_ev_events (int events = ev::UNDEF)
1227 CODE: 1154 CODE:
1228 RETVAL = THIS->pty_ev.events; 1155 RETVAL = THIS->pty_ev.events;
1229 if (events != EVENT_UNDEF) 1156 if (events != ev::UNDEF)
1230 THIS->pty_ev.set (events); 1157 THIS->pty_ev.set (events);
1231 OUTPUT: 1158 OUTPUT:
1232 RETVAL 1159 RETVAL
1233 1160
1234int 1161int
… …
1313 1240
1314void 1241void
1315rxvt_term::want_refresh () 1242rxvt_term::want_refresh ()
1316 CODE: 1243 CODE:
1317 THIS->want_refresh = 1; 1244 THIS->want_refresh = 1;
1245 THIS->refresh_check ();
1318 1246
1319void 1247void
1320rxvt_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)
1321 PPCODE: 1249 PPCODE:
1322{ 1250{
… …
1477SV * 1405SV *
1478rxvt_term::special_decode (SV *text) 1406rxvt_term::special_decode (SV *text)
1479 CODE: 1407 CODE:
1480{ 1408{
1481 wchar_t *wstr = sv2wcs (text); 1409 wchar_t *wstr = sv2wcs (text);
1482 int wlen = wcslen (wstr);
1483 int dlen = 0; 1410 int dlen = 0;
1484 1411
1485 // find length 1412 // find length
1486 for (wchar_t *s = wstr; *s; s++) 1413 for (wchar_t *s = wstr; *s; s++)
1487 if (*s == NOCHAR) 1414 if (*s == NOCHAR)
… …
1520# undef reserve 1447# undef reserve
1521 }; 1448 };
1522 1449
1523 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1450 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1524 1451
1452 if (*name)
1525 do { 1453 {
1454 do {
1526 if (rs-- == rslist) 1455 if (rs-- == rslist)
1527 croak ("no such resource '%s', requested", name); 1456 croak ("no such resource '%s', requested", name);
1528 } while (strcmp (name, rs->name)); 1457 } while (strcmp (name, rs->name));
1529 1458
1530 index += rs->value; 1459 index += rs->value;
1460 }
1461 else
1462 {
1463 --rs;
1464 name = "";
1465 }
1531 1466
1532 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1467 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1533 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);
1534 1469
1535 if (GIMME_V != G_VOID) 1470 if (GIMME_V != G_VOID)
… …
1550 1485
1551const char * 1486const char *
1552rxvt_term::x_resource (const char *name) 1487rxvt_term::x_resource (const char *name)
1553 1488
1554bool 1489bool
1555rxvt_term::option (U32 optval, int set = -1) 1490rxvt_term::option (U8 optval, int set = -1)
1556 CODE: 1491 CODE:
1557{ 1492{
1558 RETVAL = THIS->options & optval; 1493 RETVAL = THIS->option (optval);
1559 1494
1560 if (set >= 0) 1495 if (set >= 0)
1561 { 1496 {
1562 if (set)
1563 THIS->options |= optval; 1497 THIS->set_option (optval, set);
1564 else
1565 THIS->options &= ~optval;
1566 1498
1567 if (THIS->check_ev.is_active ()) // avoid doing this before START 1499 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1568 switch (optval) 1500 switch (optval)
1569 { 1501 {
1570 case Opt_skipBuiltinGlyphs: 1502 case Opt_skipBuiltinGlyphs:
1571 THIS->set_fonts (); 1503 THIS->set_fonts ();
1572 THIS->scr_remap_chars (); 1504 THIS->scr_remap_chars ();
1573 THIS->scr_touch (true); 1505 THIS->scr_touch (true);
1574 THIS->want_refresh = 1; 1506 THIS->want_refresh = 1;
1507 THIS->refresh_check ();
1575 break; 1508 break;
1576 1509
1577 case Opt_cursorUnderline: 1510 case Opt_cursorUnderline:
1578 THIS->want_refresh = 1; 1511 THIS->want_refresh = 1;
1512 THIS->refresh_check ();
1579 break; 1513 break;
1580 1514
1581# case Opt_scrollBar_floating: 1515# case Opt_scrollBar_floating:
1582# case Opt_scrollBar_right: 1516# case Opt_scrollBar_right:
1583# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1517# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1641 1575
1642 clamp_it (rc.col, 0, THIS->ncol); 1576 clamp_it (rc.col, 0, THIS->ncol);
1643 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1577 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1644 1578
1645 if (ix) 1579 if (ix)
1580 {
1646 THIS->want_refresh = 1; 1581 THIS->want_refresh = 1;
1582 THIS->refresh_check ();
1583 }
1647 } 1584 }
1648} 1585}
1649 1586
1650char 1587char
1651rxvt_term::cur_charset () 1588rxvt_term::cur_charset ()
… …
1758 Atom *props = XListProperties (THIS->dpy, window, &count); 1695 Atom *props = XListProperties (THIS->dpy, window, &count);
1759 1696
1760 EXTEND (SP, count); 1697 EXTEND (SP, count);
1761 while (count--) 1698 while (count--)
1762 PUSHs (newSVuv ((U32)props [count])); 1699 PUSHs (newSVuv ((U32)props [count]));
1763 1700
1764 XFree (props); 1701 XFree (props);
1765} 1702}
1766 1703
1767void 1704void
1768rxvt_term::XGetWindowProperty (Window window, Atom property) 1705rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1791 XFree (prop); 1728 XFree (prop);
1792 } 1729 }
1793} 1730}
1794 1731
1795void 1732void
1796rxvt_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)
1797 CODE: 1734 CODE:
1798{ 1735{
1799 STRLEN len; 1736 STRLEN len;
1800 char *data_ = SvPVbyte (data, len); 1737 char *data_ = SvPVbyte (data, len);
1801 1738
… …
1897overlay::hide () 1834overlay::hide ()
1898 1835
1899void 1836void
1900overlay::DESTROY () 1837overlay::DESTROY ()
1901 1838
1902############################################################################# 1839INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1903# urxvt::watcher
1904#############################################################################
1905 1840
1906MODULE = urxvt PACKAGE = urxvt::watcher
1907
1908CHAINED
1909perl_watcher::cb (SV *cb)
1910 CODE:
1911 THIS->cb (cb);
1912 OUTPUT:
1913 RETVAL
1914
1915#############################################################################
1916# urxvt::timer
1917#############################################################################
1918
1919MODULE = urxvt PACKAGE = urxvt::timer
1920
1921SV *
1922timer::new ()
1923 CODE:
1924 timer *w = new timer;
1925 w->start (NOW);
1926 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1927 w->self = (HV *)SvRV (RETVAL);
1928 OUTPUT:
1929 RETVAL
1930
1931NV
1932timer::at ()
1933 CODE:
1934 RETVAL = THIS->at;
1935 OUTPUT:
1936 RETVAL
1937
1938CHAINED
1939timer::interval (NV interval)
1940 CODE:
1941 THIS->interval = interval;
1942 OUTPUT:
1943 RETVAL
1944
1945CHAINED
1946timer::set (NV tstamp)
1947 CODE:
1948 THIS->set (tstamp);
1949 OUTPUT:
1950 RETVAL
1951
1952CHAINED
1953timer::start (NV tstamp = THIS->at)
1954 CODE:
1955 THIS->start (tstamp);
1956 OUTPUT:
1957 RETVAL
1958
1959CHAINED
1960timer::after (NV delay)
1961 CODE:
1962 THIS->start (NOW + delay);
1963 OUTPUT:
1964 RETVAL
1965
1966CHAINED
1967timer::stop ()
1968 CODE:
1969 THIS->stop ();
1970 OUTPUT:
1971 RETVAL
1972
1973void
1974timer::DESTROY ()
1975
1976#############################################################################
1977# urxvt::iow
1978#############################################################################
1979
1980MODULE = urxvt PACKAGE = urxvt::iow
1981
1982SV *
1983iow::new ()
1984 CODE:
1985 iow *w = new iow;
1986 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1987 w->self = (HV *)SvRV (RETVAL);
1988 OUTPUT:
1989 RETVAL
1990
1991CHAINED
1992iow::fd (int fd)
1993 CODE:
1994 THIS->fd = fd;
1995 OUTPUT:
1996 RETVAL
1997
1998CHAINED
1999iow::events (short events)
2000 CODE:
2001 THIS->events = events;
2002 OUTPUT:
2003 RETVAL
2004
2005CHAINED
2006iow::start ()
2007 CODE:
2008 THIS->start ();
2009 OUTPUT:
2010 RETVAL
2011
2012CHAINED
2013iow::stop ()
2014 CODE:
2015 THIS->stop ();
2016 OUTPUT:
2017 RETVAL
2018
2019void
2020iow::DESTROY ()
2021
2022#############################################################################
2023# urxvt::iw
2024#############################################################################
2025
2026MODULE = urxvt PACKAGE = urxvt::iw
2027
2028SV *
2029iw::new ()
2030 CODE:
2031 iw *w = new iw;
2032 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2033 w->self = (HV *)SvRV (RETVAL);
2034 OUTPUT:
2035 RETVAL
2036
2037CHAINED
2038iw::start ()
2039 CODE:
2040 THIS->start ();
2041 OUTPUT:
2042 RETVAL
2043
2044CHAINED
2045iw::stop ()
2046 CODE:
2047 THIS->stop ();
2048 OUTPUT:
2049 RETVAL
2050
2051void
2052iw::DESTROY ()
2053
2054#############################################################################
2055# urxvt::pw
2056#############################################################################
2057
2058MODULE = urxvt PACKAGE = urxvt::pw
2059
2060SV *
2061pw::new ()
2062 CODE:
2063 pw *w = new pw;
2064 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2065 w->self = (HV *)SvRV (RETVAL);
2066 OUTPUT:
2067 RETVAL
2068
2069CHAINED
2070pw::start (int pid)
2071 CODE:
2072 THIS->start (pid);
2073 OUTPUT:
2074 RETVAL
2075
2076CHAINED
2077pw::stop ()
2078 CODE:
2079 THIS->stop ();
2080 OUTPUT:
2081 RETVAL
2082
2083void
2084pw::DESTROY ()
2085
2086

Diff Legend

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