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.92 by root, Wed Jan 25 00:57:57 2006 UTC vs.
Revision 1.125 by root, Fri Aug 22 15:36:45 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
85//TODO: use magic
86static SV *
87newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
88{ 75{
89 HV *hv = newHV (); 76 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 77 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 78 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 100 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 101
115 return (long)mg->mg_ptr; 102 return (long)mg->mg_ptr;
116} 103}
117 104
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 105#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 106#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 107
121///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
122 109
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
125struct perl_watcher
126{
127 SV *cbsv;
128 HV *self;
129
130 perl_watcher ()
131 : cbsv (0)
132 {
133 }
134
135 ~perl_watcher ()
136 {
137 SvREFCNT_dec (cbsv);
138 }
139
140 void cb (SV *cb)
141 {
142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
144 }
145
146 void invoke (const char *type, SV *self, int arg = -1);
147};
148
149void
150perl_watcher::invoke (const char *type, SV *self, int arg)
151{
152 dSP;
153
154 ENTER;
155 SAVETMPS;
156
157 PUSHMARK (SP);
158
159 XPUSHs (sv_2mortal (self));
160
161 if (arg >= 0)
162 XPUSHs (sv_2mortal (newSViv (arg)));
163
164 PUTBACK;
165 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
166 SPAGAIN;
167
168 PUTBACK;
169 FREETMPS;
170 LEAVE;
171
172 if (SvTRUE (ERRSV))
173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
174}
175
176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
178
179struct timer : perl_watcher, time_watcher
180{
181 tstamp interval;
182
183 timer ()
184 : time_watcher (this, &timer::execute)
185 {
186 }
187
188 void execute (time_watcher &w)
189 {
190 if (interval)
191 start (at + interval);
192
193 invoke ("urxvt::timer", newSVtimer (this));
194 }
195};
196
197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
199
200struct iow : perl_watcher, io_watcher
201{
202 iow ()
203 : io_watcher (this, &iow::execute)
204 {
205 }
206
207 void execute (io_watcher &w, short revents)
208 {
209 invoke ("urxvt::iow", newSViow (this), revents);
210 }
211};
212
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
215
216struct iw : perl_watcher, idle_watcher
217{
218 iw ()
219 : idle_watcher (this, &iw::execute)
220 {
221 }
222
223 void execute (idle_watcher &w)
224 {
225 invoke ("urxvt::iw", newSViw (this));
226 }
227};
228
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
231
232struct pw : perl_watcher, child_watcher
233{
234 pw ()
235 : child_watcher (this, &pw::execute)
236 {
237 }
238
239 void execute (child_watcher &w, int status)
240 {
241 invoke ("urxvt::pw", newSVpw (this), status);
242 }
243};
244
245/////////////////////////////////////////////////////////////////////////////
246
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 111
249struct overlay { 112class overlay {
250 HV *self;
251 bool visible;
252 rxvt_term *THIS; 113 rxvt_term *THIS;
114 AV *overlay_av;
253 int x, y, w, h; 115 int x, y, w, h;
254 int border; 116 int border;
255 text_t **text; 117 text_t **text;
256 rend_t **rend; 118 rend_t **rend;
257 119
120public:
121 HV *self;
122
258 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 123 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
259 ~overlay (); 124 ~overlay ();
260 125
261 void show (); 126 void show ();
262 void hide (); 127 void hide ();
… …
265 130
266 void set (int x, int y, SV *str, SV *rend); 131 void set (int x, int y, SV *str, SV *rend);
267}; 132};
268 133
269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 134overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
270: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false) 135: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
271{ 136{
137 if (w < 0) w = 0;
138 if (h < 0) h = 0;
139
272 if (border == 2) 140 if (border == 2)
273 { 141 {
274 w += 2; 142 w += 2;
275 h += 2; 143 h += 2;
276 } 144 }
… …
314 *rp++ = r; 182 *rp++ = r;
315 } 183 }
316 } 184 }
317 185
318 show (); 186 show ();
319 THIS->want_refresh = 1;
320} 187}
321 188
322overlay::~overlay () 189overlay::~overlay ()
323{ 190{
324 hide (); 191 hide ();
… …
329 delete [] rend[y]; 196 delete [] rend[y];
330 } 197 }
331 198
332 delete [] text; 199 delete [] text;
333 delete [] rend; 200 delete [] rend;
201}
202
203void
204overlay::show ()
205{
206 if (overlay_av)
207 return;
208
209 overlay_av = (AV *)SvREFCNT_inc (SvRV (
210 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
211 ));
212 av_push (overlay_av, newSViv ((long)this));
334 213
335 THIS->want_refresh = 1; 214 THIS->want_refresh = 1;
215 THIS->refresh_check ();
336} 216}
337 217
338void 218void
339overlay::show () 219overlay::hide ()
340{ 220{
341 if (visible) 221 if (!overlay_av)
342 return; 222 return;
343 223
344 visible = true;
345
346 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
347 av_push (av, newSViv ((long)this));
348}
349
350void
351overlay::hide ()
352{
353 if (!visible)
354 return;
355
356 visible = false;
357
358 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
359
360 int i; 224 int i;
361 225
362 for (i = AvFILL (av); i >= 0; i--) 226 for (i = AvFILL (overlay_av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this) 227 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364 {
365 av_delete (av, i, G_DISCARD);
366 break; 228 break;
367 }
368 229
369 for (; i < AvFILL (av); i++) 230 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 231 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 232
372 av_pop (av); 233 av_pop (overlay_av);
234
235 SvREFCNT_dec (overlay_av);
236 overlay_av = 0;
237
238 THIS->want_refresh = 1;
239 THIS->refresh_check ();
373} 240}
374 241
375void overlay::swap () 242void overlay::swap ()
376{ 243{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 244 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
422 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 289 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
423 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 290 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
424 } 291 }
425 292
426 THIS->want_refresh = 1; 293 THIS->want_refresh = 1;
294 THIS->refresh_check ();
427} 295}
428 296
297/////////////////////////////////////////////////////////////////////////////
298
299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
301#include "iom_perl.h"
429 302
430///////////////////////////////////////////////////////////////////////////// 303/////////////////////////////////////////////////////////////////////////////
431 304
432struct rxvt_perl_interp rxvt_perl; 305struct rxvt_perl_interp rxvt_perl;
433 306
… …
437{ 310{
438 if (perl) 311 if (perl)
439 { 312 {
440 perl_destruct (perl); 313 perl_destruct (perl);
441 perl_free (perl); 314 perl_free (perl);
315 PERL_SYS_TERM ();
442 } 316 }
443} 317}
444 318
445void 319void
446rxvt_perl_interp::init (rxvt_term *term) 320rxvt_perl_interp::init (rxvt_term *term)
… …
450 rxvt_push_locale (""); // perl init destroys current locale 324 rxvt_push_locale (""); // perl init destroys current locale
451 325
452 perl_environ = rxvt_environ; 326 perl_environ = rxvt_environ;
453 swap (perl_environ, environ); 327 swap (perl_environ, environ);
454 328
455 char *argv[] = { 329 char *args[] = {
456 "", 330 "",
457 "-e" 331 "-e"
458 "BEGIN {" 332 "BEGIN {"
459 " urxvt->bootstrap;" 333 " urxvt->bootstrap;"
460 " unshift @INC, '" LIBDIR "';" 334 " unshift @INC, '" LIBDIR "';"
461 "}" 335 "}"
462 "" 336 ""
463 "use urxvt;" 337 "use urxvt;"
464 }; 338 };
339 int argc = sizeof (args) / sizeof (args[0]);
340 char **argv = args;
465 341
342 PERL_SYS_INIT3 (&argc, &argv, &environ);
466 perl = perl_alloc (); 343 perl = perl_alloc ();
467 perl_construct (perl); 344 perl_construct (perl);
468 345
469 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 346 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
470 || perl_run (perl)) 347 || perl_run (perl))
471 { 348 {
472 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 349 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
473 350
474 perl_destruct (perl); 351 perl_destruct (perl);
… …
492static void 369static void
493ungrab (rxvt_term *THIS) 370ungrab (rxvt_term *THIS)
494{ 371{
495 if (THIS->perl.grabtime) 372 if (THIS->perl.grabtime)
496 { 373 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 374 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 375 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 376 THIS->perl.grabtime = 0;
500 } 377 }
501} 378}
502 379
503bool 380bool
… …
508 385
509 // pre-handling of some events 386 // pre-handling of some events
510 if (htype == HOOK_REFRESH_END) 387 if (htype == HOOK_REFRESH_END)
511 { 388 {
512 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 389 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
513 390
514 for (int i = 0; i <= AvFILL (av); i++) 391 for (int i = 0; i <= AvFILL (av); i++)
515 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 392 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
516 } 393 }
517 394
518 swap (perl_environ, environ); 395 swap (perl_environ, environ);
… …
556 case DT_STR_LEN: 433 case DT_STR_LEN:
557 { 434 {
558 char *str = va_arg (ap, char *); 435 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 436 int len = va_arg (ap, int);
560 437
561 printf ("pushing str %p:%d\n", str,len);//D
562 XPUSHs (sv_2mortal (newSVpvn (str, len))); 438 XPUSHs (sv_2mortal (newSVpvn (str, len)));
563 } 439 }
564 break; 440 break;
565 441
566 case DT_WCS_LEN: 442 case DT_WCS_LEN:
… …
718 594
719 // post-handling of some events 595 // post-handling of some events
720 if (htype == HOOK_REFRESH_BEGIN) 596 if (htype == HOOK_REFRESH_BEGIN)
721 { 597 {
722 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 598 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
723 599
724 for (int i = AvFILL (av); i >= 0; i--) 600 for (int i = AvFILL (av); i >= 0; i--)
725 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 601 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
726 } 602 }
727 else if (htype == HOOK_DESTROY) 603 else if (htype == HOOK_DESTROY)
728 { 604 {
729 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
730 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
731 607
732 // don't allow further calls 608 // don't allow further calls
733 term->perl.self = 0; 609 term->perl.self = 0;
734 } 610 }
735 611
736 swap (perl_environ, environ); 612 swap (perl_environ, environ);
… …
762# include "optinc.h" 638# include "optinc.h"
763# undef nodef 639# undef nodef
764# undef def 640# undef def
765 641
766 HV *stash = gv_stashpv ("urxvt", 1); 642 HV *stash = gv_stashpv ("urxvt", 1);
767 struct { 643 static const struct {
768 const char *name; 644 const char *name;
769 IV iv; 645 IV iv;
770 } *civ, const_iv[] = { 646 } *civ, const_iv[] = {
771# define const_iv(name) { # name, (IV)name } 647# define const_iv(name) { # name, (IV)name }
648 const_iv (NUM_RESOURCES),
772 const_iv (DEFAULT_RSTYLE), 649 const_iv (DEFAULT_RSTYLE),
773 const_iv (OVERLAY_RSTYLE), 650 const_iv (OVERLAY_RSTYLE),
774 const_iv (RS_Bold), 651 const_iv (RS_Bold),
775 const_iv (RS_Italic), 652 const_iv (RS_Italic),
776 const_iv (RS_Blink), 653 const_iv (RS_Blink),
… …
791 const_iv (Button3Mask), 668 const_iv (Button3Mask),
792 const_iv (Button4Mask), 669 const_iv (Button4Mask),
793 const_iv (Button5Mask), 670 const_iv (Button5Mask),
794 const_iv (AnyModifier), 671 const_iv (AnyModifier),
795 672
796 const_iv (EVENT_NONE), 673 const_iv (NoSymbol),
797 const_iv (EVENT_READ), 674 const_iv (GrabModeSync),
798 const_iv (EVENT_WRITE), 675 const_iv (GrabModeAsync),
799 676
800 const_iv (NoEventMask), 677 const_iv (NoEventMask),
801 const_iv (KeyPressMask), 678 const_iv (KeyPressMask),
802 const_iv (KeyReleaseMask), 679 const_iv (KeyReleaseMask),
803 const_iv (ButtonPressMask), 680 const_iv (ButtonPressMask),
… …
882 const_iv (XIMDontChange), 759 const_iv (XIMDontChange),
883# endif 760# endif
884# endif 761# endif
885 }; 762 };
886 763
887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 764 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
888 civ-- > const_iv; )
889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 765 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
890} 766}
891 767
892void 768void
893warn (const char *msg) 769warn (const char *msg)
… …
903_exit (int status) 779_exit (int status)
904 780
905NV 781NV
906NOW () 782NOW ()
907 CODE: 783 CODE:
908 RETVAL = NOW; 784 RETVAL = ev::now ();
909 OUTPUT: 785 OUTPUT:
910 RETVAL 786 RETVAL
911 787
912int 788int
913GET_BASEFG (int rend) 789GET_BASEFG (int rend)
… …
924 RETVAL 800 RETVAL
925 801
926int 802int
927SET_FGCOLOR (int rend, int new_color) 803SET_FGCOLOR (int rend, int new_color)
928 CODE: 804 CODE:
929 RETVAL = SET_FGCOLOR (rend, new_color); 805 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
930 OUTPUT: 806 OUTPUT:
931 RETVAL 807 RETVAL
932 808
933int 809int
934SET_BGCOLOR (int rend, int new_color) 810SET_BGCOLOR (int rend, int new_color)
935 CODE: 811 CODE:
936 RETVAL = SET_BGCOLOR (rend, new_color); 812 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
937 OUTPUT: 813 OUTPUT:
938 RETVAL 814 RETVAL
939 815
940int 816int
941GET_CUSTOM (int rend) 817GET_CUSTOM (int rend)
942 CODE: 818 CODE:
943 RETVAL = (rend && RS_customMask) >> RS_customShift; 819 RETVAL = (rend & RS_customMask) >> RS_customShift;
944 OUTPUT: 820 OUTPUT:
945 RETVAL 821 RETVAL
946 822
947int 823int
948SET_CUSTOM (int rend, int new_value) 824SET_CUSTOM (int rend, int new_value)
… …
955 | ((new_value << RS_customShift) & RS_customMask); 831 | ((new_value << RS_customShift) & RS_customMask);
956} 832}
957 OUTPUT: 833 OUTPUT:
958 RETVAL 834 RETVAL
959 835
836void
837termlist ()
838 PPCODE:
839{
840 EXTEND (SP, rxvt_term::termlist.size ());
841
842 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
843 if ((*t)->perl.self)
844 PUSHs (sv_2mortal (newSVterm (*t)));
845}
846
960MODULE = urxvt PACKAGE = urxvt::term 847MODULE = urxvt PACKAGE = urxvt::term
961 848
962SV * 849SV *
963_new (...) 850_new (AV *env, AV *arg)
964 CODE: 851 CODE:
965{ 852{
966 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
967 croak ("first argument to urxvt::term->_new must be arrayref");
968
969 rxvt_term *term = new rxvt_term; 853 rxvt_term *term = new rxvt_term;
970 854
971 stringvec *argv = new stringvec; 855 stringvec *argv = new stringvec;
972 stringvec *envv = new stringvec; 856 stringvec *envv = new stringvec;
973 857
974 for (int i = 1; i < items; i++) 858 for (int i = 0; i <= AvFILL (arg); i++)
975 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 859 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
976 860
977 AV *env = (AV *)SvRV (ST (0));
978 for (int i = AvFILL (env) + 1; i--; ) 861 for (int i = AvFILL (env) + 1; i--; )
979 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 862 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
980 863
981 envv->push_back (0); 864 envv->push_back (0);
982 865
983 bool success;
984
985 try 866 try
986 { 867 {
987 success = term->init (argv, envv); 868 term->init (argv, envv);
988 } 869 }
989 catch (const class rxvt_failure_exception &e) 870 catch (const class rxvt_failure_exception &e)
990 {
991 success = false;
992 }
993
994 if (!success)
995 { 871 {
996 term->destroy (); 872 term->destroy ();
997 croak ("error while initializing new terminal instance"); 873 croak ("error while initializing new terminal instance");
998 } 874 }
999 875
… …
1009void 885void
1010rxvt_term::set_should_invoke (int htype, int inc) 886rxvt_term::set_should_invoke (int htype, int inc)
1011 CODE: 887 CODE:
1012 THIS->perl.should_invoke [htype] += inc; 888 THIS->perl.should_invoke [htype] += inc;
1013 889
1014void 890int
1015rxvt_term::grab_button (int button, U32 modifiers) 891rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1016 CODE: 892 CODE:
1017 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 893 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1018 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 894 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1019 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 895 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
896 OUTPUT: RETVAL
897
898int
899rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
900 CODE:
901 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
902 OUTPUT: RETVAL
903
904void
905rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
906 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
907 CODE:
908 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
909
910void
911rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
912 CODE:
913 XUngrabKey (THIS->dpy, keycode, modifiers, window);
914
915void
916rxvt_term::XUngrabKeyboard (Time eventtime)
917 CODE:
918 XUngrabKeyboard (THIS->dpy, eventtime);
1020 919
1021bool 920bool
1022rxvt_term::grab (Time eventtime, int sync = 0) 921rxvt_term::grab (Time eventtime, int sync = 0)
1023 CODE: 922 CODE:
1024{ 923{
1025 int mode = sync ? GrabModeSync : GrabModeAsync; 924 int mode = sync ? GrabModeSync : GrabModeAsync;
1026 925
1027 THIS->perl.grabtime = 0; 926 THIS->perl.grabtime = 0;
1028 927
1029 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 928 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1030 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 929 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1031 mode, mode, None, GRAB_CURSOR, eventtime)) 930 mode, mode, None, GRAB_CURSOR, eventtime))
1032 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 931 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1033 THIS->perl.grabtime = eventtime; 932 THIS->perl.grabtime = eventtime;
1034 else 933 else
1035 XUngrabPointer (THIS->display->display, eventtime); 934 XUngrabPointer (THIS->dpy, eventtime);
1036 935
1037 RETVAL = !!THIS->perl.grabtime; 936 RETVAL = !!THIS->perl.grabtime;
1038} 937}
1039 OUTPUT: 938 OUTPUT:
1040 RETVAL 939 RETVAL
1041 940
1042void 941void
1043rxvt_term::allow_events_async () 942rxvt_term::allow_events_async ()
1044 CODE: 943 CODE:
1045 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 944 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1046 945
1047void 946void
1048rxvt_term::allow_events_sync () 947rxvt_term::allow_events_sync ()
1049 CODE: 948 CODE:
1050 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 949 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1051 950
1052void 951void
1053rxvt_term::allow_events_replay () 952rxvt_term::allow_events_replay ()
1054 CODE: 953 CODE:
1055 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 954 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1056 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 955 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1057 956
1058void 957void
1059rxvt_term::ungrab () 958rxvt_term::ungrab ()
1060 CODE: 959 CODE:
1061 ungrab (THIS); 960 ungrab (THIS);
961
962int
963rxvt_term::XStringToKeysym (char *string)
964 CODE:
965 RETVAL = XStringToKeysym (string);
966 OUTPUT: RETVAL
967
968char *
969rxvt_term::XKeysymToString (int sym)
970 CODE:
971 RETVAL = XKeysymToString (sym);
972 OUTPUT: RETVAL
973
974int
975rxvt_term::XKeysymToKeycode (int sym)
976 CODE:
977 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
978 OUTPUT: RETVAL
979
980int
981rxvt_term::XKeycodeToKeysym (int code, int index)
982 CODE:
983 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
984 OUTPUT: RETVAL
1062 985
1063int 986int
1064rxvt_term::strwidth (SV *str) 987rxvt_term::strwidth (SV *str)
1065 CODE: 988 CODE:
1066{ 989{
1067 wchar_t *wstr = sv2wcs (str); 990 wchar_t *wstr = sv2wcs (str);
1068 991
1069 rxvt_push_locale (THIS->locale); 992 rxvt_push_locale (THIS->locale);
1070 RETVAL = wcswidth (wstr, wcslen (wstr)); 993 RETVAL = 0;
994 for (wchar_t *wc = wstr; *wc; wc++)
995 {
996 int w = WCWIDTH (*wc);
997
998 if (w)
999 RETVAL += max (w, 1);
1000 }
1071 rxvt_pop_locale (); 1001 rxvt_pop_locale ();
1072 1002
1073 free (wstr); 1003 free (wstr);
1074} 1004}
1075 OUTPUT: 1005 OUTPUT:
… …
1105 rxvt_pop_locale (); 1035 rxvt_pop_locale ();
1106 1036
1107 RETVAL = wcs2sv (wstr); 1037 RETVAL = wcs2sv (wstr);
1108 free (wstr); 1038 free (wstr);
1109} 1039}
1040 OUTPUT:
1041 RETVAL
1042
1043char *
1044rxvt_term::locale ()
1045 CODE:
1046 RETVAL = THIS->locale;
1110 OUTPUT: 1047 OUTPUT:
1111 RETVAL 1048 RETVAL
1112 1049
1113#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1050#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1114 1051
… …
1164 { 1101 {
1165 case 0: RETVAL = THIS->ModLevel3Mask; break; 1102 case 0: RETVAL = THIS->ModLevel3Mask; break;
1166 case 1: RETVAL = THIS->ModMetaMask; break; 1103 case 1: RETVAL = THIS->ModMetaMask; break;
1167 case 2: RETVAL = THIS->ModNumLockMask; break; 1104 case 2: RETVAL = THIS->ModNumLockMask; break;
1168 case 3: RETVAL = THIS->current_screen; break; 1105 case 3: RETVAL = THIS->current_screen; break;
1106#ifdef CURSOR_BLINK
1169 case 4: RETVAL = THIS->hidden_cursor; break; 1107 case 4: RETVAL = THIS->hidden_cursor; break;
1108#endif
1170 } 1109 }
1171 OUTPUT: 1110 OUTPUT:
1172 RETVAL 1111 RETVAL
1173 1112
1174char * 1113char *
… …
1184 } 1123 }
1185 OUTPUT: 1124 OUTPUT:
1186 RETVAL 1125 RETVAL
1187 1126
1188SV * 1127SV *
1189rxvt_term::_env () 1128rxvt_term::envv ()
1129 ALIAS:
1130 argv = 1
1190 CODE: 1131 PPCODE:
1191{ 1132{
1192 if (THIS->envv) 1133 stringvec *vec = ix ? THIS->argv : THIS->envv;
1193 {
1194 AV *av = newAV ();
1195 1134
1135 EXTEND (SP, vec->size ());
1136
1196 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1137 for (char **i = vec->begin (); i != vec->end (); ++i)
1197 if (*i) 1138 if (*i)
1198 av_push (av, newSVpv (*i, 0)); 1139 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1199
1200 RETVAL = newRV_noinc ((SV *)av);
1201 }
1202 else
1203 RETVAL = &PL_sv_undef;
1204} 1140}
1205 OUTPUT:
1206 RETVAL
1207 1141
1208int 1142int
1209rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1143rxvt_term::pty_ev_events (int events = ev::UNDEF)
1210 CODE: 1144 CODE:
1211 RETVAL = THIS->pty_ev.events; 1145 RETVAL = THIS->pty_ev.events;
1212 if (events != EVENT_UNDEF) 1146 if (events != ev::UNDEF)
1213 THIS->pty_ev.set (events); 1147 THIS->pty_ev.set (events);
1214 OUTPUT: 1148 OUTPUT:
1215 RETVAL 1149 RETVAL
1216 1150
1217int 1151int
… …
1267 1201
1268void 1202void
1269rxvt_term::focus_out () 1203rxvt_term::focus_out ()
1270 1204
1271void 1205void
1206rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1207 ALIAS:
1208 key_release = 1
1209 CODE:
1210{
1211 XKeyEvent xkey;
1212
1213 memset (&xkey, 0, sizeof (xkey));
1214
1215 xkey.time = time;
1216 xkey.state = state;
1217 xkey.keycode = keycode;
1218
1219 xkey.type = ix ? KeyRelease : KeyPress;
1220 xkey.display = THIS->dpy;
1221 xkey.window = THIS->vt;
1222 xkey.root = THIS->display->root;
1223 xkey.subwindow = THIS->vt;
1224
1225 if (ix)
1226 THIS->key_release (xkey);
1227 else
1228 THIS->key_press (xkey);
1229}
1230
1231void
1272rxvt_term::want_refresh () 1232rxvt_term::want_refresh ()
1273 CODE: 1233 CODE:
1274 THIS->want_refresh = 1; 1234 THIS->want_refresh = 1;
1235 THIS->refresh_check ();
1275 1236
1276void 1237void
1277rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1238rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1278 PPCODE: 1239 PPCODE:
1279{ 1240{
… …
1434SV * 1395SV *
1435rxvt_term::special_decode (SV *text) 1396rxvt_term::special_decode (SV *text)
1436 CODE: 1397 CODE:
1437{ 1398{
1438 wchar_t *wstr = sv2wcs (text); 1399 wchar_t *wstr = sv2wcs (text);
1439 int wlen = wcslen (wstr);
1440 int dlen = 0; 1400 int dlen = 0;
1441 1401
1442 // find length 1402 // find length
1443 for (wchar_t *s = wstr; *s; s++) 1403 for (wchar_t *s = wstr; *s; s++)
1444 if (*s == NOCHAR) 1404 if (*s == NOCHAR)
… …
1467 1427
1468void 1428void
1469rxvt_term::_resource (char *name, int index, SV *newval = 0) 1429rxvt_term::_resource (char *name, int index, SV *newval = 0)
1470 PPCODE: 1430 PPCODE:
1471{ 1431{
1472 struct resval { const char *name; int value; } rslist [] = { 1432 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1473# define def(name) { # name, Rs_ ## name }, 1433# define def(name) { # name, Rs_ ## name },
1474# define reserve(name,count) 1434# define reserve(name,count)
1475# include "rsinc.h" 1435# include "rsinc.h"
1476# undef def 1436# undef def
1477# undef reserve 1437# undef reserve
1478 }; 1438 };
1479 1439
1480 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1440 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1481 1441
1442 if (*name)
1482 do { 1443 {
1444 do {
1483 if (rs-- == rslist) 1445 if (rs-- == rslist)
1484 croak ("no such resource '%s', requested", name); 1446 croak ("no such resource '%s', requested", name);
1485 } while (strcmp (name, rs->name)); 1447 } while (strcmp (name, rs->name));
1486 1448
1487 index += rs->value; 1449 index += rs->value;
1450 }
1451 else
1452 {
1453 --rs;
1454 name = "";
1455 }
1488 1456
1489 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1457 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1490 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1458 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1491 1459
1492 if (GIMME_V != G_VOID) 1460 if (GIMME_V != G_VOID)
… …
1507 1475
1508const char * 1476const char *
1509rxvt_term::x_resource (const char *name) 1477rxvt_term::x_resource (const char *name)
1510 1478
1511bool 1479bool
1512rxvt_term::option (U32 optval, int set = -1) 1480rxvt_term::option (U8 optval, int set = -1)
1513 CODE: 1481 CODE:
1514{ 1482{
1515 RETVAL = THIS->options & optval; 1483 RETVAL = THIS->option (optval);
1516 1484
1517 if (set >= 0) 1485 if (set >= 0)
1518 { 1486 {
1519 if (set)
1520 THIS->options |= optval; 1487 THIS->set_option (optval, set);
1521 else
1522 THIS->options &= ~optval;
1523 1488
1524 if (THIS->check_ev.is_active ()) // avoid doing this before START 1489 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1525 switch (optval) 1490 switch (optval)
1526 { 1491 {
1527 case Opt_skipBuiltinGlyphs: 1492 case Opt_skipBuiltinGlyphs:
1528 THIS->set_fonts (); 1493 THIS->set_fonts ();
1529 THIS->scr_remap_chars (); 1494 THIS->scr_remap_chars ();
1530 THIS->scr_touch (true); 1495 THIS->scr_touch (true);
1531 THIS->want_refresh = 1; 1496 THIS->want_refresh = 1;
1497 THIS->refresh_check ();
1532 break; 1498 break;
1533 1499
1534 case Opt_cursorUnderline: 1500 case Opt_cursorUnderline:
1535 THIS->want_refresh = 1; 1501 THIS->want_refresh = 1;
1502 THIS->refresh_check ();
1536 break; 1503 break;
1537 1504
1538# case Opt_scrollBar_floating: 1505# case Opt_scrollBar_floating:
1539# case Opt_scrollBar_right: 1506# case Opt_scrollBar_right:
1540# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1507# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1598 1565
1599 clamp_it (rc.col, 0, THIS->ncol); 1566 clamp_it (rc.col, 0, THIS->ncol);
1600 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1567 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1601 1568
1602 if (ix) 1569 if (ix)
1570 {
1603 THIS->want_refresh = 1; 1571 THIS->want_refresh = 1;
1572 THIS->refresh_check ();
1573 }
1604 } 1574 }
1605} 1575}
1606 1576
1607char 1577char
1608rxvt_term::cur_charset () 1578rxvt_term::cur_charset ()
1609 CODE: 1579 CODE:
1610 RETVAL = THIS->charsets [THIS->screen.charset]; 1580 RETVAL = THIS->charsets [THIS->screen.charset];
1611 OUTPUT: 1581 OUTPUT:
1612 RETVAL 1582 RETVAL
1613 1583
1614#void 1584void
1615#rxvt_term::selection_clear () 1585rxvt_term::selection_clear ()
1616 1586
1617void 1587void
1618rxvt_term::selection_make (Time eventtime, bool rect = false) 1588rxvt_term::selection_make (Time eventtime, bool rect = false)
1619 CODE: 1589 CODE:
1620 THIS->selection.op = SELECTION_CONT; 1590 THIS->selection.op = SELECTION_CONT;
… …
1710void 1680void
1711rxvt_term::XListProperties (Window window) 1681rxvt_term::XListProperties (Window window)
1712 PPCODE: 1682 PPCODE:
1713{ 1683{
1714 int count; 1684 int count;
1715 Atom *props = XListProperties (THIS->display->display, window, &count); 1685 Atom *props = XListProperties (THIS->dpy, window, &count);
1716 1686
1717 EXTEND (SP, count); 1687 EXTEND (SP, count);
1718 while (count--) 1688 while (count--)
1719 PUSHs (newSVuv ((U32)props [count])); 1689 PUSHs (newSVuv ((U32)props [count]));
1720 1690
1721 XFree (props); 1691 XFree (props);
1722} 1692}
1723 1693
1724void 1694void
1725rxvt_term::XGetWindowProperty (Window window, Atom property) 1695rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1729 int format; 1699 int format;
1730 unsigned long nitems; 1700 unsigned long nitems;
1731 unsigned long bytes_after; 1701 unsigned long bytes_after;
1732 unsigned char *prop; 1702 unsigned char *prop;
1733 1703
1734 XGetWindowProperty (THIS->display->display, window, property, 1704 XGetWindowProperty (THIS->dpy, window, property,
1735 0, 1<<24, 0, AnyPropertyType, 1705 0, 1<<24, 0, AnyPropertyType,
1736 &type, &format, &nitems, &bytes_after, &prop); 1706 &type, &format, &nitems, &bytes_after, &prop);
1737 1707
1738 if (type != None) 1708 if (type != None)
1739 { 1709 {
… …
1748 XFree (prop); 1718 XFree (prop);
1749 } 1719 }
1750} 1720}
1751 1721
1752void 1722void
1753rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1723rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1754 CODE: 1724 CODE:
1755{ 1725{
1756 STRLEN len; 1726 STRLEN len;
1757 char *data_ = SvPVbyte (data, len); 1727 char *data_ = SvPVbyte (data, len);
1758 1728
1759 int elemsize = format == 16 ? sizeof (short) 1729 int elemsize = format == 16 ? sizeof (short)
1760 : format == 32 ? sizeof (long) 1730 : format == 32 ? sizeof (long)
1761 : 1; 1731 : 1;
1762 1732
1763 XChangeProperty (THIS->display->display, window, property, 1733 XChangeProperty (THIS->dpy, window, property,
1764 type, format, PropModeReplace, 1734 type, format, PropModeReplace,
1765 (unsigned char *)data_, len / elemsize); 1735 (unsigned char *)data_, len / elemsize);
1766 XSync (THIS->display->display, 0);
1767} 1736}
1768 1737
1769Atom 1738Atom
1770XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1739XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1771 C_ARGS: term->display->display, atom_name, only_if_exists 1740 C_ARGS: term->dpy, atom_name, only_if_exists
1772 1741
1773char * 1742char *
1774XGetAtomName (rxvt_term *term, Atom atom) 1743XGetAtomName (rxvt_term *term, Atom atom)
1775 C_ARGS: term->display->display, atom 1744 C_ARGS: term->dpy, atom
1776 CLEANUP: 1745 CLEANUP:
1777 XFree (RETVAL); 1746 XFree (RETVAL);
1778 1747
1779void 1748void
1780XDeleteProperty (rxvt_term *term, Window window, Atom property) 1749XDeleteProperty (rxvt_term *term, Window window, Atom property)
1781 C_ARGS: term->display->display, window, property 1750 C_ARGS: term->dpy, window, property
1782 1751
1783Window 1752Window
1784rxvt_term::DefaultRootWindow () 1753rxvt_term::DefaultRootWindow ()
1785 CODE: 1754 CODE:
1786 RETVAL = THIS->display->root; 1755 RETVAL = THIS->display->root;
… …
1789 1758
1790#if 0 1759#if 0
1791 1760
1792Window 1761Window
1793XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1762XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1794 C_ARGS: term->display->display, (Window)parent, 1763 C_ARGS: term->dpy, (Window)parent,
1795 x, y, width, height, 0, 1764 x, y, width, height, 0,
1796 term->pix_colors_focused[Color_border], 1765 term->pix_colors_focused[Color_border],
1797 term->pix_colors_focused[Color_border] 1766 term->pix_colors_focused[Color_border]
1798 1767
1799#endif 1768#endif
1800 1769
1801void 1770void
1802XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1771XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1803 C_ARGS: term->display->display, window, parent, x, y 1772 C_ARGS: term->dpy, window, parent, x, y
1804 1773
1805void 1774void
1806XMapWindow (rxvt_term *term, Window window) 1775XMapWindow (rxvt_term *term, Window window)
1807 C_ARGS: term->display->display, window 1776 C_ARGS: term->dpy, window
1808 1777
1809void 1778void
1810XUnmapWindow (rxvt_term *term, Window window) 1779XUnmapWindow (rxvt_term *term, Window window)
1811 C_ARGS: term->display->display, window 1780 C_ARGS: term->dpy, window
1812 1781
1813void 1782void
1814XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1783XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1815 C_ARGS: term->display->display, window, x, y, width, height 1784 C_ARGS: term->dpy, window, x, y, width, height
1816 1785
1817void 1786void
1818rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1787rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1819 CODE: 1788 CODE:
1820{ 1789{
1821 XWindowAttributes attr; 1790 XWindowAttributes attr;
1822 XGetWindowAttributes (THIS->display->display, window, &attr); 1791 XGetWindowAttributes (THIS->dpy, window, &attr);
1823 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1792 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1824} 1793}
1825 1794
1826void 1795void
1827rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1796rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1828 PPCODE: 1797 PPCODE:
1829{ 1798{
1830 int dx, dy; 1799 int dx, dy;
1831 Window child; 1800 Window child;
1832 1801
1833 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1802 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1834 { 1803 {
1835 EXTEND (SP, 3); 1804 EXTEND (SP, 3);
1836 PUSHs (newSViv (dx)); 1805 PUSHs (newSViv (dx));
1837 PUSHs (newSViv (dy)); 1806 PUSHs (newSViv (dy));
1838 PUSHs (newSVuv (child)); 1807 PUSHs (newSVuv (child));
… …
1855overlay::hide () 1824overlay::hide ()
1856 1825
1857void 1826void
1858overlay::DESTROY () 1827overlay::DESTROY ()
1859 1828
1860############################################################################# 1829INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1861# urxvt::watcher
1862#############################################################################
1863 1830
1864MODULE = urxvt PACKAGE = urxvt::watcher
1865
1866CHAINED
1867perl_watcher::cb (SV *cb)
1868 CODE:
1869 THIS->cb (cb);
1870 OUTPUT:
1871 RETVAL
1872
1873#############################################################################
1874# urxvt::timer
1875#############################################################################
1876
1877MODULE = urxvt PACKAGE = urxvt::timer
1878
1879SV *
1880timer::new ()
1881 CODE:
1882 timer *w = new timer;
1883 w->start (NOW);
1884 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1885 w->self = (HV *)SvRV (RETVAL);
1886 OUTPUT:
1887 RETVAL
1888
1889NV
1890timer::at ()
1891 CODE:
1892 RETVAL = THIS->at;
1893 OUTPUT:
1894 RETVAL
1895
1896CHAINED
1897timer::interval (NV interval)
1898 CODE:
1899 THIS->interval = interval;
1900 OUTPUT:
1901 RETVAL
1902
1903CHAINED
1904timer::set (NV tstamp)
1905 CODE:
1906 THIS->set (tstamp);
1907 OUTPUT:
1908 RETVAL
1909
1910CHAINED
1911timer::start (NV tstamp = THIS->at)
1912 CODE:
1913 THIS->start (tstamp);
1914 OUTPUT:
1915 RETVAL
1916
1917CHAINED
1918timer::after (NV delay)
1919 CODE:
1920 THIS->start (NOW + delay);
1921 OUTPUT:
1922 RETVAL
1923
1924CHAINED
1925timer::stop ()
1926 CODE:
1927 THIS->stop ();
1928 OUTPUT:
1929 RETVAL
1930
1931void
1932timer::DESTROY ()
1933
1934#############################################################################
1935# urxvt::iow
1936#############################################################################
1937
1938MODULE = urxvt PACKAGE = urxvt::iow
1939
1940SV *
1941iow::new ()
1942 CODE:
1943 iow *w = new iow;
1944 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1945 w->self = (HV *)SvRV (RETVAL);
1946 OUTPUT:
1947 RETVAL
1948
1949CHAINED
1950iow::fd (int fd)
1951 CODE:
1952 THIS->fd = fd;
1953 OUTPUT:
1954 RETVAL
1955
1956CHAINED
1957iow::events (short events)
1958 CODE:
1959 THIS->events = events;
1960 OUTPUT:
1961 RETVAL
1962
1963CHAINED
1964iow::start ()
1965 CODE:
1966 THIS->start ();
1967 OUTPUT:
1968 RETVAL
1969
1970CHAINED
1971iow::stop ()
1972 CODE:
1973 THIS->stop ();
1974 OUTPUT:
1975 RETVAL
1976
1977void
1978iow::DESTROY ()
1979
1980#############################################################################
1981# urxvt::iw
1982#############################################################################
1983
1984MODULE = urxvt PACKAGE = urxvt::iw
1985
1986SV *
1987iw::new ()
1988 CODE:
1989 iw *w = new iw;
1990 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1991 w->self = (HV *)SvRV (RETVAL);
1992 OUTPUT:
1993 RETVAL
1994
1995CHAINED
1996iw::start ()
1997 CODE:
1998 THIS->start ();
1999 OUTPUT:
2000 RETVAL
2001
2002CHAINED
2003iw::stop ()
2004 CODE:
2005 THIS->stop ();
2006 OUTPUT:
2007 RETVAL
2008
2009void
2010iw::DESTROY ()
2011
2012#############################################################################
2013# urxvt::pw
2014#############################################################################
2015
2016MODULE = urxvt PACKAGE = urxvt::pw
2017
2018SV *
2019pw::new ()
2020 CODE:
2021 pw *w = new pw;
2022 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2023 w->self = (HV *)SvRV (RETVAL);
2024 OUTPUT:
2025 RETVAL
2026
2027CHAINED
2028pw::start (int pid)
2029 CODE:
2030 THIS->start (pid);
2031 OUTPUT:
2032 RETVAL
2033
2034CHAINED
2035pw::stop ()
2036 CODE:
2037 THIS->stop ();
2038 OUTPUT:
2039 RETVAL
2040
2041void
2042pw::DESTROY ()
2043
2044

Diff Legend

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