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.87 by root, Sat Jan 21 08:07:38 2006 UTC vs.
Revision 1.122 by root, Sun Jun 15 14:07:58 2008 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h" 34#include "unistd.h"
35 35
36#include "iom.h" 36#include "ev_cpp.h"
37#include "rxvt.h" 37#include "rxvt.h"
38#include "keyboard.h" 38#include "keyboard.h"
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 44#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 45
50#undef LINENO 46#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 47#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 48#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 49#define ROW(n) THIS->row_buf [LINENO (n)]
54 50
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 51/////////////////////////////////////////////////////////////////////////////
58 52
59static wchar_t * 53static wchar_t *
60sv2wcs (SV *sv) 54sv2wcs (SV *sv)
61{ 55{
… …
75 69
76 return sv; 70 return sv;
77} 71}
78 72
79static SV * 73static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85//TODO: use magic
86static SV *
87newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
88{ 75{
89 HV *hv = newHV (); 76 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 77 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 78 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 100 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 101
115 return (long)mg->mg_ptr; 102 return (long)mg->mg_ptr;
116} 103}
117 104
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 105#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 106#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 107
121///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
122 109
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
125struct perl_watcher
126{
127 SV *cbsv;
128 HV *self;
129
130 perl_watcher ()
131 : cbsv (0)
132 {
133 }
134
135 ~perl_watcher ()
136 {
137 SvREFCNT_dec (cbsv);
138 }
139
140 void cb (SV *cb)
141 {
142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
144 }
145
146 void invoke (const char *type, SV *self, int arg = -1);
147};
148
149void
150perl_watcher::invoke (const char *type, SV *self, int arg)
151{
152 dSP;
153
154 ENTER;
155 SAVETMPS;
156
157 PUSHMARK (SP);
158
159 XPUSHs (sv_2mortal (self));
160
161 if (arg >= 0)
162 XPUSHs (sv_2mortal (newSViv (arg)));
163
164 PUTBACK;
165 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
166 SPAGAIN;
167
168 PUTBACK;
169 FREETMPS;
170 LEAVE;
171
172 if (SvTRUE (ERRSV))
173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
174}
175
176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
178
179struct timer : perl_watcher, time_watcher
180{
181 tstamp interval;
182
183 timer ()
184 : time_watcher (this, &timer::execute)
185 {
186 }
187
188 void execute (time_watcher &w)
189 {
190 if (interval)
191 start (at + interval);
192
193 invoke ("urxvt::timer", newSVtimer (this));
194 }
195};
196
197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
199
200struct iow : perl_watcher, io_watcher
201{
202 iow ()
203 : io_watcher (this, &iow::execute)
204 {
205 }
206
207 void execute (io_watcher &w, short revents)
208 {
209 invoke ("urxvt::iow", newSViow (this), revents);
210 }
211};
212
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
215
216struct iw : perl_watcher, idle_watcher
217{
218 iw ()
219 : idle_watcher (this, &iw::execute)
220 {
221 }
222
223 void execute (idle_watcher &w)
224 {
225 invoke ("urxvt::iw", newSViw (this));
226 }
227};
228
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
231
232struct pw : perl_watcher, child_watcher
233{
234 pw ()
235 : child_watcher (this, &pw::execute)
236 {
237 }
238
239 void execute (child_watcher &w, int status)
240 {
241 invoke ("urxvt::pw", newSVpw (this), status);
242 }
243};
244
245/////////////////////////////////////////////////////////////////////////////
246
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 111
249struct overlay { 112class overlay {
250 HV *self;
251 bool visible;
252 rxvt_term *THIS; 113 rxvt_term *THIS;
114 AV *overlay_av;
253 int x, y, w, h; 115 int x, y, w, h;
254 int border; 116 int border;
255 text_t **text; 117 text_t **text;
256 rend_t **rend; 118 rend_t **rend;
257 119
120public:
121 HV *self;
122
258 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 123 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
259 ~overlay (); 124 ~overlay ();
260 125
261 void show (); 126 void show ();
262 void hide (); 127 void hide ();
… …
265 130
266 void set (int x, int y, SV *str, SV *rend); 131 void set (int x, int y, SV *str, SV *rend);
267}; 132};
268 133
269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 134overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
270: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false) 135: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
271{ 136{
137 if (w < 0) w = 0;
138 if (h < 0) h = 0;
139
272 if (border == 2) 140 if (border == 2)
273 { 141 {
274 w += 2; 142 w += 2;
275 h += 2; 143 h += 2;
276 } 144 }
… …
314 *rp++ = r; 182 *rp++ = r;
315 } 183 }
316 } 184 }
317 185
318 show (); 186 show ();
319 THIS->want_refresh = 1;
320} 187}
321 188
322overlay::~overlay () 189overlay::~overlay ()
323{ 190{
324 hide (); 191 hide ();
… …
329 delete [] rend[y]; 196 delete [] rend[y];
330 } 197 }
331 198
332 delete [] text; 199 delete [] text;
333 delete [] rend; 200 delete [] rend;
201}
202
203void
204overlay::show ()
205{
206 if (overlay_av)
207 return;
208
209 overlay_av = (AV *)SvREFCNT_inc (SvRV (
210 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
211 ));
212 av_push (overlay_av, newSViv ((long)this));
334 213
335 THIS->want_refresh = 1; 214 THIS->want_refresh = 1;
215 THIS->refresh_check ();
336} 216}
337 217
338void 218void
339overlay::show () 219overlay::hide ()
340{ 220{
341 if (visible) 221 if (!overlay_av)
342 return; 222 return;
343 223
344 visible = true;
345
346 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
347 av_push (av, newSViv ((long)this));
348}
349
350void
351overlay::hide ()
352{
353 if (!visible)
354 return;
355
356 visible = false;
357
358 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
359
360 int i; 224 int i;
361 225
362 for (i = AvFILL (av); i >= 0; i--) 226 for (i = AvFILL (overlay_av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this) 227 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364 {
365 av_delete (av, i, G_DISCARD);
366 break; 228 break;
367 }
368 229
369 for (; i < AvFILL (av); i++) 230 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 231 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 232
372 av_pop (av); 233 av_pop (overlay_av);
234
235 SvREFCNT_dec (overlay_av);
236 overlay_av = 0;
237
238 THIS->want_refresh = 1;
239 THIS->refresh_check ();
373} 240}
374 241
375void overlay::swap () 242void overlay::swap ()
376{ 243{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 244 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
422 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 289 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
423 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 290 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
424 } 291 }
425 292
426 THIS->want_refresh = 1; 293 THIS->want_refresh = 1;
294 THIS->refresh_check ();
427} 295}
428 296
297/////////////////////////////////////////////////////////////////////////////
298
299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
301#include "iom_perl.h"
429 302
430///////////////////////////////////////////////////////////////////////////// 303/////////////////////////////////////////////////////////////////////////////
431 304
432struct rxvt_perl_interp rxvt_perl; 305struct rxvt_perl_interp rxvt_perl;
433 306
… …
492static void 365static void
493ungrab (rxvt_term *THIS) 366ungrab (rxvt_term *THIS)
494{ 367{
495 if (THIS->perl.grabtime) 368 if (THIS->perl.grabtime)
496 { 369 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 370 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 371 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 372 THIS->perl.grabtime = 0;
500 } 373 }
501} 374}
502 375
503bool 376bool
… …
508 381
509 // pre-handling of some events 382 // pre-handling of some events
510 if (htype == HOOK_REFRESH_END) 383 if (htype == HOOK_REFRESH_END)
511 { 384 {
512 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 385 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
513 386
514 for (int i = 0; i <= AvFILL (av); i++) 387 for (int i = 0; i <= AvFILL (av); i++)
515 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 388 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
516 } 389 }
517 390
518 swap (perl_environ, environ); 391 swap (perl_environ, environ);
… …
554 break; 427 break;
555 428
556 case DT_STR_LEN: 429 case DT_STR_LEN:
557 { 430 {
558 char *str = va_arg (ap, char *); 431 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 432 int len = va_arg (ap, int);
560 433
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 434 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 435 }
563 break; 436 break;
564 437
565 case DT_WCS_LEN: 438 case DT_WCS_LEN:
566 { 439 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 440 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 441 int wlen = va_arg (ap, int);
569 442
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 443 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
444 }
445 break;
446
447 case DT_LCS_LEN:
448 {
449 long *lstr = va_arg (ap, long *);
450 int llen = va_arg (ap, int);
451
452 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 453 }
572 break; 454 break;
573 455
574 case DT_XEVENT: 456 case DT_XEVENT:
575 { 457 {
576 XEvent *xe = va_arg (ap, XEvent *); 458 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 459 HV *hv = newHV ();
578 460
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 461# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
580# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 462# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
581# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 463# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 464# undef set
583 465
584 setiv (type, xe->type); 466 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 467 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 468 setiv (serial, xe->xany.serial);
587 469
… …
708 590
709 // post-handling of some events 591 // post-handling of some events
710 if (htype == HOOK_REFRESH_BEGIN) 592 if (htype == HOOK_REFRESH_BEGIN)
711 { 593 {
712 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 594 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
713 595
714 for (int i = AvFILL (av); i >= 0; i--) 596 for (int i = AvFILL (av); i >= 0; i--)
715 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 597 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
716 } 598 }
717 else if (htype == HOOK_DESTROY) 599 else if (htype == HOOK_DESTROY)
718 { 600 {
719 clearSVptr ((SV *)term->perl.self); 601 clearSVptr ((SV *)term->perl.self);
720 SvREFCNT_dec ((SV *)term->perl.self); 602 SvREFCNT_dec ((SV *)term->perl.self);
603
604 // don't allow further calls
605 term->perl.self = 0;
721 } 606 }
722 607
723 swap (perl_environ, environ); 608 swap (perl_environ, environ);
724 609
725 return event_consumed; 610 return event_consumed;
… …
749# include "optinc.h" 634# include "optinc.h"
750# undef nodef 635# undef nodef
751# undef def 636# undef def
752 637
753 HV *stash = gv_stashpv ("urxvt", 1); 638 HV *stash = gv_stashpv ("urxvt", 1);
754 struct { 639 static const struct {
755 const char *name; 640 const char *name;
756 IV iv; 641 IV iv;
757 } *civ, const_iv[] = { 642 } *civ, const_iv[] = {
758# define const_iv(name) { # name, (IV)name } 643# define const_iv(name) { # name, (IV)name }
759 const_iv (DEFAULT_RSTYLE), 644 const_iv (DEFAULT_RSTYLE),
… …
778 const_iv (Button3Mask), 663 const_iv (Button3Mask),
779 const_iv (Button4Mask), 664 const_iv (Button4Mask),
780 const_iv (Button5Mask), 665 const_iv (Button5Mask),
781 const_iv (AnyModifier), 666 const_iv (AnyModifier),
782 667
783 const_iv (EVENT_NONE), 668 const_iv (NoSymbol),
784 const_iv (EVENT_READ), 669 const_iv (GrabModeSync),
785 const_iv (EVENT_WRITE), 670 const_iv (GrabModeAsync),
786 671
787 const_iv (NoEventMask), 672 const_iv (NoEventMask),
788 const_iv (KeyPressMask), 673 const_iv (KeyPressMask),
789 const_iv (KeyReleaseMask), 674 const_iv (KeyReleaseMask),
790 const_iv (ButtonPressMask), 675 const_iv (ButtonPressMask),
… …
842 const_iv (SelectionRequest), 727 const_iv (SelectionRequest),
843 const_iv (SelectionNotify), 728 const_iv (SelectionNotify),
844 const_iv (ColormapNotify), 729 const_iv (ColormapNotify),
845 const_iv (ClientMessage), 730 const_iv (ClientMessage),
846 const_iv (MappingNotify), 731 const_iv (MappingNotify),
732# if ENABLE_XIM_ONTHESPOT
733 const_iv (XIMReverse),
734 const_iv (XIMUnderline),
735 const_iv (XIMHighlight),
736 const_iv (XIMPrimary),
737 const_iv (XIMSecondary),
738 const_iv (XIMTertiary),
739 const_iv (XIMVisibleToForward),
740 const_iv (XIMVisibleToBackword),
741 const_iv (XIMVisibleToCenter),
742# if 0
743 const_iv (XIMForwardChar),
744 const_iv (XIMBackwardChar),
745 const_iv (XIMForwardWord),
746 const_iv (XIMBackwardWord),
747 const_iv (XIMCaretUp),
748 const_iv (XIMCaretDown),
749 const_iv (XIMNextLine),
750 const_iv (XIMPreviousLine),
751 const_iv (XIMLineStart),
752 const_iv (XIMLineEnd),
753 const_iv (XIMAbsolutePosition),
754 const_iv (XIMDontChange),
755# endif
756# endif
847 }; 757 };
848 758
849 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 759 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
850 civ-- > const_iv; )
851 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 760 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
852} 761}
853 762
854void 763void
855warn (const char *msg) 764warn (const char *msg)
… …
865_exit (int status) 774_exit (int status)
866 775
867NV 776NV
868NOW () 777NOW ()
869 CODE: 778 CODE:
870 RETVAL = NOW; 779 RETVAL = ev::now ();
871 OUTPUT: 780 OUTPUT:
872 RETVAL 781 RETVAL
873 782
874int 783int
875GET_BASEFG (int rend) 784GET_BASEFG (int rend)
… …
886 RETVAL 795 RETVAL
887 796
888int 797int
889SET_FGCOLOR (int rend, int new_color) 798SET_FGCOLOR (int rend, int new_color)
890 CODE: 799 CODE:
891 RETVAL = SET_FGCOLOR (rend, new_color); 800 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
892 OUTPUT: 801 OUTPUT:
893 RETVAL 802 RETVAL
894 803
895int 804int
896SET_BGCOLOR (int rend, int new_color) 805SET_BGCOLOR (int rend, int new_color)
897 CODE: 806 CODE:
898 RETVAL = SET_BGCOLOR (rend, new_color); 807 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
899 OUTPUT: 808 OUTPUT:
900 RETVAL 809 RETVAL
901 810
902int 811int
903GET_CUSTOM (int rend) 812GET_CUSTOM (int rend)
904 CODE: 813 CODE:
905 RETVAL = (rend && RS_customMask) >> RS_customShift; 814 RETVAL = (rend & RS_customMask) >> RS_customShift;
906 OUTPUT: 815 OUTPUT:
907 RETVAL 816 RETVAL
908 817
909int 818int
910SET_CUSTOM (int rend, int new_value) 819SET_CUSTOM (int rend, int new_value)
… …
917 | ((new_value << RS_customShift) & RS_customMask); 826 | ((new_value << RS_customShift) & RS_customMask);
918} 827}
919 OUTPUT: 828 OUTPUT:
920 RETVAL 829 RETVAL
921 830
831void
832termlist ()
833 PPCODE:
834{
835 EXTEND (SP, rxvt_term::termlist.size ());
836
837 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
838 if ((*t)->perl.self)
839 PUSHs (sv_2mortal (newSVterm (*t)));
840}
841
922MODULE = urxvt PACKAGE = urxvt::term 842MODULE = urxvt PACKAGE = urxvt::term
923 843
924SV * 844SV *
925_new (...) 845_new (AV *env, AV *arg)
926 CODE: 846 CODE:
927{ 847{
928 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
929 croak ("first argument to urxvt::term->_new must be arrayref");
930
931 rxvt_term *term = new rxvt_term; 848 rxvt_term *term = new rxvt_term;
932 849
933 term->argv = new stringvec; 850 stringvec *argv = new stringvec;
934 term->envv = new stringvec; 851 stringvec *envv = new stringvec;
935 852
936 for (int i = 1; i < items; i++) 853 for (int i = 0; i <= AvFILL (arg); i++)
937 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 854 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
938 855
939 AV *envv = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (envv) + 1; i--; ) 856 for (int i = AvFILL (env) + 1; i--; )
941 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 857 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 858
943 term->envv->push_back (0); 859 envv->push_back (0);
944
945 bool success;
946 860
947 try 861 try
948 { 862 {
949 success = term->init (term->argv->size (), term->argv->begin ()); 863 term->init (argv, envv);
950 } 864 }
951 catch (const class rxvt_failure_exception &e) 865 catch (const class rxvt_failure_exception &e)
952 {
953 success = false;
954 }
955
956 if (!success)
957 { 866 {
958 term->destroy (); 867 term->destroy ();
959 croak ("error while initializing new terminal instance"); 868 croak ("error while initializing new terminal instance");
960 } 869 }
961 870
… …
971void 880void
972rxvt_term::set_should_invoke (int htype, int inc) 881rxvt_term::set_should_invoke (int htype, int inc)
973 CODE: 882 CODE:
974 THIS->perl.should_invoke [htype] += inc; 883 THIS->perl.should_invoke [htype] += inc;
975 884
976void 885int
977rxvt_term::grab_button (int button, U32 modifiers) 886rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
978 CODE: 887 CODE:
979 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 888 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
980 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 889 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
981 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 890 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
891 OUTPUT: RETVAL
892
893int
894rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
895 CODE:
896 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
897 OUTPUT: RETVAL
898
899void
900rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
901 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
902 CODE:
903 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
904
905void
906rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
907 CODE:
908 XUngrabKey (THIS->dpy, keycode, modifiers, window);
909
910void
911rxvt_term::XUngrabKeyboard (Time eventtime)
912 CODE:
913 XUngrabKeyboard (THIS->dpy, eventtime);
982 914
983bool 915bool
984rxvt_term::grab (Time eventtime, int sync = 0) 916rxvt_term::grab (Time eventtime, int sync = 0)
985 CODE: 917 CODE:
986{ 918{
987 int mode = sync ? GrabModeSync : GrabModeAsync; 919 int mode = sync ? GrabModeSync : GrabModeAsync;
988 920
989 THIS->perl.grabtime = 0; 921 THIS->perl.grabtime = 0;
990 922
991 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 923 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
992 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 924 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
993 mode, mode, None, GRAB_CURSOR, eventtime)) 925 mode, mode, None, GRAB_CURSOR, eventtime))
994 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 926 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
995 THIS->perl.grabtime = eventtime; 927 THIS->perl.grabtime = eventtime;
996 else 928 else
997 XUngrabPointer (THIS->display->display, eventtime); 929 XUngrabPointer (THIS->dpy, eventtime);
998 930
999 RETVAL = !!THIS->perl.grabtime; 931 RETVAL = !!THIS->perl.grabtime;
1000} 932}
1001 OUTPUT: 933 OUTPUT:
1002 RETVAL 934 RETVAL
1003 935
1004void 936void
1005rxvt_term::allow_events_async () 937rxvt_term::allow_events_async ()
1006 CODE: 938 CODE:
1007 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 939 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1008 940
1009void 941void
1010rxvt_term::allow_events_sync () 942rxvt_term::allow_events_sync ()
1011 CODE: 943 CODE:
1012 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 944 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1013 945
1014void 946void
1015rxvt_term::allow_events_replay () 947rxvt_term::allow_events_replay ()
1016 CODE: 948 CODE:
1017 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 949 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1018 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 950 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1019 951
1020void 952void
1021rxvt_term::ungrab () 953rxvt_term::ungrab ()
1022 CODE: 954 CODE:
1023 ungrab (THIS); 955 ungrab (THIS);
956
957int
958rxvt_term::XStringToKeysym (char *string)
959 CODE:
960 RETVAL = XStringToKeysym (string);
961 OUTPUT: RETVAL
962
963char *
964rxvt_term::XKeysymToString (int sym)
965 CODE:
966 RETVAL = XKeysymToString (sym);
967 OUTPUT: RETVAL
968
969int
970rxvt_term::XKeysymToKeycode (int sym)
971 CODE:
972 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
973 OUTPUT: RETVAL
974
975int
976rxvt_term::XKeycodeToKeysym (int code, int index)
977 CODE:
978 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
979 OUTPUT: RETVAL
1024 980
1025int 981int
1026rxvt_term::strwidth (SV *str) 982rxvt_term::strwidth (SV *str)
1027 CODE: 983 CODE:
1028{ 984{
1029 wchar_t *wstr = sv2wcs (str); 985 wchar_t *wstr = sv2wcs (str);
1030 986
1031 rxvt_push_locale (THIS->locale); 987 rxvt_push_locale (THIS->locale);
1032 RETVAL = wcswidth (wstr, wcslen (wstr)); 988 RETVAL = 0;
989 for (wchar_t *wc = wstr; *wc; wc++)
990 {
991 int w = WCWIDTH (*wc);
992
993 if (w)
994 RETVAL += max (w, 1);
995 }
1033 rxvt_pop_locale (); 996 rxvt_pop_locale ();
1034 997
1035 free (wstr); 998 free (wstr);
1036} 999}
1037 OUTPUT: 1000 OUTPUT:
… …
1067 rxvt_pop_locale (); 1030 rxvt_pop_locale ();
1068 1031
1069 RETVAL = wcs2sv (wstr); 1032 RETVAL = wcs2sv (wstr);
1070 free (wstr); 1033 free (wstr);
1071} 1034}
1035 OUTPUT:
1036 RETVAL
1037
1038char *
1039rxvt_term::locale ()
1040 CODE:
1041 RETVAL = THIS->locale;
1072 OUTPUT: 1042 OUTPUT:
1073 RETVAL 1043 RETVAL
1074 1044
1075#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1045#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1076 1046
… …
1146 } 1116 }
1147 OUTPUT: 1117 OUTPUT:
1148 RETVAL 1118 RETVAL
1149 1119
1150SV * 1120SV *
1151rxvt_term::_env () 1121rxvt_term::envv ()
1122 ALIAS:
1123 argv = 1
1152 CODE: 1124 PPCODE:
1153{ 1125{
1154 if (THIS->envv) 1126 stringvec *vec = ix ? THIS->argv : THIS->envv;
1155 {
1156 AV *av = newAV ();
1157 1127
1128 EXTEND (SP, vec->size ());
1129
1158 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1130 for (char **i = vec->begin (); i != vec->end (); ++i)
1159 if (*i) 1131 if (*i)
1160 av_push (av, newSVpv (*i, 0)); 1132 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1161
1162 RETVAL = newRV_noinc ((SV *)av);
1163 }
1164 else
1165 RETVAL = &PL_sv_undef;
1166} 1133}
1167 OUTPUT:
1168 RETVAL
1169 1134
1170int 1135int
1171rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1136rxvt_term::pty_ev_events (int events = ev::UNDEF)
1172 CODE: 1137 CODE:
1173 RETVAL = THIS->pty_ev.events; 1138 RETVAL = THIS->pty_ev.events;
1174 if (events != EVENT_UNDEF) 1139 if (events != ev::UNDEF)
1175 THIS->pty_ev.set (events); 1140 THIS->pty_ev.set (events);
1141 OUTPUT:
1142 RETVAL
1143
1144int
1145rxvt_term::pty_fd ()
1146 CODE:
1147 RETVAL = THIS->pty->pty;
1176 OUTPUT: 1148 OUTPUT:
1177 RETVAL 1149 RETVAL
1178 1150
1179Window 1151Window
1180rxvt_term::parent () 1152rxvt_term::parent ()
… …
1222 1194
1223void 1195void
1224rxvt_term::focus_out () 1196rxvt_term::focus_out ()
1225 1197
1226void 1198void
1199rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1200 ALIAS:
1201 key_release = 1
1202 CODE:
1203{
1204 XKeyEvent xkey;
1205
1206 memset (&xkey, 0, sizeof (xkey));
1207
1208 xkey.time = time;
1209 xkey.state = state;
1210 xkey.keycode = keycode;
1211
1212 xkey.type = ix ? KeyRelease : KeyPress;
1213 xkey.display = THIS->dpy;
1214 xkey.window = THIS->vt;
1215 xkey.root = THIS->display->root;
1216 xkey.subwindow = THIS->vt;
1217
1218 if (ix)
1219 THIS->key_release (xkey);
1220 else
1221 THIS->key_press (xkey);
1222}
1223
1224void
1227rxvt_term::want_refresh () 1225rxvt_term::want_refresh ()
1228 CODE: 1226 CODE:
1229 THIS->want_refresh = 1; 1227 THIS->want_refresh = 1;
1228 THIS->refresh_check ();
1230 1229
1231void 1230void
1232rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1231rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1233 PPCODE: 1232 PPCODE:
1234{ 1233{
… …
1237 1236
1238 line_t &l = ROW(row_number); 1237 line_t &l = ROW(row_number);
1239 1238
1240 if (GIMME_V != G_VOID) 1239 if (GIMME_V != G_VOID)
1241 { 1240 {
1242 wchar_t *wstr = new wchar_t [THIS->ncol]; 1241 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1243 1242
1244 for (int col = 0; col < THIS->ncol; col++) 1243 for (int col = 0; col < THIS->ncol; col++)
1245 wstr [col] = l.t [col]; 1244 wstr [col] = l.t [col];
1246 1245
1247 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1246 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1248
1249 delete [] wstr;
1250 } 1247 }
1251 1248
1252 if (new_text) 1249 if (new_text)
1253 { 1250 {
1254 wchar_t *wstr = sv2wcs (new_text); 1251 wchar_t *wstr = sv2wcs (new_text);
… …
1347rxvt_term::special_encode (SV *string) 1344rxvt_term::special_encode (SV *string)
1348 CODE: 1345 CODE:
1349{ 1346{
1350 wchar_t *wstr = sv2wcs (string); 1347 wchar_t *wstr = sv2wcs (string);
1351 int wlen = wcslen (wstr); 1348 int wlen = wcslen (wstr);
1352 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1349 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1353 1350
1354 rxvt_push_locale (THIS->locale); 1351 rxvt_push_locale (THIS->locale);
1355 1352
1356 wchar_t *r = rstr; 1353 wchar_t *r = rstr;
1357 for (wchar_t *s = wstr; *s; s++) 1354 for (wchar_t *s = wstr; *s; s++)
1355 {
1356 int w = WCWIDTH (*s);
1357
1358 if (wcwidth (*s) == 0) 1358 if (w == 0)
1359 { 1359 {
1360 if (r == rstr) 1360 if (r == rstr)
1361 croak ("leading combining character unencodable"); 1361 croak ("leading combining character unencodable");
1362 1362
1363 unicode_t n = rxvt_compose (r[-1], *s); 1363 unicode_t n = rxvt_compose (r[-1], *s);
1364 if (n == NOCHAR) 1364 if (n == NOCHAR)
1365 n = rxvt_composite.compose (r[-1], *s); 1365 n = rxvt_composite.compose (r[-1], *s);
1366 1366
1367 r[-1] = n; 1367 r[-1] = n;
1368 } 1368 }
1369#if !UNICODE_3 1369#if !UNICODE_3
1370 else if (*s >= 0x10000) 1370 else if (*s >= 0x10000)
1371 *r++ = rxvt_composite.compose (*s); 1371 *r++ = rxvt_composite.compose (*s);
1372#endif 1372#endif
1373 else 1373 else
1374 *r++ = *s; 1374 *r++ = *s;
1375
1376 // the *2 above only allows wcwidth <= 2
1377 if (w > 1)
1378 *r++ = NOCHAR;
1379 }
1375 1380
1376 rxvt_pop_locale (); 1381 rxvt_pop_locale ();
1377 1382
1378 RETVAL = wcs2sv (rstr, r - rstr); 1383 RETVAL = wcs2sv (rstr, r - rstr);
1379
1380 delete [] rstr;
1381} 1384}
1382 OUTPUT: 1385 OUTPUT:
1383 RETVAL 1386 RETVAL
1384 1387
1385SV * 1388SV *
1386rxvt_term::special_decode (SV *text) 1389rxvt_term::special_decode (SV *text)
1387 CODE: 1390 CODE:
1388{ 1391{
1389 wchar_t *wstr = sv2wcs (text); 1392 wchar_t *wstr = sv2wcs (text);
1390 int wlen = wcslen (wstr);
1391 int dlen = 0; 1393 int dlen = 0;
1392 1394
1393 // find length 1395 // find length
1394 for (wchar_t *s = wstr; *s; s++) 1396 for (wchar_t *s = wstr; *s; s++)
1395 if (*s == NOCHAR) 1397 if (*s == NOCHAR)
… …
1397 else if (IS_COMPOSE (*s)) 1399 else if (IS_COMPOSE (*s))
1398 dlen += rxvt_composite.expand (*s, 0); 1400 dlen += rxvt_composite.expand (*s, 0);
1399 else 1401 else
1400 dlen++; 1402 dlen++;
1401 1403
1402 wchar_t *rstr = new wchar_t [dlen]; 1404 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1403 1405
1404 // decode 1406 // decode
1405 wchar_t *r = rstr; 1407 wchar_t *r = rstr;
1406 for (wchar_t *s = wstr; *s; s++) 1408 for (wchar_t *s = wstr; *s; s++)
1407 if (*s == NOCHAR) 1409 if (*s == NOCHAR)
… …
1410 r += rxvt_composite.expand (*s, r); 1412 r += rxvt_composite.expand (*s, r);
1411 else 1413 else
1412 *r++ = *s; 1414 *r++ = *s;
1413 1415
1414 RETVAL = wcs2sv (rstr, r - rstr); 1416 RETVAL = wcs2sv (rstr, r - rstr);
1415
1416 delete [] rstr;
1417} 1417}
1418 OUTPUT: 1418 OUTPUT:
1419 RETVAL 1419 RETVAL
1420 1420
1421void 1421void
1422rxvt_term::_resource (char *name, int index, SV *newval = 0) 1422rxvt_term::_resource (char *name, int index, SV *newval = 0)
1423 PPCODE: 1423 PPCODE:
1424{ 1424{
1425 struct resval { const char *name; int value; } rslist [] = { 1425 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1426# define def(name) { # name, Rs_ ## name }, 1426# define def(name) { # name, Rs_ ## name },
1427# define reserve(name,count) 1427# define reserve(name,count)
1428# include "rsinc.h" 1428# include "rsinc.h"
1429# undef def 1429# undef def
1430# undef reserve 1430# undef reserve
1431 }; 1431 };
1432 1432
1433 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1433 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1434 1434
1435 do { 1435 do {
1436 if (rs-- == rslist) 1436 if (rs-- == rslist)
1437 croak ("no such resource '%s', requested", name); 1437 croak ("no such resource '%s', requested", name);
1438 } while (strcmp (name, rs->name)); 1438 } while (strcmp (name, rs->name));
… …
1460 1460
1461const char * 1461const char *
1462rxvt_term::x_resource (const char *name) 1462rxvt_term::x_resource (const char *name)
1463 1463
1464bool 1464bool
1465rxvt_term::option (U32 optval, int set = -1) 1465rxvt_term::option (U8 optval, int set = -1)
1466 CODE: 1466 CODE:
1467{ 1467{
1468 RETVAL = THIS->options & optval; 1468 RETVAL = THIS->option (optval);
1469 1469
1470 if (set >= 0) 1470 if (set >= 0)
1471 { 1471 {
1472 if (set)
1473 THIS->options |= optval; 1472 THIS->set_option (optval, set);
1474 else
1475 THIS->options &= ~optval;
1476 1473
1477 if (THIS->check_ev.is_active ()) // avoid doing this before START 1474 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1478 switch (optval) 1475 switch (optval)
1479 { 1476 {
1480 case Opt_skipBuiltinGlyphs: 1477 case Opt_skipBuiltinGlyphs:
1481 THIS->set_fonts (); 1478 THIS->set_fonts ();
1482 THIS->scr_remap_chars (); 1479 THIS->scr_remap_chars ();
1483 THIS->scr_touch (true); 1480 THIS->scr_touch (true);
1484 THIS->want_refresh = 1; 1481 THIS->want_refresh = 1;
1482 THIS->refresh_check ();
1485 break; 1483 break;
1486 1484
1487 case Opt_cursorUnderline: 1485 case Opt_cursorUnderline:
1488 THIS->want_refresh = 1; 1486 THIS->want_refresh = 1;
1487 THIS->refresh_check ();
1489 break; 1488 break;
1490 1489
1491# case Opt_scrollBar_floating: 1490# case Opt_scrollBar_floating:
1492# case Opt_scrollBar_right: 1491# case Opt_scrollBar_right:
1493# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1492# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1531 if (items == 3) 1530 if (items == 3)
1532 { 1531 {
1533 rc.row = SvIV (ST (1)); 1532 rc.row = SvIV (ST (1));
1534 rc.col = SvIV (ST (2)); 1533 rc.col = SvIV (ST (2));
1535 1534
1536 if (ix == 2 && rc.col == 0) 1535 if (ix == 2)
1537 { 1536 {
1537 if (rc.col == 0)
1538 {
1539 // col == 0 means end of previous line
1538 rc.row--; 1540 rc.row--;
1539 rc.col = THIS->ncol; 1541 rc.col = THIS->ncol;
1542 }
1543 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1544 && rc.col > ROW(rc.row).l)
1545 {
1546 // col >= length means while line and add newline
1547 rc.col = THIS->ncol;
1548 }
1540 } 1549 }
1541 1550
1542 clamp_it (rc.col, 0, THIS->ncol); 1551 clamp_it (rc.col, 0, THIS->ncol);
1543 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1552 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1544 1553
1545 if (ix) 1554 if (ix)
1555 {
1546 THIS->want_refresh = 1; 1556 THIS->want_refresh = 1;
1557 THIS->refresh_check ();
1558 }
1547 } 1559 }
1548} 1560}
1549 1561
1550char 1562char
1551rxvt_term::cur_charset () 1563rxvt_term::cur_charset ()
1552 CODE: 1564 CODE:
1553 RETVAL = THIS->charsets [THIS->screen.charset]; 1565 RETVAL = THIS->charsets [THIS->screen.charset];
1554 OUTPUT: 1566 OUTPUT:
1555 RETVAL 1567 RETVAL
1556 1568
1557#void 1569void
1558#rxvt_term::selection_clear () 1570rxvt_term::selection_clear ()
1559 1571
1560void 1572void
1561rxvt_term::selection_make (Time eventtime, bool rect = false) 1573rxvt_term::selection_make (Time eventtime, bool rect = false)
1562 CODE: 1574 CODE:
1563 THIS->selection.op = SELECTION_CONT; 1575 THIS->selection.op = SELECTION_CONT;
… …
1653void 1665void
1654rxvt_term::XListProperties (Window window) 1666rxvt_term::XListProperties (Window window)
1655 PPCODE: 1667 PPCODE:
1656{ 1668{
1657 int count; 1669 int count;
1658 Atom *props = XListProperties (THIS->display->display, window, &count); 1670 Atom *props = XListProperties (THIS->dpy, window, &count);
1659 1671
1660 EXTEND (SP, count); 1672 EXTEND (SP, count);
1661 while (count--) 1673 while (count--)
1662 PUSHs (newSVuv ((U32)props [count])); 1674 PUSHs (newSVuv ((U32)props [count]));
1663 1675
1664 XFree (props); 1676 XFree (props);
1665} 1677}
1666 1678
1667void 1679void
1668rxvt_term::XGetWindowProperty (Window window, Atom property) 1680rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1672 int format; 1684 int format;
1673 unsigned long nitems; 1685 unsigned long nitems;
1674 unsigned long bytes_after; 1686 unsigned long bytes_after;
1675 unsigned char *prop; 1687 unsigned char *prop;
1676 1688
1677 XGetWindowProperty (THIS->display->display, window, property, 1689 XGetWindowProperty (THIS->dpy, window, property,
1678 0, 1<<24, 0, AnyPropertyType, 1690 0, 1<<24, 0, AnyPropertyType,
1679 &type, &format, &nitems, &bytes_after, &prop); 1691 &type, &format, &nitems, &bytes_after, &prop);
1680 1692
1681 if (type != None) 1693 if (type != None)
1682 { 1694 {
… …
1691 XFree (prop); 1703 XFree (prop);
1692 } 1704 }
1693} 1705}
1694 1706
1695void 1707void
1696rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1708rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1697 CODE: 1709 CODE:
1698{ 1710{
1699 STRLEN len; 1711 STRLEN len;
1700 char *data_ = SvPVbyte (data, len); 1712 char *data_ = SvPVbyte (data, len);
1701 1713
1702 int elemsize = format == 16 ? sizeof (short) 1714 int elemsize = format == 16 ? sizeof (short)
1703 : format == 32 ? sizeof (long) 1715 : format == 32 ? sizeof (long)
1704 : 1; 1716 : 1;
1705 1717
1706 XChangeProperty (THIS->display->display, window, property, 1718 XChangeProperty (THIS->dpy, window, property,
1707 type, format, PropModeReplace, 1719 type, format, PropModeReplace,
1708 (unsigned char *)data_, len / elemsize); 1720 (unsigned char *)data_, len / elemsize);
1709 XSync (THIS->display->display, 0);
1710} 1721}
1711 1722
1712Atom 1723Atom
1713XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1724XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1714 C_ARGS: term->display->display, atom_name, only_if_exists 1725 C_ARGS: term->dpy, atom_name, only_if_exists
1715 1726
1716char * 1727char *
1717XGetAtomName (rxvt_term *term, Atom atom) 1728XGetAtomName (rxvt_term *term, Atom atom)
1718 C_ARGS: term->display->display, atom 1729 C_ARGS: term->dpy, atom
1719 CLEANUP: 1730 CLEANUP:
1720 XFree (RETVAL); 1731 XFree (RETVAL);
1721 1732
1722void 1733void
1723XDeleteProperty (rxvt_term *term, Window window, Atom property) 1734XDeleteProperty (rxvt_term *term, Window window, Atom property)
1724 C_ARGS: term->display->display, window, property 1735 C_ARGS: term->dpy, window, property
1725 1736
1726Window 1737Window
1727rxvt_term::DefaultRootWindow () 1738rxvt_term::DefaultRootWindow ()
1728 CODE: 1739 CODE:
1729 RETVAL = THIS->display->root; 1740 RETVAL = THIS->display->root;
… …
1732 1743
1733#if 0 1744#if 0
1734 1745
1735Window 1746Window
1736XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1747XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1737 C_ARGS: term->display->display, (Window)parent, 1748 C_ARGS: term->dpy, (Window)parent,
1738 x, y, width, height, 0, 1749 x, y, width, height, 0,
1739 term->pix_colors_focused[Color_border], 1750 term->pix_colors_focused[Color_border],
1740 term->pix_colors_focused[Color_border] 1751 term->pix_colors_focused[Color_border]
1741 1752
1742#endif 1753#endif
1743 1754
1744void 1755void
1745XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1756XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1746 C_ARGS: term->display->display, window, parent, x, y 1757 C_ARGS: term->dpy, window, parent, x, y
1747 1758
1748void 1759void
1749XMapWindow (rxvt_term *term, Window window) 1760XMapWindow (rxvt_term *term, Window window)
1750 C_ARGS: term->display->display, window 1761 C_ARGS: term->dpy, window
1751 1762
1752void 1763void
1753XUnmapWindow (rxvt_term *term, Window window) 1764XUnmapWindow (rxvt_term *term, Window window)
1754 C_ARGS: term->display->display, window 1765 C_ARGS: term->dpy, window
1755 1766
1756void 1767void
1757XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1768XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1758 C_ARGS: term->display->display, window, x, y, width, height 1769 C_ARGS: term->dpy, window, x, y, width, height
1759 1770
1760void 1771void
1761rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1772rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1762 CODE: 1773 CODE:
1763{ 1774{
1764 XWindowAttributes attr; 1775 XWindowAttributes attr;
1765 XGetWindowAttributes (THIS->display->display, window, &attr); 1776 XGetWindowAttributes (THIS->dpy, window, &attr);
1766 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1777 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1767} 1778}
1768 1779
1769void 1780void
1770rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1781rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1771 PPCODE: 1782 PPCODE:
1772{ 1783{
1773 int dx, dy; 1784 int dx, dy;
1774 Window child; 1785 Window child;
1775 1786
1776 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1787 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1777 { 1788 {
1778 EXTEND (SP, 3); 1789 EXTEND (SP, 3);
1779 PUSHs (newSViv (dx)); 1790 PUSHs (newSViv (dx));
1780 PUSHs (newSViv (dy)); 1791 PUSHs (newSViv (dy));
1781 PUSHs (newSVuv (child)); 1792 PUSHs (newSVuv (child));
… …
1798overlay::hide () 1809overlay::hide ()
1799 1810
1800void 1811void
1801overlay::DESTROY () 1812overlay::DESTROY ()
1802 1813
1803############################################################################# 1814INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1804# urxvt::watcher
1805#############################################################################
1806 1815
1807MODULE = urxvt PACKAGE = urxvt::watcher
1808
1809CHAINED
1810perl_watcher::cb (SV *cb)
1811 CODE:
1812 THIS->cb (cb);
1813 OUTPUT:
1814 RETVAL
1815
1816#############################################################################
1817# urxvt::timer
1818#############################################################################
1819
1820MODULE = urxvt PACKAGE = urxvt::timer
1821
1822SV *
1823timer::new ()
1824 CODE:
1825 timer *w = new timer;
1826 w->start (NOW);
1827 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1828 w->self = (HV *)SvRV (RETVAL);
1829 OUTPUT:
1830 RETVAL
1831
1832NV
1833timer::at ()
1834 CODE:
1835 RETVAL = THIS->at;
1836 OUTPUT:
1837 RETVAL
1838
1839CHAINED
1840timer::interval (NV interval)
1841 CODE:
1842 THIS->interval = interval;
1843 OUTPUT:
1844 RETVAL
1845
1846CHAINED
1847timer::set (NV tstamp)
1848 CODE:
1849 THIS->set (tstamp);
1850 OUTPUT:
1851 RETVAL
1852
1853CHAINED
1854timer::start (NV tstamp = THIS->at)
1855 CODE:
1856 THIS->start (tstamp);
1857 OUTPUT:
1858 RETVAL
1859
1860CHAINED
1861timer::after (NV delay)
1862 CODE:
1863 THIS->start (NOW + delay);
1864 OUTPUT:
1865 RETVAL
1866
1867CHAINED
1868timer::stop ()
1869 CODE:
1870 THIS->stop ();
1871 OUTPUT:
1872 RETVAL
1873
1874void
1875timer::DESTROY ()
1876
1877#############################################################################
1878# urxvt::iow
1879#############################################################################
1880
1881MODULE = urxvt PACKAGE = urxvt::iow
1882
1883SV *
1884iow::new ()
1885 CODE:
1886 iow *w = new iow;
1887 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1888 w->self = (HV *)SvRV (RETVAL);
1889 OUTPUT:
1890 RETVAL
1891
1892CHAINED
1893iow::fd (int fd)
1894 CODE:
1895 THIS->fd = fd;
1896 OUTPUT:
1897 RETVAL
1898
1899CHAINED
1900iow::events (short events)
1901 CODE:
1902 THIS->events = events;
1903 OUTPUT:
1904 RETVAL
1905
1906CHAINED
1907iow::start ()
1908 CODE:
1909 THIS->start ();
1910 OUTPUT:
1911 RETVAL
1912
1913CHAINED
1914iow::stop ()
1915 CODE:
1916 THIS->stop ();
1917 OUTPUT:
1918 RETVAL
1919
1920void
1921iow::DESTROY ()
1922
1923#############################################################################
1924# urxvt::iw
1925#############################################################################
1926
1927MODULE = urxvt PACKAGE = urxvt::iw
1928
1929SV *
1930iw::new ()
1931 CODE:
1932 iw *w = new iw;
1933 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1934 w->self = (HV *)SvRV (RETVAL);
1935 OUTPUT:
1936 RETVAL
1937
1938CHAINED
1939iw::start ()
1940 CODE:
1941 THIS->start ();
1942 OUTPUT:
1943 RETVAL
1944
1945CHAINED
1946iw::stop ()
1947 CODE:
1948 THIS->stop ();
1949 OUTPUT:
1950 RETVAL
1951
1952void
1953iw::DESTROY ()
1954
1955#############################################################################
1956# urxvt::pw
1957#############################################################################
1958
1959MODULE = urxvt PACKAGE = urxvt::pw
1960
1961SV *
1962pw::new ()
1963 CODE:
1964 pw *w = new pw;
1965 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1966 w->self = (HV *)SvRV (RETVAL);
1967 OUTPUT:
1968 RETVAL
1969
1970CHAINED
1971pw::start (int pid)
1972 CODE:
1973 THIS->start (pid);
1974 OUTPUT:
1975 RETVAL
1976
1977CHAINED
1978pw::stop ()
1979 CODE:
1980 THIS->stop ();
1981 OUTPUT:
1982 RETVAL
1983
1984void
1985pw::DESTROY ()
1986
1987

Diff Legend

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