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.94 by root, Thu Jan 26 00:09:47 2006 UTC vs.
Revision 1.131 by root, Sun May 23 00:08:53 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h" 34#include "unistd.h"
35 35
36#include "iom.h" 36#include "ev_cpp.h"
37#include "rxvt.h" 37#include "rxvt.h"
38#include "keyboard.h" 38#include "keyboard.h"
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 44#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 45
50#undef LINENO 46#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 47#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 48#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 49#define ROW(n) THIS->row_buf [LINENO (n)]
54 50
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 51/////////////////////////////////////////////////////////////////////////////
58 52
59static wchar_t * 53static wchar_t *
60sv2wcs (SV *sv) 54sv2wcs (SV *sv)
61{ 55{
… …
75 69
76 return sv; 70 return sv;
77} 71}
78 72
79static SV * 73static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
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);
… …
719 602
720 // post-handling of some events 603 // post-handling of some events
721 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
722 { 605 {
723 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));
724 607
725 for (int i = AvFILL (av); i >= 0; i--) 608 for (int i = AvFILL (av); i >= 0; i--)
726 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
727 } 610 }
728 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
729 { 612 {
730 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
731 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
732 615
733 // don't allow further calls 616 // don't allow further calls
734 term->perl.self = 0; 617 term->perl.self = 0;
735 } 618 }
736 619
737 swap (perl_environ, environ); 620 swap (perl_environ, environ);
… …
763# include "optinc.h" 646# include "optinc.h"
764# undef nodef 647# undef nodef
765# undef def 648# undef def
766 649
767 HV *stash = gv_stashpv ("urxvt", 1); 650 HV *stash = gv_stashpv ("urxvt", 1);
768 struct { 651 static const struct {
769 const char *name; 652 const char *name;
770 IV iv; 653 IV iv;
771 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
772# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
773 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
774 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
659 const_iv (Color_Bits),
660 const_iv (RS_bgShift), const_iv (RS_bgMask),
661 const_iv (RS_fgShift), const_iv (RS_fgMask),
662 const_iv (RS_Careful),
663 const_iv (RS_fontCount),
664 const_iv (RS_fontShift),
665 const_iv (RS_fontMask),
666 const_iv (RS_baseattrMask),
667 const_iv (RS_attrMask),
668 const_iv (RS_redraw),
669 const_iv (RS_Sel),
775 const_iv (RS_Bold), 670 const_iv (RS_Bold),
776 const_iv (RS_Italic), 671 const_iv (RS_Italic),
777 const_iv (RS_Blink), 672 const_iv (RS_Blink),
778 const_iv (RS_RVid), 673 const_iv (RS_RVid),
779 const_iv (RS_Uline), 674 const_iv (RS_Uline),
… …
792 const_iv (Button3Mask), 687 const_iv (Button3Mask),
793 const_iv (Button4Mask), 688 const_iv (Button4Mask),
794 const_iv (Button5Mask), 689 const_iv (Button5Mask),
795 const_iv (AnyModifier), 690 const_iv (AnyModifier),
796 691
797 const_iv (EVENT_NONE), 692 const_iv (NoSymbol),
798 const_iv (EVENT_READ), 693 const_iv (GrabModeSync),
799 const_iv (EVENT_WRITE), 694 const_iv (GrabModeAsync),
800 695
801 const_iv (NoEventMask), 696 const_iv (NoEventMask),
802 const_iv (KeyPressMask), 697 const_iv (KeyPressMask),
803 const_iv (KeyReleaseMask), 698 const_iv (KeyReleaseMask),
804 const_iv (ButtonPressMask), 699 const_iv (ButtonPressMask),
… …
883 const_iv (XIMDontChange), 778 const_iv (XIMDontChange),
884# endif 779# endif
885# endif 780# endif
886 }; 781 };
887 782
888 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 783 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
889 civ-- > const_iv; )
890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 784 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
891} 785}
892 786
893void 787void
894warn (const char *msg) 788warn (const char *msg)
… …
904_exit (int status) 798_exit (int status)
905 799
906NV 800NV
907NOW () 801NOW ()
908 CODE: 802 CODE:
909 RETVAL = NOW; 803 RETVAL = ev::now ();
910 OUTPUT: 804 OUTPUT:
911 RETVAL 805 RETVAL
912 806
913int 807int
914GET_BASEFG (int rend) 808GET_BASEFG (int rend)
… …
925 RETVAL 819 RETVAL
926 820
927int 821int
928SET_FGCOLOR (int rend, int new_color) 822SET_FGCOLOR (int rend, int new_color)
929 CODE: 823 CODE:
930 RETVAL = SET_FGCOLOR (rend, new_color); 824 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
931 OUTPUT: 825 OUTPUT:
932 RETVAL 826 RETVAL
933 827
934int 828int
935SET_BGCOLOR (int rend, int new_color) 829SET_BGCOLOR (int rend, int new_color)
936 CODE: 830 CODE:
937 RETVAL = SET_BGCOLOR (rend, new_color); 831 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
938 OUTPUT: 832 OUTPUT:
939 RETVAL 833 RETVAL
940 834
941int 835int
942GET_CUSTOM (int rend) 836GET_CUSTOM (int rend)
943 CODE: 837 CODE:
944 RETVAL = (rend && RS_customMask) >> RS_customShift; 838 RETVAL = (rend & RS_customMask) >> RS_customShift;
945 OUTPUT: 839 OUTPUT:
946 RETVAL 840 RETVAL
947 841
948int 842int
949SET_CUSTOM (int rend, int new_value) 843SET_CUSTOM (int rend, int new_value)
… …
956 | ((new_value << RS_customShift) & RS_customMask); 850 | ((new_value << RS_customShift) & RS_customMask);
957} 851}
958 OUTPUT: 852 OUTPUT:
959 RETVAL 853 RETVAL
960 854
855void
856termlist ()
857 PPCODE:
858{
859 EXTEND (SP, rxvt_term::termlist.size ());
860
861 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
862 if ((*t)->perl.self)
863 PUSHs (sv_2mortal (newSVterm (*t)));
864}
865
961MODULE = urxvt PACKAGE = urxvt::term 866MODULE = urxvt PACKAGE = urxvt::term
962 867
963SV * 868SV *
964_new (...) 869_new (AV *env, AV *arg)
965 CODE: 870 CODE:
966{ 871{
967 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
968 croak ("first argument to urxvt::term->_new must be arrayref");
969
970 rxvt_term *term = new rxvt_term; 872 rxvt_term *term = new rxvt_term;
971 873
972 stringvec *argv = new stringvec; 874 stringvec *argv = new stringvec;
973 stringvec *envv = new stringvec; 875 stringvec *envv = new stringvec;
974 876
975 for (int i = 1; i < items; i++) 877 for (int i = 0; i <= AvFILL (arg); i++)
976 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 878 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
977 879
978 AV *env = (AV *)SvRV (ST (0));
979 for (int i = AvFILL (env) + 1; i--; ) 880 for (int i = AvFILL (env) + 1; i--; )
980 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 881 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
981 882
982 envv->push_back (0); 883 envv->push_back (0);
983 884
984 bool success;
985
986 try 885 try
987 { 886 {
988 success = term->init (argv, envv); 887 term->init (argv, envv);
989 } 888 }
990 catch (const class rxvt_failure_exception &e) 889 catch (const class rxvt_failure_exception &e)
991 {
992 success = false;
993 }
994
995 if (!success)
996 { 890 {
997 term->destroy (); 891 term->destroy ();
998 croak ("error while initializing new terminal instance"); 892 croak ("error while initializing new terminal instance");
999 } 893 }
1000 894
… …
1010void 904void
1011rxvt_term::set_should_invoke (int htype, int inc) 905rxvt_term::set_should_invoke (int htype, int inc)
1012 CODE: 906 CODE:
1013 THIS->perl.should_invoke [htype] += inc; 907 THIS->perl.should_invoke [htype] += inc;
1014 908
1015void 909int
1016rxvt_term::grab_button (int button, U32 modifiers) 910rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1017 CODE: 911 CODE:
1018 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 912 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1019 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 913 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1020 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 914 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
915 OUTPUT: RETVAL
916
917int
918rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
919 CODE:
920 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
921 OUTPUT: RETVAL
922
923void
924rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
925 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
926 CODE:
927 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
928
929void
930rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
931 CODE:
932 XUngrabKey (THIS->dpy, keycode, modifiers, window);
933
934void
935rxvt_term::XUngrabKeyboard (Time eventtime)
936 CODE:
937 XUngrabKeyboard (THIS->dpy, eventtime);
1021 938
1022bool 939bool
1023rxvt_term::grab (Time eventtime, int sync = 0) 940rxvt_term::grab (Time eventtime, int sync = 0)
1024 CODE: 941 CODE:
1025{ 942{
1026 int mode = sync ? GrabModeSync : GrabModeAsync; 943 int mode = sync ? GrabModeSync : GrabModeAsync;
1027 944
1028 THIS->perl.grabtime = 0; 945 THIS->perl.grabtime = 0;
1029 946
1030 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 947 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1031 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 948 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1032 mode, mode, None, GRAB_CURSOR, eventtime)) 949 mode, mode, None, GRAB_CURSOR, eventtime))
1033 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 950 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1034 THIS->perl.grabtime = eventtime; 951 THIS->perl.grabtime = eventtime;
1035 else 952 else
1036 XUngrabPointer (THIS->display->display, eventtime); 953 XUngrabPointer (THIS->dpy, eventtime);
1037 954
1038 RETVAL = !!THIS->perl.grabtime; 955 RETVAL = !!THIS->perl.grabtime;
1039} 956}
1040 OUTPUT: 957 OUTPUT:
1041 RETVAL 958 RETVAL
1042 959
1043void 960void
1044rxvt_term::allow_events_async () 961rxvt_term::allow_events_async ()
1045 CODE: 962 CODE:
1046 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1047 964
1048void 965void
1049rxvt_term::allow_events_sync () 966rxvt_term::allow_events_sync ()
1050 CODE: 967 CODE:
1051 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 968 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1052 969
1053void 970void
1054rxvt_term::allow_events_replay () 971rxvt_term::allow_events_replay ()
1055 CODE: 972 CODE:
1056 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 973 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1057 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 974 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1058 975
1059void 976void
1060rxvt_term::ungrab () 977rxvt_term::ungrab ()
1061 CODE: 978 CODE:
1062 ungrab (THIS); 979 ungrab (THIS);
980
981int
982rxvt_term::XStringToKeysym (char *string)
983 CODE:
984 RETVAL = XStringToKeysym (string);
985 OUTPUT: RETVAL
986
987char *
988rxvt_term::XKeysymToString (int sym)
989 CODE:
990 RETVAL = XKeysymToString (sym);
991 OUTPUT: RETVAL
992
993int
994rxvt_term::XKeysymToKeycode (int sym)
995 CODE:
996 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
997 OUTPUT: RETVAL
998
999int
1000rxvt_term::XKeycodeToKeysym (int code, int index)
1001 CODE:
1002 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
1003 OUTPUT: RETVAL
1063 1004
1064int 1005int
1065rxvt_term::strwidth (SV *str) 1006rxvt_term::strwidth (SV *str)
1066 CODE: 1007 CODE:
1067{ 1008{
1068 wchar_t *wstr = sv2wcs (str); 1009 wchar_t *wstr = sv2wcs (str);
1069 1010
1070 rxvt_push_locale (THIS->locale); 1011 rxvt_push_locale (THIS->locale);
1071 RETVAL = wcswidth (wstr, wcslen (wstr)); 1012 RETVAL = 0;
1013 for (wchar_t *wc = wstr; *wc; wc++)
1014 {
1015 int w = WCWIDTH (*wc);
1016
1017 if (w)
1018 RETVAL += max (w, 1);
1019 }
1072 rxvt_pop_locale (); 1020 rxvt_pop_locale ();
1073 1021
1074 free (wstr); 1022 free (wstr);
1075} 1023}
1076 OUTPUT: 1024 OUTPUT:
… …
1109 free (wstr); 1057 free (wstr);
1110} 1058}
1111 OUTPUT: 1059 OUTPUT:
1112 RETVAL 1060 RETVAL
1113 1061
1062char *
1063rxvt_term::locale ()
1064 CODE:
1065 RETVAL = THIS->locale;
1066 OUTPUT:
1067 RETVAL
1068
1114#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1069#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1115 1070
1116#define TERM_OFFSET_width TERM_OFFSET(width) 1071#define TERM_OFFSET_width TERM_OFFSET(width)
1117#define TERM_OFFSET_height TERM_OFFSET(height) 1072#define TERM_OFFSET_height TERM_OFFSET(height)
1118#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1073#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1119#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1074#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1120#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1075#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1121#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1076#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1122#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1077#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1123#define TERM_OFFSET_focus TERM_OFFSET(focus) 1078#define TERM_OFFSET_focus TERM_OFFSET(focus)
1124#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1079#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1125#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1080#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1126#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1081#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1127#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1082#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1083#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1128#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1084#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1129#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1085#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1130#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1086#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1131 1087
1132int 1088int
1133rxvt_term::width () 1089rxvt_term::width ()
1134 ALIAS: 1090 ALIAS:
1135 width = TERM_OFFSET_width 1091 width = TERM_OFFSET_width
1136 height = TERM_OFFSET_height 1092 height = TERM_OFFSET_height
1137 fwidth = TERM_OFFSET_fwidth 1093 fwidth = TERM_OFFSET_fwidth
1138 fheight = TERM_OFFSET_fheight 1094 fheight = TERM_OFFSET_fheight
1139 fbase = TERM_OFFSET_fbase 1095 fbase = TERM_OFFSET_fbase
1140 nrow = TERM_OFFSET_nrow 1096 nrow = TERM_OFFSET_nrow
1141 ncol = TERM_OFFSET_ncol 1097 ncol = TERM_OFFSET_ncol
1142 focus = TERM_OFFSET_focus 1098 focus = TERM_OFFSET_focus
1143 mapped = TERM_OFFSET_mapped 1099 mapped = TERM_OFFSET_mapped
1144 int_bwidth = TERM_OFFSET_int_bwidth 1100 int_bwidth = TERM_OFFSET_int_bwidth
1145 ext_bwidth = TERM_OFFSET_ext_bwidth 1101 ext_bwidth = TERM_OFFSET_ext_bwidth
1146 lineSpace = TERM_OFFSET_lineSpace 1102 lineSpace = TERM_OFFSET_lineSpace
1103 letterSpace = TERM_OFFSET_letterSpace
1147 saveLines = TERM_OFFSET_saveLines 1104 saveLines = TERM_OFFSET_saveLines
1148 total_rows = TERM_OFFSET_total_rows 1105 total_rows = TERM_OFFSET_total_rows
1149 top_row = TERM_OFFSET_top_row 1106 top_row = TERM_OFFSET_top_row
1150 CODE: 1107 CODE:
1151 RETVAL = *(int *)((char *)THIS + ix); 1108 RETVAL = *(int *)((char *)THIS + ix);
1152 OUTPUT: 1109 OUTPUT:
1153 RETVAL 1110 RETVAL
1154 1111
… …
1165 { 1122 {
1166 case 0: RETVAL = THIS->ModLevel3Mask; break; 1123 case 0: RETVAL = THIS->ModLevel3Mask; break;
1167 case 1: RETVAL = THIS->ModMetaMask; break; 1124 case 1: RETVAL = THIS->ModMetaMask; break;
1168 case 2: RETVAL = THIS->ModNumLockMask; break; 1125 case 2: RETVAL = THIS->ModNumLockMask; break;
1169 case 3: RETVAL = THIS->current_screen; break; 1126 case 3: RETVAL = THIS->current_screen; break;
1127#ifdef CURSOR_BLINK
1170 case 4: RETVAL = THIS->hidden_cursor; break; 1128 case 4: RETVAL = THIS->hidden_cursor; break;
1129#endif
1171 } 1130 }
1172 OUTPUT: 1131 OUTPUT:
1173 RETVAL 1132 RETVAL
1174 1133
1175char * 1134char *
… …
1185 } 1144 }
1186 OUTPUT: 1145 OUTPUT:
1187 RETVAL 1146 RETVAL
1188 1147
1189SV * 1148SV *
1190rxvt_term::_env () 1149rxvt_term::envv ()
1150 ALIAS:
1151 argv = 1
1191 CODE: 1152 PPCODE:
1192{ 1153{
1193 if (THIS->envv) 1154 stringvec *vec = ix ? THIS->argv : THIS->envv;
1194 {
1195 AV *av = newAV ();
1196 1155
1156 EXTEND (SP, vec->size ());
1157
1197 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1158 for (char **i = vec->begin (); i != vec->end (); ++i)
1198 if (*i) 1159 if (*i)
1199 av_push (av, newSVpv (*i, 0)); 1160 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1200
1201 RETVAL = newRV_noinc ((SV *)av);
1202 }
1203 else
1204 RETVAL = &PL_sv_undef;
1205} 1161}
1206 OUTPUT:
1207 RETVAL
1208 1162
1209int 1163int
1210rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1164rxvt_term::pty_ev_events (int events = ev::UNDEF)
1211 CODE: 1165 CODE:
1212 RETVAL = THIS->pty_ev.events; 1166 RETVAL = THIS->pty_ev.events;
1213 if (events != EVENT_UNDEF) 1167 if (events != ev::UNDEF)
1214 THIS->pty_ev.set (events); 1168 THIS->pty_ev.set (events);
1215 OUTPUT: 1169 OUTPUT:
1216 RETVAL 1170 RETVAL
1217 1171
1218int 1172int
… …
1268 1222
1269void 1223void
1270rxvt_term::focus_out () 1224rxvt_term::focus_out ()
1271 1225
1272void 1226void
1227rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1228 ALIAS:
1229 key_release = 1
1230 CODE:
1231{
1232 XKeyEvent xkey;
1233
1234 memset (&xkey, 0, sizeof (xkey));
1235
1236 xkey.time = time;
1237 xkey.state = state;
1238 xkey.keycode = keycode;
1239
1240 xkey.type = ix ? KeyRelease : KeyPress;
1241 xkey.display = THIS->dpy;
1242 xkey.window = THIS->vt;
1243 xkey.root = THIS->display->root;
1244 xkey.subwindow = THIS->vt;
1245
1246 if (ix)
1247 THIS->key_release (xkey);
1248 else
1249 THIS->key_press (xkey);
1250}
1251
1252void
1273rxvt_term::want_refresh () 1253rxvt_term::want_refresh ()
1274 CODE: 1254 CODE:
1275 THIS->want_refresh = 1; 1255 THIS->want_refresh = 1;
1256 THIS->refresh_check ();
1276 1257
1277void 1258void
1278rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1259rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1279 PPCODE: 1260 PPCODE:
1280{ 1261{
… …
1435SV * 1416SV *
1436rxvt_term::special_decode (SV *text) 1417rxvt_term::special_decode (SV *text)
1437 CODE: 1418 CODE:
1438{ 1419{
1439 wchar_t *wstr = sv2wcs (text); 1420 wchar_t *wstr = sv2wcs (text);
1440 int wlen = wcslen (wstr);
1441 int dlen = 0; 1421 int dlen = 0;
1442 1422
1443 // find length 1423 // find length
1444 for (wchar_t *s = wstr; *s; s++) 1424 for (wchar_t *s = wstr; *s; s++)
1445 if (*s == NOCHAR) 1425 if (*s == NOCHAR)
… …
1468 1448
1469void 1449void
1470rxvt_term::_resource (char *name, int index, SV *newval = 0) 1450rxvt_term::_resource (char *name, int index, SV *newval = 0)
1471 PPCODE: 1451 PPCODE:
1472{ 1452{
1473 struct resval { const char *name; int value; } rslist [] = { 1453 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1474# define def(name) { # name, Rs_ ## name }, 1454# define def(name) { # name, Rs_ ## name },
1475# define reserve(name,count) 1455# define reserve(name,count)
1476# include "rsinc.h" 1456# include "rsinc.h"
1477# undef def 1457# undef def
1478# undef reserve 1458# undef reserve
1479 }; 1459 };
1480 1460
1481 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1461 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1482 1462
1463 if (*name)
1483 do { 1464 {
1465 do {
1484 if (rs-- == rslist) 1466 if (rs-- == rslist)
1485 croak ("no such resource '%s', requested", name); 1467 croak ("no such resource '%s', requested", name);
1486 } while (strcmp (name, rs->name)); 1468 } while (strcmp (name, rs->name));
1487 1469
1488 index += rs->value; 1470 index += rs->value;
1471 }
1472 else
1473 {
1474 --rs;
1475 name = "";
1476 }
1489 1477
1490 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1478 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1491 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1479 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1492 1480
1493 if (GIMME_V != G_VOID) 1481 if (GIMME_V != G_VOID)
… …
1508 1496
1509const char * 1497const char *
1510rxvt_term::x_resource (const char *name) 1498rxvt_term::x_resource (const char *name)
1511 1499
1512bool 1500bool
1513rxvt_term::option (U32 optval, int set = -1) 1501rxvt_term::option (U8 optval, int set = -1)
1514 CODE: 1502 CODE:
1515{ 1503{
1516 RETVAL = THIS->options & optval; 1504 RETVAL = THIS->option (optval);
1517 1505
1518 if (set >= 0) 1506 if (set >= 0)
1519 { 1507 {
1520 if (set)
1521 THIS->options |= optval; 1508 THIS->set_option (optval, set);
1522 else
1523 THIS->options &= ~optval;
1524 1509
1525 if (THIS->check_ev.is_active ()) // avoid doing this before START 1510 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1526 switch (optval) 1511 switch (optval)
1527 { 1512 {
1528 case Opt_skipBuiltinGlyphs: 1513 case Opt_skipBuiltinGlyphs:
1529 THIS->set_fonts (); 1514 THIS->set_fonts ();
1530 THIS->scr_remap_chars (); 1515 THIS->scr_remap_chars ();
1531 THIS->scr_touch (true); 1516 THIS->scr_touch (true);
1532 THIS->want_refresh = 1; 1517 THIS->want_refresh = 1;
1518 THIS->refresh_check ();
1533 break; 1519 break;
1534 1520
1535 case Opt_cursorUnderline: 1521 case Opt_cursorUnderline:
1536 THIS->want_refresh = 1; 1522 THIS->want_refresh = 1;
1523 THIS->refresh_check ();
1537 break; 1524 break;
1538 1525
1539# case Opt_scrollBar_floating: 1526# case Opt_scrollBar_floating:
1540# case Opt_scrollBar_right: 1527# case Opt_scrollBar_right:
1541# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1528# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1574 EXTEND (SP, 2); 1561 EXTEND (SP, 2);
1575 PUSHs (sv_2mortal (newSViv (rc.row))); 1562 PUSHs (sv_2mortal (newSViv (rc.row)));
1576 PUSHs (sv_2mortal (newSViv (rc.col))); 1563 PUSHs (sv_2mortal (newSViv (rc.col)));
1577 } 1564 }
1578 1565
1579 if (items == 3) 1566 if (items >= 3)
1580 { 1567 {
1581 rc.row = SvIV (ST (1)); 1568 rc.row = SvIV (ST (1));
1582 rc.col = SvIV (ST (2)); 1569 rc.col = SvIV (ST (2));
1583 1570
1584 if (ix == 2) 1571 if (ix == 2)
… …
1599 1586
1600 clamp_it (rc.col, 0, THIS->ncol); 1587 clamp_it (rc.col, 0, THIS->ncol);
1601 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1588 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1602 1589
1603 if (ix) 1590 if (ix)
1591 {
1592 THIS->selection.screen = THIS->current_screen;
1593
1604 THIS->want_refresh = 1; 1594 THIS->want_refresh = 1;
1595 THIS->refresh_check ();
1605 } 1596 }
1597 }
1606} 1598}
1607 1599
1608char 1600int
1609rxvt_term::cur_charset () 1601rxvt_term::selection_screen (int screen = -1)
1610 CODE: 1602 CODE:
1611 RETVAL = THIS->charsets [THIS->screen.charset]; 1603 RETVAL = THIS->selection.screen;
1612 OUTPUT: 1604 if (screen >= 0)
1605 THIS->selection.screen = screen;
1606 OUTPUT:
1613 RETVAL 1607 RETVAL
1614 1608
1615void 1609void
1616rxvt_term::selection_clear () 1610rxvt_term::selection_clear (bool clipboard = false)
1617 1611
1618void 1612void
1619rxvt_term::selection_make (Time eventtime, bool rect = false) 1613rxvt_term::selection_make (Time eventtime, bool rect = false)
1620 CODE: 1614 CODE:
1621 THIS->selection.op = SELECTION_CONT; 1615 THIS->selection.op = SELECTION_CONT;
1622 THIS->selection.rect = rect; 1616 THIS->selection.rect = rect;
1623 THIS->selection_make (eventtime); 1617 THIS->selection_make (eventtime);
1624 1618
1625int 1619int
1626rxvt_term::selection_grab (Time eventtime) 1620rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1627 1621
1628void 1622void
1629rxvt_term::selection (SV *newtext = 0) 1623rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1630 PPCODE: 1624 PPCODE:
1631{ 1625{
1626 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1627 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1628
1632 if (GIMME_V != G_VOID) 1629 if (GIMME_V != G_VOID)
1633 XPUSHs (THIS->selection.text 1630 XPUSHs (text
1634 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1631 ? sv_2mortal (wcs2sv (text, len))
1635 : &PL_sv_undef); 1632 : &PL_sv_undef);
1636 1633
1637 if (newtext) 1634 if (newtext)
1638 { 1635 {
1639 free (THIS->selection.text); 1636 free (text);
1640 1637
1641 THIS->selection.text = sv2wcs (newtext); 1638 text = sv2wcs (newtext);
1642 THIS->selection.len = wcslen (THIS->selection.text); 1639 len = wcslen (text);
1643 } 1640 }
1644} 1641}
1642
1643char
1644rxvt_term::cur_charset ()
1645 CODE:
1646 RETVAL = THIS->charsets [THIS->screen.charset];
1647 OUTPUT:
1648 RETVAL
1645 1649
1646void 1650void
1647rxvt_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) 1651rxvt_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)
1648 1652
1649void 1653void
… …
1711void 1715void
1712rxvt_term::XListProperties (Window window) 1716rxvt_term::XListProperties (Window window)
1713 PPCODE: 1717 PPCODE:
1714{ 1718{
1715 int count; 1719 int count;
1716 Atom *props = XListProperties (THIS->display->display, window, &count); 1720 Atom *props = XListProperties (THIS->dpy, window, &count);
1717 1721
1718 EXTEND (SP, count); 1722 EXTEND (SP, count);
1719 while (count--) 1723 while (count--)
1720 PUSHs (newSVuv ((U32)props [count])); 1724 PUSHs (newSVuv ((U32)props [count]));
1721 1725
1722 XFree (props); 1726 XFree (props);
1723} 1727}
1724 1728
1725void 1729void
1726rxvt_term::XGetWindowProperty (Window window, Atom property) 1730rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1730 int format; 1734 int format;
1731 unsigned long nitems; 1735 unsigned long nitems;
1732 unsigned long bytes_after; 1736 unsigned long bytes_after;
1733 unsigned char *prop; 1737 unsigned char *prop;
1734 1738
1735 XGetWindowProperty (THIS->display->display, window, property, 1739 XGetWindowProperty (THIS->dpy, window, property,
1736 0, 1<<24, 0, AnyPropertyType, 1740 0, 1<<24, 0, AnyPropertyType,
1737 &type, &format, &nitems, &bytes_after, &prop); 1741 &type, &format, &nitems, &bytes_after, &prop);
1738 1742
1739 if (type != None) 1743 if (type != None)
1740 { 1744 {
… …
1749 XFree (prop); 1753 XFree (prop);
1750 } 1754 }
1751} 1755}
1752 1756
1753void 1757void
1754rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1758rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1755 CODE: 1759 CODE:
1756{ 1760{
1757 STRLEN len; 1761 STRLEN len;
1758 char *data_ = SvPVbyte (data, len); 1762 char *data_ = SvPVbyte (data, len);
1759 1763
1760 int elemsize = format == 16 ? sizeof (short) 1764 int elemsize = format == 16 ? sizeof (short)
1761 : format == 32 ? sizeof (long) 1765 : format == 32 ? sizeof (long)
1762 : 1; 1766 : 1;
1763 1767
1764 XChangeProperty (THIS->display->display, window, property, 1768 XChangeProperty (THIS->dpy, window, property,
1765 type, format, PropModeReplace, 1769 type, format, PropModeReplace,
1766 (unsigned char *)data_, len / elemsize); 1770 (unsigned char *)data_, len / elemsize);
1767 XSync (THIS->display->display, 0);
1768} 1771}
1769 1772
1770Atom 1773Atom
1771XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1774XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1772 C_ARGS: term->display->display, atom_name, only_if_exists 1775 C_ARGS: term->dpy, atom_name, only_if_exists
1773 1776
1774char * 1777char *
1775XGetAtomName (rxvt_term *term, Atom atom) 1778XGetAtomName (rxvt_term *term, Atom atom)
1776 C_ARGS: term->display->display, atom 1779 C_ARGS: term->dpy, atom
1777 CLEANUP: 1780 CLEANUP:
1778 XFree (RETVAL); 1781 XFree (RETVAL);
1779 1782
1780void 1783void
1781XDeleteProperty (rxvt_term *term, Window window, Atom property) 1784XDeleteProperty (rxvt_term *term, Window window, Atom property)
1782 C_ARGS: term->display->display, window, property 1785 C_ARGS: term->dpy, window, property
1783 1786
1784Window 1787Window
1785rxvt_term::DefaultRootWindow () 1788rxvt_term::DefaultRootWindow ()
1786 CODE: 1789 CODE:
1787 RETVAL = THIS->display->root; 1790 RETVAL = THIS->display->root;
… …
1790 1793
1791#if 0 1794#if 0
1792 1795
1793Window 1796Window
1794XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1797XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1795 C_ARGS: term->display->display, (Window)parent, 1798 C_ARGS: term->dpy, (Window)parent,
1796 x, y, width, height, 0, 1799 x, y, width, height, 0,
1797 term->pix_colors_focused[Color_border], 1800 term->pix_colors_focused[Color_border],
1798 term->pix_colors_focused[Color_border] 1801 term->pix_colors_focused[Color_border]
1799 1802
1800#endif 1803#endif
1801 1804
1802void 1805void
1803XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1806XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1804 C_ARGS: term->display->display, window, parent, x, y 1807 C_ARGS: term->dpy, window, parent, x, y
1805 1808
1806void 1809void
1807XMapWindow (rxvt_term *term, Window window) 1810XMapWindow (rxvt_term *term, Window window)
1808 C_ARGS: term->display->display, window 1811 C_ARGS: term->dpy, window
1809 1812
1810void 1813void
1811XUnmapWindow (rxvt_term *term, Window window) 1814XUnmapWindow (rxvt_term *term, Window window)
1812 C_ARGS: term->display->display, window 1815 C_ARGS: term->dpy, window
1813 1816
1814void 1817void
1815XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1818XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1816 C_ARGS: term->display->display, window, x, y, width, height 1819 C_ARGS: term->dpy, window, x, y, width, height
1817 1820
1818void 1821void
1819rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1822rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1820 CODE: 1823 CODE:
1821{ 1824{
1822 XWindowAttributes attr; 1825 XWindowAttributes attr;
1823 XGetWindowAttributes (THIS->display->display, window, &attr); 1826 XGetWindowAttributes (THIS->dpy, window, &attr);
1824 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1827 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1825} 1828}
1826 1829
1827void 1830void
1828rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1831rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1829 PPCODE: 1832 PPCODE:
1830{ 1833{
1831 int dx, dy; 1834 int dx, dy;
1832 Window child; 1835 Window child;
1833 1836
1834 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1837 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1835 { 1838 {
1836 EXTEND (SP, 3); 1839 EXTEND (SP, 3);
1837 PUSHs (newSViv (dx)); 1840 PUSHs (newSViv (dx));
1838 PUSHs (newSViv (dy)); 1841 PUSHs (newSViv (dy));
1839 PUSHs (newSVuv (child)); 1842 PUSHs (newSVuv (child));
… …
1856overlay::hide () 1859overlay::hide ()
1857 1860
1858void 1861void
1859overlay::DESTROY () 1862overlay::DESTROY ()
1860 1863
1861############################################################################# 1864INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1862# urxvt::watcher
1863#############################################################################
1864 1865
1865MODULE = urxvt PACKAGE = urxvt::watcher
1866
1867CHAINED
1868perl_watcher::cb (SV *cb)
1869 CODE:
1870 THIS->cb (cb);
1871 OUTPUT:
1872 RETVAL
1873
1874#############################################################################
1875# urxvt::timer
1876#############################################################################
1877
1878MODULE = urxvt PACKAGE = urxvt::timer
1879
1880SV *
1881timer::new ()
1882 CODE:
1883 timer *w = new timer;
1884 w->start (NOW);
1885 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1886 w->self = (HV *)SvRV (RETVAL);
1887 OUTPUT:
1888 RETVAL
1889
1890NV
1891timer::at ()
1892 CODE:
1893 RETVAL = THIS->at;
1894 OUTPUT:
1895 RETVAL
1896
1897CHAINED
1898timer::interval (NV interval)
1899 CODE:
1900 THIS->interval = interval;
1901 OUTPUT:
1902 RETVAL
1903
1904CHAINED
1905timer::set (NV tstamp)
1906 CODE:
1907 THIS->set (tstamp);
1908 OUTPUT:
1909 RETVAL
1910
1911CHAINED
1912timer::start (NV tstamp = THIS->at)
1913 CODE:
1914 THIS->start (tstamp);
1915 OUTPUT:
1916 RETVAL
1917
1918CHAINED
1919timer::after (NV delay)
1920 CODE:
1921 THIS->start (NOW + delay);
1922 OUTPUT:
1923 RETVAL
1924
1925CHAINED
1926timer::stop ()
1927 CODE:
1928 THIS->stop ();
1929 OUTPUT:
1930 RETVAL
1931
1932void
1933timer::DESTROY ()
1934
1935#############################################################################
1936# urxvt::iow
1937#############################################################################
1938
1939MODULE = urxvt PACKAGE = urxvt::iow
1940
1941SV *
1942iow::new ()
1943 CODE:
1944 iow *w = new iow;
1945 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1946 w->self = (HV *)SvRV (RETVAL);
1947 OUTPUT:
1948 RETVAL
1949
1950CHAINED
1951iow::fd (int fd)
1952 CODE:
1953 THIS->fd = fd;
1954 OUTPUT:
1955 RETVAL
1956
1957CHAINED
1958iow::events (short events)
1959 CODE:
1960 THIS->events = events;
1961 OUTPUT:
1962 RETVAL
1963
1964CHAINED
1965iow::start ()
1966 CODE:
1967 THIS->start ();
1968 OUTPUT:
1969 RETVAL
1970
1971CHAINED
1972iow::stop ()
1973 CODE:
1974 THIS->stop ();
1975 OUTPUT:
1976 RETVAL
1977
1978void
1979iow::DESTROY ()
1980
1981#############################################################################
1982# urxvt::iw
1983#############################################################################
1984
1985MODULE = urxvt PACKAGE = urxvt::iw
1986
1987SV *
1988iw::new ()
1989 CODE:
1990 iw *w = new iw;
1991 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1992 w->self = (HV *)SvRV (RETVAL);
1993 OUTPUT:
1994 RETVAL
1995
1996CHAINED
1997iw::start ()
1998 CODE:
1999 THIS->start ();
2000 OUTPUT:
2001 RETVAL
2002
2003CHAINED
2004iw::stop ()
2005 CODE:
2006 THIS->stop ();
2007 OUTPUT:
2008 RETVAL
2009
2010void
2011iw::DESTROY ()
2012
2013#############################################################################
2014# urxvt::pw
2015#############################################################################
2016
2017MODULE = urxvt PACKAGE = urxvt::pw
2018
2019SV *
2020pw::new ()
2021 CODE:
2022 pw *w = new pw;
2023 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2024 w->self = (HV *)SvRV (RETVAL);
2025 OUTPUT:
2026 RETVAL
2027
2028CHAINED
2029pw::start (int pid)
2030 CODE:
2031 THIS->start (pid);
2032 OUTPUT:
2033 RETVAL
2034
2035CHAINED
2036pw::stop ()
2037 CODE:
2038 THIS->stop ();
2039 OUTPUT:
2040 RETVAL
2041
2042void
2043pw::DESTROY ()
2044
2045

Diff Legend

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