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.93 by root, Wed Jan 25 15:02:47 2006 UTC vs.
Revision 1.128 by root, Sat Dec 26 09:42:16 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
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
249class overlay { 112class overlay : overlay_base
113{
250 rxvt_term *THIS; 114 rxvt_term *THIS;
251 AV *overlay_av; 115 AV *overlay_av;
252 int x, y, w, h;
253 int border; 116 int border;
254 text_t **text;
255 rend_t **rend;
256 117
257public: 118public:
258 HV *self; 119 HV *self;
259 120
260 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);
… …
267 128
268 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
269}; 130};
270 131
271overlay::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)
272: 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)
273{ 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
274 if (border == 2) 143 if (border == 2)
275 { 144 {
276 w += 2; 145 w += 2;
277 h += 2; 146 h += 2;
278 } 147 }
… …
344 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
345 )); 214 ));
346 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
347 216
348 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
349} 219}
350 220
351void 221void
352overlay::hide () 222overlay::hide ()
353{ 223{
… …
356 226
357 int i; 227 int i;
358 228
359 for (i = AvFILL (overlay_av); i >= 0; i--) 229 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) 230 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361 {
362 av_delete (overlay_av, i, G_DISCARD);
363 break; 231 break;
364 }
365 232
366 for (; i < AvFILL (overlay_av); i++) 233 for (; i < AvFILL (overlay_av); i++)
367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 234 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368 235
369 av_pop (overlay_av); 236 av_pop (overlay_av);
370 237
371 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
372 overlay_av = 0; 239 overlay_av = 0;
373 240
374 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
375} 243}
376 244
377void overlay::swap () 245void overlay::swap ()
378{ 246{
379 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));
380 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));
381 249
382 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
383 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;
384 257
385 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
386 { 259 {
387 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
388 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
424 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
425 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
426 } 299 }
427 300
428 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
429} 303}
430 304
305/////////////////////////////////////////////////////////////////////////////
306
307#define IOM_CLASS "urxvt"
308#define IOM_WARN rxvt_warn
309#include "iom_perl.h"
431 310
432///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
433 312
434struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
435 314
… …
439{ 318{
440 if (perl) 319 if (perl)
441 { 320 {
442 perl_destruct (perl); 321 perl_destruct (perl);
443 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
444 } 324 }
445} 325}
446 326
447void 327void
448rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
452 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
453 333
454 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
455 swap (perl_environ, environ); 335 swap (perl_environ, environ);
456 336
457 char *argv[] = { 337 char *args[] = {
458 "", 338 "",
459 "-e" 339 "-e"
460 "BEGIN {" 340 "BEGIN {"
461 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
462 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
463 "}" 343 "}"
464 "" 344 ""
465 "use urxvt;" 345 "use urxvt;"
466 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
467 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
468 perl = perl_alloc (); 351 perl = perl_alloc ();
469 perl_construct (perl); 352 perl_construct (perl);
470 353
471 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
472 || perl_run (perl)) 355 || perl_run (perl))
473 { 356 {
474 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
475 358
476 perl_destruct (perl); 359 perl_destruct (perl);
… …
494static void 377static void
495ungrab (rxvt_term *THIS) 378ungrab (rxvt_term *THIS)
496{ 379{
497 if (THIS->perl.grabtime) 380 if (THIS->perl.grabtime)
498 { 381 {
499 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 382 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
500 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 383 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
501 THIS->perl.grabtime = 0; 384 THIS->perl.grabtime = 0;
502 } 385 }
503} 386}
504 387
505bool 388bool
… …
510 393
511 // pre-handling of some events 394 // pre-handling of some events
512 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
513 { 396 {
514 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));
515 398
516 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
517 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
518 } 401 }
519 402
520 swap (perl_environ, environ); 403 swap (perl_environ, environ);
… …
558 case DT_STR_LEN: 441 case DT_STR_LEN:
559 { 442 {
560 char *str = va_arg (ap, char *); 443 char *str = va_arg (ap, char *);
561 int len = va_arg (ap, int); 444 int len = va_arg (ap, int);
562 445
563 printf ("pushing str %p:%d\n", str,len);//D
564 XPUSHs (sv_2mortal (newSVpvn (str, len))); 446 XPUSHs (sv_2mortal (newSVpvn (str, len)));
565 } 447 }
566 break; 448 break;
567 449
568 case DT_WCS_LEN: 450 case DT_WCS_LEN:
… …
720 602
721 // post-handling of some events 603 // post-handling of some events
722 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
723 { 605 {
724 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));
725 607
726 for (int i = AvFILL (av); i >= 0; i--) 608 for (int i = AvFILL (av); i >= 0; i--)
727 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
728 } 610 }
729 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
730 { 612 {
731 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
732 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
733 615
734 // don't allow further calls 616 // don't allow further calls
735 term->perl.self = 0; 617 term->perl.self = 0;
736 } 618 }
737 619
738 swap (perl_environ, environ); 620 swap (perl_environ, environ);
… …
764# include "optinc.h" 646# include "optinc.h"
765# undef nodef 647# undef nodef
766# undef def 648# undef def
767 649
768 HV *stash = gv_stashpv ("urxvt", 1); 650 HV *stash = gv_stashpv ("urxvt", 1);
769 struct { 651 static const struct {
770 const char *name; 652 const char *name;
771 IV iv; 653 IV iv;
772 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
773# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
774 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
775 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
776 const_iv (RS_Bold), 659 const_iv (RS_Bold),
777 const_iv (RS_Italic), 660 const_iv (RS_Italic),
778 const_iv (RS_Blink), 661 const_iv (RS_Blink),
… …
793 const_iv (Button3Mask), 676 const_iv (Button3Mask),
794 const_iv (Button4Mask), 677 const_iv (Button4Mask),
795 const_iv (Button5Mask), 678 const_iv (Button5Mask),
796 const_iv (AnyModifier), 679 const_iv (AnyModifier),
797 680
798 const_iv (EVENT_NONE), 681 const_iv (NoSymbol),
799 const_iv (EVENT_READ), 682 const_iv (GrabModeSync),
800 const_iv (EVENT_WRITE), 683 const_iv (GrabModeAsync),
801 684
802 const_iv (NoEventMask), 685 const_iv (NoEventMask),
803 const_iv (KeyPressMask), 686 const_iv (KeyPressMask),
804 const_iv (KeyReleaseMask), 687 const_iv (KeyReleaseMask),
805 const_iv (ButtonPressMask), 688 const_iv (ButtonPressMask),
… …
884 const_iv (XIMDontChange), 767 const_iv (XIMDontChange),
885# endif 768# endif
886# endif 769# endif
887 }; 770 };
888 771
889 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 772 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
890 civ-- > const_iv; )
891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 773 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
892} 774}
893 775
894void 776void
895warn (const char *msg) 777warn (const char *msg)
… …
905_exit (int status) 787_exit (int status)
906 788
907NV 789NV
908NOW () 790NOW ()
909 CODE: 791 CODE:
910 RETVAL = NOW; 792 RETVAL = ev::now ();
911 OUTPUT: 793 OUTPUT:
912 RETVAL 794 RETVAL
913 795
914int 796int
915GET_BASEFG (int rend) 797GET_BASEFG (int rend)
… …
926 RETVAL 808 RETVAL
927 809
928int 810int
929SET_FGCOLOR (int rend, int new_color) 811SET_FGCOLOR (int rend, int new_color)
930 CODE: 812 CODE:
931 RETVAL = SET_FGCOLOR (rend, new_color); 813 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
932 OUTPUT: 814 OUTPUT:
933 RETVAL 815 RETVAL
934 816
935int 817int
936SET_BGCOLOR (int rend, int new_color) 818SET_BGCOLOR (int rend, int new_color)
937 CODE: 819 CODE:
938 RETVAL = SET_BGCOLOR (rend, new_color); 820 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
939 OUTPUT: 821 OUTPUT:
940 RETVAL 822 RETVAL
941 823
942int 824int
943GET_CUSTOM (int rend) 825GET_CUSTOM (int rend)
944 CODE: 826 CODE:
945 RETVAL = (rend && RS_customMask) >> RS_customShift; 827 RETVAL = (rend & RS_customMask) >> RS_customShift;
946 OUTPUT: 828 OUTPUT:
947 RETVAL 829 RETVAL
948 830
949int 831int
950SET_CUSTOM (int rend, int new_value) 832SET_CUSTOM (int rend, int new_value)
… …
957 | ((new_value << RS_customShift) & RS_customMask); 839 | ((new_value << RS_customShift) & RS_customMask);
958} 840}
959 OUTPUT: 841 OUTPUT:
960 RETVAL 842 RETVAL
961 843
844void
845termlist ()
846 PPCODE:
847{
848 EXTEND (SP, rxvt_term::termlist.size ());
849
850 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
851 if ((*t)->perl.self)
852 PUSHs (sv_2mortal (newSVterm (*t)));
853}
854
962MODULE = urxvt PACKAGE = urxvt::term 855MODULE = urxvt PACKAGE = urxvt::term
963 856
964SV * 857SV *
965_new (...) 858_new (AV *env, AV *arg)
966 CODE: 859 CODE:
967{ 860{
968 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
969 croak ("first argument to urxvt::term->_new must be arrayref");
970
971 rxvt_term *term = new rxvt_term; 861 rxvt_term *term = new rxvt_term;
972 862
973 stringvec *argv = new stringvec; 863 stringvec *argv = new stringvec;
974 stringvec *envv = new stringvec; 864 stringvec *envv = new stringvec;
975 865
976 for (int i = 1; i < items; i++) 866 for (int i = 0; i <= AvFILL (arg); i++)
977 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 867 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
978 868
979 AV *env = (AV *)SvRV (ST (0));
980 for (int i = AvFILL (env) + 1; i--; ) 869 for (int i = AvFILL (env) + 1; i--; )
981 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 870 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
982 871
983 envv->push_back (0); 872 envv->push_back (0);
984 873
985 bool success;
986
987 try 874 try
988 { 875 {
989 success = term->init (argv, envv); 876 term->init (argv, envv);
990 } 877 }
991 catch (const class rxvt_failure_exception &e) 878 catch (const class rxvt_failure_exception &e)
992 {
993 success = false;
994 }
995
996 if (!success)
997 { 879 {
998 term->destroy (); 880 term->destroy ();
999 croak ("error while initializing new terminal instance"); 881 croak ("error while initializing new terminal instance");
1000 } 882 }
1001 883
… …
1011void 893void
1012rxvt_term::set_should_invoke (int htype, int inc) 894rxvt_term::set_should_invoke (int htype, int inc)
1013 CODE: 895 CODE:
1014 THIS->perl.should_invoke [htype] += inc; 896 THIS->perl.should_invoke [htype] += inc;
1015 897
1016void 898int
1017rxvt_term::grab_button (int button, U32 modifiers) 899rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1018 CODE: 900 CODE:
1019 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 901 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1020 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 902 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1021 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 903 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
904 OUTPUT: RETVAL
905
906int
907rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
908 CODE:
909 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
910 OUTPUT: RETVAL
911
912void
913rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
914 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
915 CODE:
916 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
917
918void
919rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
920 CODE:
921 XUngrabKey (THIS->dpy, keycode, modifiers, window);
922
923void
924rxvt_term::XUngrabKeyboard (Time eventtime)
925 CODE:
926 XUngrabKeyboard (THIS->dpy, eventtime);
1022 927
1023bool 928bool
1024rxvt_term::grab (Time eventtime, int sync = 0) 929rxvt_term::grab (Time eventtime, int sync = 0)
1025 CODE: 930 CODE:
1026{ 931{
1027 int mode = sync ? GrabModeSync : GrabModeAsync; 932 int mode = sync ? GrabModeSync : GrabModeAsync;
1028 933
1029 THIS->perl.grabtime = 0; 934 THIS->perl.grabtime = 0;
1030 935
1031 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 936 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1032 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 937 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1033 mode, mode, None, GRAB_CURSOR, eventtime)) 938 mode, mode, None, GRAB_CURSOR, eventtime))
1034 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 939 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1035 THIS->perl.grabtime = eventtime; 940 THIS->perl.grabtime = eventtime;
1036 else 941 else
1037 XUngrabPointer (THIS->display->display, eventtime); 942 XUngrabPointer (THIS->dpy, eventtime);
1038 943
1039 RETVAL = !!THIS->perl.grabtime; 944 RETVAL = !!THIS->perl.grabtime;
1040} 945}
1041 OUTPUT: 946 OUTPUT:
1042 RETVAL 947 RETVAL
1043 948
1044void 949void
1045rxvt_term::allow_events_async () 950rxvt_term::allow_events_async ()
1046 CODE: 951 CODE:
1047 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 952 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1048 953
1049void 954void
1050rxvt_term::allow_events_sync () 955rxvt_term::allow_events_sync ()
1051 CODE: 956 CODE:
1052 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 957 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1053 958
1054void 959void
1055rxvt_term::allow_events_replay () 960rxvt_term::allow_events_replay ()
1056 CODE: 961 CODE:
1057 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 962 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1058 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1059 964
1060void 965void
1061rxvt_term::ungrab () 966rxvt_term::ungrab ()
1062 CODE: 967 CODE:
1063 ungrab (THIS); 968 ungrab (THIS);
969
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
1064 993
1065int 994int
1066rxvt_term::strwidth (SV *str) 995rxvt_term::strwidth (SV *str)
1067 CODE: 996 CODE:
1068{ 997{
1069 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1070 999
1071 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1072 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 }
1073 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1074 1010
1075 free (wstr); 1011 free (wstr);
1076} 1012}
1077 OUTPUT: 1013 OUTPUT:
… …
1110 free (wstr); 1046 free (wstr);
1111} 1047}
1112 OUTPUT: 1048 OUTPUT:
1113 RETVAL 1049 RETVAL
1114 1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1055 OUTPUT:
1056 RETVAL
1057
1115#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1116 1059
1117#define TERM_OFFSET_width TERM_OFFSET(width) 1060#define TERM_OFFSET_width TERM_OFFSET(width)
1118#define TERM_OFFSET_height TERM_OFFSET(height) 1061#define TERM_OFFSET_height TERM_OFFSET(height)
1119#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1120#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1121#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1122#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1123#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1124#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1125#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1126#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1127#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1128#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1072#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1129#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1130#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1131#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1132 1076
1133int 1077int
1134rxvt_term::width () 1078rxvt_term::width ()
1135 ALIAS: 1079 ALIAS:
1136 width = TERM_OFFSET_width 1080 width = TERM_OFFSET_width
1137 height = TERM_OFFSET_height 1081 height = TERM_OFFSET_height
1138 fwidth = TERM_OFFSET_fwidth 1082 fwidth = TERM_OFFSET_fwidth
1139 fheight = TERM_OFFSET_fheight 1083 fheight = TERM_OFFSET_fheight
1140 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1141 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1142 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1143 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1144 mapped = TERM_OFFSET_mapped 1088 mapped = TERM_OFFSET_mapped
1145 int_bwidth = TERM_OFFSET_int_bwidth 1089 int_bwidth = TERM_OFFSET_int_bwidth
1146 ext_bwidth = TERM_OFFSET_ext_bwidth 1090 ext_bwidth = TERM_OFFSET_ext_bwidth
1147 lineSpace = TERM_OFFSET_lineSpace 1091 lineSpace = TERM_OFFSET_lineSpace
1092 letterSpace = TERM_OFFSET_letterSpace
1148 saveLines = TERM_OFFSET_saveLines 1093 saveLines = TERM_OFFSET_saveLines
1149 total_rows = TERM_OFFSET_total_rows 1094 total_rows = TERM_OFFSET_total_rows
1150 top_row = TERM_OFFSET_top_row 1095 top_row = TERM_OFFSET_top_row
1151 CODE: 1096 CODE:
1152 RETVAL = *(int *)((char *)THIS + ix); 1097 RETVAL = *(int *)((char *)THIS + ix);
1153 OUTPUT: 1098 OUTPUT:
1154 RETVAL 1099 RETVAL
1155 1100
… …
1166 { 1111 {
1167 case 0: RETVAL = THIS->ModLevel3Mask; break; 1112 case 0: RETVAL = THIS->ModLevel3Mask; break;
1168 case 1: RETVAL = THIS->ModMetaMask; break; 1113 case 1: RETVAL = THIS->ModMetaMask; break;
1169 case 2: RETVAL = THIS->ModNumLockMask; break; 1114 case 2: RETVAL = THIS->ModNumLockMask; break;
1170 case 3: RETVAL = THIS->current_screen; break; 1115 case 3: RETVAL = THIS->current_screen; break;
1116#ifdef CURSOR_BLINK
1171 case 4: RETVAL = THIS->hidden_cursor; break; 1117 case 4: RETVAL = THIS->hidden_cursor; break;
1118#endif
1172 } 1119 }
1173 OUTPUT: 1120 OUTPUT:
1174 RETVAL 1121 RETVAL
1175 1122
1176char * 1123char *
… …
1186 } 1133 }
1187 OUTPUT: 1134 OUTPUT:
1188 RETVAL 1135 RETVAL
1189 1136
1190SV * 1137SV *
1191rxvt_term::_env () 1138rxvt_term::envv ()
1139 ALIAS:
1140 argv = 1
1192 CODE: 1141 PPCODE:
1193{ 1142{
1194 if (THIS->envv) 1143 stringvec *vec = ix ? THIS->argv : THIS->envv;
1195 {
1196 AV *av = newAV ();
1197 1144
1145 EXTEND (SP, vec->size ());
1146
1198 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1147 for (char **i = vec->begin (); i != vec->end (); ++i)
1199 if (*i) 1148 if (*i)
1200 av_push (av, newSVpv (*i, 0)); 1149 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1201
1202 RETVAL = newRV_noinc ((SV *)av);
1203 }
1204 else
1205 RETVAL = &PL_sv_undef;
1206} 1150}
1207 OUTPUT:
1208 RETVAL
1209 1151
1210int 1152int
1211rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1153rxvt_term::pty_ev_events (int events = ev::UNDEF)
1212 CODE: 1154 CODE:
1213 RETVAL = THIS->pty_ev.events; 1155 RETVAL = THIS->pty_ev.events;
1214 if (events != EVENT_UNDEF) 1156 if (events != ev::UNDEF)
1215 THIS->pty_ev.set (events); 1157 THIS->pty_ev.set (events);
1216 OUTPUT: 1158 OUTPUT:
1217 RETVAL 1159 RETVAL
1218 1160
1219int 1161int
… …
1269 1211
1270void 1212void
1271rxvt_term::focus_out () 1213rxvt_term::focus_out ()
1272 1214
1273void 1215void
1216rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1217 ALIAS:
1218 key_release = 1
1219 CODE:
1220{
1221 XKeyEvent xkey;
1222
1223 memset (&xkey, 0, sizeof (xkey));
1224
1225 xkey.time = time;
1226 xkey.state = state;
1227 xkey.keycode = keycode;
1228
1229 xkey.type = ix ? KeyRelease : KeyPress;
1230 xkey.display = THIS->dpy;
1231 xkey.window = THIS->vt;
1232 xkey.root = THIS->display->root;
1233 xkey.subwindow = THIS->vt;
1234
1235 if (ix)
1236 THIS->key_release (xkey);
1237 else
1238 THIS->key_press (xkey);
1239}
1240
1241void
1274rxvt_term::want_refresh () 1242rxvt_term::want_refresh ()
1275 CODE: 1243 CODE:
1276 THIS->want_refresh = 1; 1244 THIS->want_refresh = 1;
1245 THIS->refresh_check ();
1277 1246
1278void 1247void
1279rxvt_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)
1280 PPCODE: 1249 PPCODE:
1281{ 1250{
… …
1436SV * 1405SV *
1437rxvt_term::special_decode (SV *text) 1406rxvt_term::special_decode (SV *text)
1438 CODE: 1407 CODE:
1439{ 1408{
1440 wchar_t *wstr = sv2wcs (text); 1409 wchar_t *wstr = sv2wcs (text);
1441 int wlen = wcslen (wstr);
1442 int dlen = 0; 1410 int dlen = 0;
1443 1411
1444 // find length 1412 // find length
1445 for (wchar_t *s = wstr; *s; s++) 1413 for (wchar_t *s = wstr; *s; s++)
1446 if (*s == NOCHAR) 1414 if (*s == NOCHAR)
… …
1469 1437
1470void 1438void
1471rxvt_term::_resource (char *name, int index, SV *newval = 0) 1439rxvt_term::_resource (char *name, int index, SV *newval = 0)
1472 PPCODE: 1440 PPCODE:
1473{ 1441{
1474 struct resval { const char *name; int value; } rslist [] = { 1442 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1475# define def(name) { # name, Rs_ ## name }, 1443# define def(name) { # name, Rs_ ## name },
1476# define reserve(name,count) 1444# define reserve(name,count)
1477# include "rsinc.h" 1445# include "rsinc.h"
1478# undef def 1446# undef def
1479# undef reserve 1447# undef reserve
1480 }; 1448 };
1481 1449
1482 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1450 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1483 1451
1452 if (*name)
1484 do { 1453 {
1454 do {
1485 if (rs-- == rslist) 1455 if (rs-- == rslist)
1486 croak ("no such resource '%s', requested", name); 1456 croak ("no such resource '%s', requested", name);
1487 } while (strcmp (name, rs->name)); 1457 } while (strcmp (name, rs->name));
1488 1458
1489 index += rs->value; 1459 index += rs->value;
1460 }
1461 else
1462 {
1463 --rs;
1464 name = "";
1465 }
1490 1466
1491 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1467 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1492 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);
1493 1469
1494 if (GIMME_V != G_VOID) 1470 if (GIMME_V != G_VOID)
… …
1509 1485
1510const char * 1486const char *
1511rxvt_term::x_resource (const char *name) 1487rxvt_term::x_resource (const char *name)
1512 1488
1513bool 1489bool
1514rxvt_term::option (U32 optval, int set = -1) 1490rxvt_term::option (U8 optval, int set = -1)
1515 CODE: 1491 CODE:
1516{ 1492{
1517 RETVAL = THIS->options & optval; 1493 RETVAL = THIS->option (optval);
1518 1494
1519 if (set >= 0) 1495 if (set >= 0)
1520 { 1496 {
1521 if (set)
1522 THIS->options |= optval; 1497 THIS->set_option (optval, set);
1523 else
1524 THIS->options &= ~optval;
1525 1498
1526 if (THIS->check_ev.is_active ()) // avoid doing this before START 1499 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1527 switch (optval) 1500 switch (optval)
1528 { 1501 {
1529 case Opt_skipBuiltinGlyphs: 1502 case Opt_skipBuiltinGlyphs:
1530 THIS->set_fonts (); 1503 THIS->set_fonts ();
1531 THIS->scr_remap_chars (); 1504 THIS->scr_remap_chars ();
1532 THIS->scr_touch (true); 1505 THIS->scr_touch (true);
1533 THIS->want_refresh = 1; 1506 THIS->want_refresh = 1;
1507 THIS->refresh_check ();
1534 break; 1508 break;
1535 1509
1536 case Opt_cursorUnderline: 1510 case Opt_cursorUnderline:
1537 THIS->want_refresh = 1; 1511 THIS->want_refresh = 1;
1512 THIS->refresh_check ();
1538 break; 1513 break;
1539 1514
1540# case Opt_scrollBar_floating: 1515# case Opt_scrollBar_floating:
1541# case Opt_scrollBar_right: 1516# case Opt_scrollBar_right:
1542# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1517# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1575 EXTEND (SP, 2); 1550 EXTEND (SP, 2);
1576 PUSHs (sv_2mortal (newSViv (rc.row))); 1551 PUSHs (sv_2mortal (newSViv (rc.row)));
1577 PUSHs (sv_2mortal (newSViv (rc.col))); 1552 PUSHs (sv_2mortal (newSViv (rc.col)));
1578 } 1553 }
1579 1554
1580 if (items == 3) 1555 if (items >= 3)
1581 { 1556 {
1582 rc.row = SvIV (ST (1)); 1557 rc.row = SvIV (ST (1));
1583 rc.col = SvIV (ST (2)); 1558 rc.col = SvIV (ST (2));
1584 1559
1585 if (ix == 2) 1560 if (ix == 2)
… …
1600 1575
1601 clamp_it (rc.col, 0, THIS->ncol); 1576 clamp_it (rc.col, 0, THIS->ncol);
1602 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1577 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1603 1578
1604 if (ix) 1579 if (ix)
1580 {
1581 THIS->selection.screen = THIS->current_screen;
1582
1605 THIS->want_refresh = 1; 1583 THIS->want_refresh = 1;
1584 THIS->refresh_check ();
1606 } 1585 }
1586 }
1607} 1587}
1608 1588
1609char 1589int
1610rxvt_term::cur_charset () 1590rxvt_term::selection_screen (int screen = -1)
1611 CODE: 1591 CODE:
1612 RETVAL = THIS->charsets [THIS->screen.charset]; 1592 RETVAL = THIS->selection.screen;
1613 OUTPUT: 1593 if (screen >= 0)
1594 THIS->selection.screen = screen;
1595 OUTPUT:
1614 RETVAL 1596 RETVAL
1615 1597
1616void 1598void
1617rxvt_term::selection_clear () 1599rxvt_term::selection_clear ()
1618 1600
… …
1641 1623
1642 THIS->selection.text = sv2wcs (newtext); 1624 THIS->selection.text = sv2wcs (newtext);
1643 THIS->selection.len = wcslen (THIS->selection.text); 1625 THIS->selection.len = wcslen (THIS->selection.text);
1644 } 1626 }
1645} 1627}
1628
1629char
1630rxvt_term::cur_charset ()
1631 CODE:
1632 RETVAL = THIS->charsets [THIS->screen.charset];
1633 OUTPUT:
1634 RETVAL
1646 1635
1647void 1636void
1648rxvt_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) 1637rxvt_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)
1649 1638
1650void 1639void
… …
1712void 1701void
1713rxvt_term::XListProperties (Window window) 1702rxvt_term::XListProperties (Window window)
1714 PPCODE: 1703 PPCODE:
1715{ 1704{
1716 int count; 1705 int count;
1717 Atom *props = XListProperties (THIS->display->display, window, &count); 1706 Atom *props = XListProperties (THIS->dpy, window, &count);
1718 1707
1719 EXTEND (SP, count); 1708 EXTEND (SP, count);
1720 while (count--) 1709 while (count--)
1721 PUSHs (newSVuv ((U32)props [count])); 1710 PUSHs (newSVuv ((U32)props [count]));
1722 1711
1723 XFree (props); 1712 XFree (props);
1724} 1713}
1725 1714
1726void 1715void
1727rxvt_term::XGetWindowProperty (Window window, Atom property) 1716rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1731 int format; 1720 int format;
1732 unsigned long nitems; 1721 unsigned long nitems;
1733 unsigned long bytes_after; 1722 unsigned long bytes_after;
1734 unsigned char *prop; 1723 unsigned char *prop;
1735 1724
1736 XGetWindowProperty (THIS->display->display, window, property, 1725 XGetWindowProperty (THIS->dpy, window, property,
1737 0, 1<<24, 0, AnyPropertyType, 1726 0, 1<<24, 0, AnyPropertyType,
1738 &type, &format, &nitems, &bytes_after, &prop); 1727 &type, &format, &nitems, &bytes_after, &prop);
1739 1728
1740 if (type != None) 1729 if (type != None)
1741 { 1730 {
… …
1750 XFree (prop); 1739 XFree (prop);
1751 } 1740 }
1752} 1741}
1753 1742
1754void 1743void
1755rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1744rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1756 CODE: 1745 CODE:
1757{ 1746{
1758 STRLEN len; 1747 STRLEN len;
1759 char *data_ = SvPVbyte (data, len); 1748 char *data_ = SvPVbyte (data, len);
1760 1749
1761 int elemsize = format == 16 ? sizeof (short) 1750 int elemsize = format == 16 ? sizeof (short)
1762 : format == 32 ? sizeof (long) 1751 : format == 32 ? sizeof (long)
1763 : 1; 1752 : 1;
1764 1753
1765 XChangeProperty (THIS->display->display, window, property, 1754 XChangeProperty (THIS->dpy, window, property,
1766 type, format, PropModeReplace, 1755 type, format, PropModeReplace,
1767 (unsigned char *)data_, len / elemsize); 1756 (unsigned char *)data_, len / elemsize);
1768 XSync (THIS->display->display, 0);
1769} 1757}
1770 1758
1771Atom 1759Atom
1772XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1760XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1773 C_ARGS: term->display->display, atom_name, only_if_exists 1761 C_ARGS: term->dpy, atom_name, only_if_exists
1774 1762
1775char * 1763char *
1776XGetAtomName (rxvt_term *term, Atom atom) 1764XGetAtomName (rxvt_term *term, Atom atom)
1777 C_ARGS: term->display->display, atom 1765 C_ARGS: term->dpy, atom
1778 CLEANUP: 1766 CLEANUP:
1779 XFree (RETVAL); 1767 XFree (RETVAL);
1780 1768
1781void 1769void
1782XDeleteProperty (rxvt_term *term, Window window, Atom property) 1770XDeleteProperty (rxvt_term *term, Window window, Atom property)
1783 C_ARGS: term->display->display, window, property 1771 C_ARGS: term->dpy, window, property
1784 1772
1785Window 1773Window
1786rxvt_term::DefaultRootWindow () 1774rxvt_term::DefaultRootWindow ()
1787 CODE: 1775 CODE:
1788 RETVAL = THIS->display->root; 1776 RETVAL = THIS->display->root;
… …
1791 1779
1792#if 0 1780#if 0
1793 1781
1794Window 1782Window
1795XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1783XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1796 C_ARGS: term->display->display, (Window)parent, 1784 C_ARGS: term->dpy, (Window)parent,
1797 x, y, width, height, 0, 1785 x, y, width, height, 0,
1798 term->pix_colors_focused[Color_border], 1786 term->pix_colors_focused[Color_border],
1799 term->pix_colors_focused[Color_border] 1787 term->pix_colors_focused[Color_border]
1800 1788
1801#endif 1789#endif
1802 1790
1803void 1791void
1804XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1792XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1805 C_ARGS: term->display->display, window, parent, x, y 1793 C_ARGS: term->dpy, window, parent, x, y
1806 1794
1807void 1795void
1808XMapWindow (rxvt_term *term, Window window) 1796XMapWindow (rxvt_term *term, Window window)
1809 C_ARGS: term->display->display, window 1797 C_ARGS: term->dpy, window
1810 1798
1811void 1799void
1812XUnmapWindow (rxvt_term *term, Window window) 1800XUnmapWindow (rxvt_term *term, Window window)
1813 C_ARGS: term->display->display, window 1801 C_ARGS: term->dpy, window
1814 1802
1815void 1803void
1816XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1804XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1817 C_ARGS: term->display->display, window, x, y, width, height 1805 C_ARGS: term->dpy, window, x, y, width, height
1818 1806
1819void 1807void
1820rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1808rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1821 CODE: 1809 CODE:
1822{ 1810{
1823 XWindowAttributes attr; 1811 XWindowAttributes attr;
1824 XGetWindowAttributes (THIS->display->display, window, &attr); 1812 XGetWindowAttributes (THIS->dpy, window, &attr);
1825 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1813 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1826} 1814}
1827 1815
1828void 1816void
1829rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1817rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1830 PPCODE: 1818 PPCODE:
1831{ 1819{
1832 int dx, dy; 1820 int dx, dy;
1833 Window child; 1821 Window child;
1834 1822
1835 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1823 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1836 { 1824 {
1837 EXTEND (SP, 3); 1825 EXTEND (SP, 3);
1838 PUSHs (newSViv (dx)); 1826 PUSHs (newSViv (dx));
1839 PUSHs (newSViv (dy)); 1827 PUSHs (newSViv (dy));
1840 PUSHs (newSVuv (child)); 1828 PUSHs (newSVuv (child));
… …
1857overlay::hide () 1845overlay::hide ()
1858 1846
1859void 1847void
1860overlay::DESTROY () 1848overlay::DESTROY ()
1861 1849
1862############################################################################# 1850INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1863# urxvt::watcher
1864#############################################################################
1865 1851
1866MODULE = urxvt PACKAGE = urxvt::watcher
1867
1868CHAINED
1869perl_watcher::cb (SV *cb)
1870 CODE:
1871 THIS->cb (cb);
1872 OUTPUT:
1873 RETVAL
1874
1875#############################################################################
1876# urxvt::timer
1877#############################################################################
1878
1879MODULE = urxvt PACKAGE = urxvt::timer
1880
1881SV *
1882timer::new ()
1883 CODE:
1884 timer *w = new timer;
1885 w->start (NOW);
1886 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1887 w->self = (HV *)SvRV (RETVAL);
1888 OUTPUT:
1889 RETVAL
1890
1891NV
1892timer::at ()
1893 CODE:
1894 RETVAL = THIS->at;
1895 OUTPUT:
1896 RETVAL
1897
1898CHAINED
1899timer::interval (NV interval)
1900 CODE:
1901 THIS->interval = interval;
1902 OUTPUT:
1903 RETVAL
1904
1905CHAINED
1906timer::set (NV tstamp)
1907 CODE:
1908 THIS->set (tstamp);
1909 OUTPUT:
1910 RETVAL
1911
1912CHAINED
1913timer::start (NV tstamp = THIS->at)
1914 CODE:
1915 THIS->start (tstamp);
1916 OUTPUT:
1917 RETVAL
1918
1919CHAINED
1920timer::after (NV delay)
1921 CODE:
1922 THIS->start (NOW + delay);
1923 OUTPUT:
1924 RETVAL
1925
1926CHAINED
1927timer::stop ()
1928 CODE:
1929 THIS->stop ();
1930 OUTPUT:
1931 RETVAL
1932
1933void
1934timer::DESTROY ()
1935
1936#############################################################################
1937# urxvt::iow
1938#############################################################################
1939
1940MODULE = urxvt PACKAGE = urxvt::iow
1941
1942SV *
1943iow::new ()
1944 CODE:
1945 iow *w = new iow;
1946 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1947 w->self = (HV *)SvRV (RETVAL);
1948 OUTPUT:
1949 RETVAL
1950
1951CHAINED
1952iow::fd (int fd)
1953 CODE:
1954 THIS->fd = fd;
1955 OUTPUT:
1956 RETVAL
1957
1958CHAINED
1959iow::events (short events)
1960 CODE:
1961 THIS->events = events;
1962 OUTPUT:
1963 RETVAL
1964
1965CHAINED
1966iow::start ()
1967 CODE:
1968 THIS->start ();
1969 OUTPUT:
1970 RETVAL
1971
1972CHAINED
1973iow::stop ()
1974 CODE:
1975 THIS->stop ();
1976 OUTPUT:
1977 RETVAL
1978
1979void
1980iow::DESTROY ()
1981
1982#############################################################################
1983# urxvt::iw
1984#############################################################################
1985
1986MODULE = urxvt PACKAGE = urxvt::iw
1987
1988SV *
1989iw::new ()
1990 CODE:
1991 iw *w = new iw;
1992 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1993 w->self = (HV *)SvRV (RETVAL);
1994 OUTPUT:
1995 RETVAL
1996
1997CHAINED
1998iw::start ()
1999 CODE:
2000 THIS->start ();
2001 OUTPUT:
2002 RETVAL
2003
2004CHAINED
2005iw::stop ()
2006 CODE:
2007 THIS->stop ();
2008 OUTPUT:
2009 RETVAL
2010
2011void
2012iw::DESTROY ()
2013
2014#############################################################################
2015# urxvt::pw
2016#############################################################################
2017
2018MODULE = urxvt PACKAGE = urxvt::pw
2019
2020SV *
2021pw::new ()
2022 CODE:
2023 pw *w = new pw;
2024 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2025 w->self = (HV *)SvRV (RETVAL);
2026 OUTPUT:
2027 RETVAL
2028
2029CHAINED
2030pw::start (int pid)
2031 CODE:
2032 THIS->start (pid);
2033 OUTPUT:
2034 RETVAL
2035
2036CHAINED
2037pw::stop ()
2038 CODE:
2039 THIS->stop ();
2040 OUTPUT:
2041 RETVAL
2042
2043void
2044pw::DESTROY ()
2045
2046

Diff Legend

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