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.86 by root, Fri Jan 20 22:49:34 2006 UTC vs.
Revision 1.124 by root, Thu Jul 31 03:24:08 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 }
644 const_iv (NUM_RESOURCES),
759 const_iv (DEFAULT_RSTYLE), 645 const_iv (DEFAULT_RSTYLE),
760 const_iv (OVERLAY_RSTYLE), 646 const_iv (OVERLAY_RSTYLE),
761 const_iv (RS_Bold), 647 const_iv (RS_Bold),
762 const_iv (RS_Italic), 648 const_iv (RS_Italic),
763 const_iv (RS_Blink), 649 const_iv (RS_Blink),
… …
778 const_iv (Button3Mask), 664 const_iv (Button3Mask),
779 const_iv (Button4Mask), 665 const_iv (Button4Mask),
780 const_iv (Button5Mask), 666 const_iv (Button5Mask),
781 const_iv (AnyModifier), 667 const_iv (AnyModifier),
782 668
783 const_iv (EVENT_NONE), 669 const_iv (NoSymbol),
784 const_iv (EVENT_READ), 670 const_iv (GrabModeSync),
785 const_iv (EVENT_WRITE), 671 const_iv (GrabModeAsync),
786 672
787 const_iv (NoEventMask), 673 const_iv (NoEventMask),
788 const_iv (KeyPressMask), 674 const_iv (KeyPressMask),
789 const_iv (KeyReleaseMask), 675 const_iv (KeyReleaseMask),
790 const_iv (ButtonPressMask), 676 const_iv (ButtonPressMask),
… …
842 const_iv (SelectionRequest), 728 const_iv (SelectionRequest),
843 const_iv (SelectionNotify), 729 const_iv (SelectionNotify),
844 const_iv (ColormapNotify), 730 const_iv (ColormapNotify),
845 const_iv (ClientMessage), 731 const_iv (ClientMessage),
846 const_iv (MappingNotify), 732 const_iv (MappingNotify),
733# if ENABLE_XIM_ONTHESPOT
734 const_iv (XIMReverse),
735 const_iv (XIMUnderline),
736 const_iv (XIMHighlight),
737 const_iv (XIMPrimary),
738 const_iv (XIMSecondary),
739 const_iv (XIMTertiary),
740 const_iv (XIMVisibleToForward),
741 const_iv (XIMVisibleToBackword),
742 const_iv (XIMVisibleToCenter),
743# if 0
744 const_iv (XIMForwardChar),
745 const_iv (XIMBackwardChar),
746 const_iv (XIMForwardWord),
747 const_iv (XIMBackwardWord),
748 const_iv (XIMCaretUp),
749 const_iv (XIMCaretDown),
750 const_iv (XIMNextLine),
751 const_iv (XIMPreviousLine),
752 const_iv (XIMLineStart),
753 const_iv (XIMLineEnd),
754 const_iv (XIMAbsolutePosition),
755 const_iv (XIMDontChange),
756# endif
757# endif
847 }; 758 };
848 759
849 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 760 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)); 761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
852} 762}
853 763
854void 764void
855warn (const char *msg) 765warn (const char *msg)
… …
865_exit (int status) 775_exit (int status)
866 776
867NV 777NV
868NOW () 778NOW ()
869 CODE: 779 CODE:
870 RETVAL = NOW; 780 RETVAL = ev::now ();
871 OUTPUT: 781 OUTPUT:
872 RETVAL 782 RETVAL
873 783
874int 784int
875GET_BASEFG (int rend) 785GET_BASEFG (int rend)
… …
886 RETVAL 796 RETVAL
887 797
888int 798int
889SET_FGCOLOR (int rend, int new_color) 799SET_FGCOLOR (int rend, int new_color)
890 CODE: 800 CODE:
891 RETVAL = SET_FGCOLOR (rend, new_color); 801 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
892 OUTPUT: 802 OUTPUT:
893 RETVAL 803 RETVAL
894 804
895int 805int
896SET_BGCOLOR (int rend, int new_color) 806SET_BGCOLOR (int rend, int new_color)
897 CODE: 807 CODE:
898 RETVAL = SET_BGCOLOR (rend, new_color); 808 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
899 OUTPUT: 809 OUTPUT:
900 RETVAL 810 RETVAL
901 811
902int 812int
903GET_CUSTOM (int rend) 813GET_CUSTOM (int rend)
904 CODE: 814 CODE:
905 RETVAL = (rend && RS_customMask) >> RS_customShift; 815 RETVAL = (rend & RS_customMask) >> RS_customShift;
906 OUTPUT: 816 OUTPUT:
907 RETVAL 817 RETVAL
908 818
909int 819int
910SET_CUSTOM (int rend, int new_value) 820SET_CUSTOM (int rend, int new_value)
… …
917 | ((new_value << RS_customShift) & RS_customMask); 827 | ((new_value << RS_customShift) & RS_customMask);
918} 828}
919 OUTPUT: 829 OUTPUT:
920 RETVAL 830 RETVAL
921 831
832void
833termlist ()
834 PPCODE:
835{
836 EXTEND (SP, rxvt_term::termlist.size ());
837
838 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
839 if ((*t)->perl.self)
840 PUSHs (sv_2mortal (newSVterm (*t)));
841}
842
922MODULE = urxvt PACKAGE = urxvt::term 843MODULE = urxvt PACKAGE = urxvt::term
923 844
924SV * 845SV *
925_new (...) 846_new (AV *env, AV *arg)
926 CODE: 847 CODE:
927{ 848{
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; 849 rxvt_term *term = new rxvt_term;
932 850
933 term->argv = new stringvec; 851 stringvec *argv = new stringvec;
934 term->envv = new stringvec; 852 stringvec *envv = new stringvec;
935 853
936 for (int i = 1; i < items; i++) 854 for (int i = 0; i <= AvFILL (arg); i++)
937 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 855 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
938 856
939 AV *envv = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (envv) + 1; i--; ) 857 for (int i = AvFILL (env) + 1; i--; )
941 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 859
943 term->envv->push_back (0); 860 envv->push_back (0);
944
945 bool success;
946 861
947 try 862 try
948 { 863 {
949 success = term->init (term->argv->size (), term->argv->begin ()); 864 term->init (argv, envv);
950 } 865 }
951 catch (const class rxvt_failure_exception &e) 866 catch (const class rxvt_failure_exception &e)
952 {
953 success = false;
954 }
955
956 if (!success)
957 { 867 {
958 term->destroy (); 868 term->destroy ();
959 croak ("error while initializing new terminal instance"); 869 croak ("error while initializing new terminal instance");
960 } 870 }
961 871
… …
971void 881void
972rxvt_term::set_should_invoke (int htype, int inc) 882rxvt_term::set_should_invoke (int htype, int inc)
973 CODE: 883 CODE:
974 THIS->perl.should_invoke [htype] += inc; 884 THIS->perl.should_invoke [htype] += inc;
975 885
976void 886int
977rxvt_term::grab_button (int button, U32 modifiers) 887rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
978 CODE: 888 CODE:
979 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 889 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
980 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 890 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
981 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 891 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
892 OUTPUT: RETVAL
893
894int
895rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
896 CODE:
897 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
898 OUTPUT: RETVAL
899
900void
901rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
902 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
903 CODE:
904 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
905
906void
907rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
908 CODE:
909 XUngrabKey (THIS->dpy, keycode, modifiers, window);
910
911void
912rxvt_term::XUngrabKeyboard (Time eventtime)
913 CODE:
914 XUngrabKeyboard (THIS->dpy, eventtime);
982 915
983bool 916bool
984rxvt_term::grab (Time eventtime, int sync = 0) 917rxvt_term::grab (Time eventtime, int sync = 0)
985 CODE: 918 CODE:
986{ 919{
987 int mode = sync ? GrabModeSync : GrabModeAsync; 920 int mode = sync ? GrabModeSync : GrabModeAsync;
988 921
989 THIS->perl.grabtime = 0; 922 THIS->perl.grabtime = 0;
990 923
991 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 924 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
992 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 925 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
993 mode, mode, None, GRAB_CURSOR, eventtime)) 926 mode, mode, None, GRAB_CURSOR, eventtime))
994 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 927 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
995 THIS->perl.grabtime = eventtime; 928 THIS->perl.grabtime = eventtime;
996 else 929 else
997 XUngrabPointer (THIS->display->display, eventtime); 930 XUngrabPointer (THIS->dpy, eventtime);
998 931
999 RETVAL = !!THIS->perl.grabtime; 932 RETVAL = !!THIS->perl.grabtime;
1000} 933}
1001 OUTPUT: 934 OUTPUT:
1002 RETVAL 935 RETVAL
1003 936
1004void 937void
1005rxvt_term::allow_events_async () 938rxvt_term::allow_events_async ()
1006 CODE: 939 CODE:
1007 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 940 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1008 941
1009void 942void
1010rxvt_term::allow_events_sync () 943rxvt_term::allow_events_sync ()
1011 CODE: 944 CODE:
1012 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 945 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1013 946
1014void 947void
1015rxvt_term::allow_events_replay () 948rxvt_term::allow_events_replay ()
1016 CODE: 949 CODE:
1017 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 950 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1018 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 951 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1019 952
1020void 953void
1021rxvt_term::ungrab () 954rxvt_term::ungrab ()
1022 CODE: 955 CODE:
1023 ungrab (THIS); 956 ungrab (THIS);
957
958int
959rxvt_term::XStringToKeysym (char *string)
960 CODE:
961 RETVAL = XStringToKeysym (string);
962 OUTPUT: RETVAL
963
964char *
965rxvt_term::XKeysymToString (int sym)
966 CODE:
967 RETVAL = XKeysymToString (sym);
968 OUTPUT: RETVAL
969
970int
971rxvt_term::XKeysymToKeycode (int sym)
972 CODE:
973 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
974 OUTPUT: RETVAL
975
976int
977rxvt_term::XKeycodeToKeysym (int code, int index)
978 CODE:
979 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
980 OUTPUT: RETVAL
1024 981
1025int 982int
1026rxvt_term::strwidth (SV *str) 983rxvt_term::strwidth (SV *str)
1027 CODE: 984 CODE:
1028{ 985{
1029 wchar_t *wstr = sv2wcs (str); 986 wchar_t *wstr = sv2wcs (str);
1030 987
1031 rxvt_push_locale (THIS->locale); 988 rxvt_push_locale (THIS->locale);
1032 RETVAL = wcswidth (wstr, wcslen (wstr)); 989 RETVAL = 0;
990 for (wchar_t *wc = wstr; *wc; wc++)
991 {
992 int w = WCWIDTH (*wc);
993
994 if (w)
995 RETVAL += max (w, 1);
996 }
1033 rxvt_pop_locale (); 997 rxvt_pop_locale ();
1034 998
1035 free (wstr); 999 free (wstr);
1036} 1000}
1037 OUTPUT: 1001 OUTPUT:
… …
1067 rxvt_pop_locale (); 1031 rxvt_pop_locale ();
1068 1032
1069 RETVAL = wcs2sv (wstr); 1033 RETVAL = wcs2sv (wstr);
1070 free (wstr); 1034 free (wstr);
1071} 1035}
1036 OUTPUT:
1037 RETVAL
1038
1039char *
1040rxvt_term::locale ()
1041 CODE:
1042 RETVAL = THIS->locale;
1072 OUTPUT: 1043 OUTPUT:
1073 RETVAL 1044 RETVAL
1074 1045
1075#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1046#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1076 1047
… …
1118 ALIAS: 1089 ALIAS:
1119 ModLevel3Mask = 0 1090 ModLevel3Mask = 0
1120 ModMetaMask = 1 1091 ModMetaMask = 1
1121 ModNumLockMask = 2 1092 ModNumLockMask = 2
1122 current_screen = 3 1093 current_screen = 3
1094 hidden_cursor = 4
1123 CODE: 1095 CODE:
1124 switch (ix) 1096 switch (ix)
1125 { 1097 {
1126 case 0: RETVAL = THIS->ModLevel3Mask; break; 1098 case 0: RETVAL = THIS->ModLevel3Mask; break;
1127 case 1: RETVAL = THIS->ModMetaMask; break; 1099 case 1: RETVAL = THIS->ModMetaMask; break;
1128 case 2: RETVAL = THIS->ModNumLockMask; break; 1100 case 2: RETVAL = THIS->ModNumLockMask; break;
1129 case 3: RETVAL = THIS->current_screen; break; 1101 case 3: RETVAL = THIS->current_screen; break;
1102#ifdef CURSOR_BLINK
1103 case 4: RETVAL = THIS->hidden_cursor; break;
1104#endif
1130 } 1105 }
1131 OUTPUT: 1106 OUTPUT:
1132 RETVAL 1107 RETVAL
1133 1108
1134char * 1109char *
… …
1144 } 1119 }
1145 OUTPUT: 1120 OUTPUT:
1146 RETVAL 1121 RETVAL
1147 1122
1148SV * 1123SV *
1149rxvt_term::_env () 1124rxvt_term::envv ()
1125 ALIAS:
1126 argv = 1
1150 CODE: 1127 PPCODE:
1151{ 1128{
1152 if (THIS->envv) 1129 stringvec *vec = ix ? THIS->argv : THIS->envv;
1153 {
1154 AV *av = newAV ();
1155 1130
1131 EXTEND (SP, vec->size ());
1132
1156 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1133 for (char **i = vec->begin (); i != vec->end (); ++i)
1157 if (*i) 1134 if (*i)
1158 av_push (av, newSVpv (*i, 0)); 1135 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1159
1160 RETVAL = newRV_noinc ((SV *)av);
1161 }
1162 else
1163 RETVAL = &PL_sv_undef;
1164} 1136}
1165 OUTPUT:
1166 RETVAL
1167 1137
1168int 1138int
1169rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1139rxvt_term::pty_ev_events (int events = ev::UNDEF)
1170 CODE: 1140 CODE:
1171 RETVAL = THIS->pty_ev.events; 1141 RETVAL = THIS->pty_ev.events;
1172 if (events != EVENT_UNDEF) 1142 if (events != ev::UNDEF)
1173 THIS->pty_ev.set (events); 1143 THIS->pty_ev.set (events);
1144 OUTPUT:
1145 RETVAL
1146
1147int
1148rxvt_term::pty_fd ()
1149 CODE:
1150 RETVAL = THIS->pty->pty;
1174 OUTPUT: 1151 OUTPUT:
1175 RETVAL 1152 RETVAL
1176 1153
1177Window 1154Window
1178rxvt_term::parent () 1155rxvt_term::parent ()
… …
1220 1197
1221void 1198void
1222rxvt_term::focus_out () 1199rxvt_term::focus_out ()
1223 1200
1224void 1201void
1202rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1203 ALIAS:
1204 key_release = 1
1205 CODE:
1206{
1207 XKeyEvent xkey;
1208
1209 memset (&xkey, 0, sizeof (xkey));
1210
1211 xkey.time = time;
1212 xkey.state = state;
1213 xkey.keycode = keycode;
1214
1215 xkey.type = ix ? KeyRelease : KeyPress;
1216 xkey.display = THIS->dpy;
1217 xkey.window = THIS->vt;
1218 xkey.root = THIS->display->root;
1219 xkey.subwindow = THIS->vt;
1220
1221 if (ix)
1222 THIS->key_release (xkey);
1223 else
1224 THIS->key_press (xkey);
1225}
1226
1227void
1225rxvt_term::want_refresh () 1228rxvt_term::want_refresh ()
1226 CODE: 1229 CODE:
1227 THIS->want_refresh = 1; 1230 THIS->want_refresh = 1;
1231 THIS->refresh_check ();
1228 1232
1229void 1233void
1230rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1234rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1231 PPCODE: 1235 PPCODE:
1232{ 1236{
… …
1235 1239
1236 line_t &l = ROW(row_number); 1240 line_t &l = ROW(row_number);
1237 1241
1238 if (GIMME_V != G_VOID) 1242 if (GIMME_V != G_VOID)
1239 { 1243 {
1240 wchar_t *wstr = new wchar_t [THIS->ncol]; 1244 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1241 1245
1242 for (int col = 0; col < THIS->ncol; col++) 1246 for (int col = 0; col < THIS->ncol; col++)
1243 wstr [col] = l.t [col]; 1247 wstr [col] = l.t [col];
1244 1248
1245 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1249 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1246
1247 delete [] wstr;
1248 } 1250 }
1249 1251
1250 if (new_text) 1252 if (new_text)
1251 { 1253 {
1252 wchar_t *wstr = sv2wcs (new_text); 1254 wchar_t *wstr = sv2wcs (new_text);
… …
1345rxvt_term::special_encode (SV *string) 1347rxvt_term::special_encode (SV *string)
1346 CODE: 1348 CODE:
1347{ 1349{
1348 wchar_t *wstr = sv2wcs (string); 1350 wchar_t *wstr = sv2wcs (string);
1349 int wlen = wcslen (wstr); 1351 int wlen = wcslen (wstr);
1350 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1352 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1351 1353
1352 rxvt_push_locale (THIS->locale); 1354 rxvt_push_locale (THIS->locale);
1353 1355
1354 wchar_t *r = rstr; 1356 wchar_t *r = rstr;
1355 for (wchar_t *s = wstr; *s; s++) 1357 for (wchar_t *s = wstr; *s; s++)
1358 {
1359 int w = WCWIDTH (*s);
1360
1356 if (wcwidth (*s) == 0) 1361 if (w == 0)
1357 { 1362 {
1358 if (r == rstr) 1363 if (r == rstr)
1359 croak ("leading combining character unencodable"); 1364 croak ("leading combining character unencodable");
1360 1365
1361 unicode_t n = rxvt_compose (r[-1], *s); 1366 unicode_t n = rxvt_compose (r[-1], *s);
1362 if (n == NOCHAR) 1367 if (n == NOCHAR)
1363 n = rxvt_composite.compose (r[-1], *s); 1368 n = rxvt_composite.compose (r[-1], *s);
1364 1369
1365 r[-1] = n; 1370 r[-1] = n;
1366 } 1371 }
1367#if !UNICODE_3 1372#if !UNICODE_3
1368 else if (*s >= 0x10000) 1373 else if (*s >= 0x10000)
1369 *r++ = rxvt_composite.compose (*s); 1374 *r++ = rxvt_composite.compose (*s);
1370#endif 1375#endif
1371 else 1376 else
1372 *r++ = *s; 1377 *r++ = *s;
1378
1379 // the *2 above only allows wcwidth <= 2
1380 if (w > 1)
1381 *r++ = NOCHAR;
1382 }
1373 1383
1374 rxvt_pop_locale (); 1384 rxvt_pop_locale ();
1375 1385
1376 RETVAL = wcs2sv (rstr, r - rstr); 1386 RETVAL = wcs2sv (rstr, r - rstr);
1377
1378 delete [] rstr;
1379} 1387}
1380 OUTPUT: 1388 OUTPUT:
1381 RETVAL 1389 RETVAL
1382 1390
1383SV * 1391SV *
1384rxvt_term::special_decode (SV *text) 1392rxvt_term::special_decode (SV *text)
1385 CODE: 1393 CODE:
1386{ 1394{
1387 wchar_t *wstr = sv2wcs (text); 1395 wchar_t *wstr = sv2wcs (text);
1388 int wlen = wcslen (wstr);
1389 int dlen = 0; 1396 int dlen = 0;
1390 1397
1391 // find length 1398 // find length
1392 for (wchar_t *s = wstr; *s; s++) 1399 for (wchar_t *s = wstr; *s; s++)
1393 if (*s == NOCHAR) 1400 if (*s == NOCHAR)
… …
1395 else if (IS_COMPOSE (*s)) 1402 else if (IS_COMPOSE (*s))
1396 dlen += rxvt_composite.expand (*s, 0); 1403 dlen += rxvt_composite.expand (*s, 0);
1397 else 1404 else
1398 dlen++; 1405 dlen++;
1399 1406
1400 wchar_t *rstr = new wchar_t [dlen]; 1407 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1401 1408
1402 // decode 1409 // decode
1403 wchar_t *r = rstr; 1410 wchar_t *r = rstr;
1404 for (wchar_t *s = wstr; *s; s++) 1411 for (wchar_t *s = wstr; *s; s++)
1405 if (*s == NOCHAR) 1412 if (*s == NOCHAR)
… …
1408 r += rxvt_composite.expand (*s, r); 1415 r += rxvt_composite.expand (*s, r);
1409 else 1416 else
1410 *r++ = *s; 1417 *r++ = *s;
1411 1418
1412 RETVAL = wcs2sv (rstr, r - rstr); 1419 RETVAL = wcs2sv (rstr, r - rstr);
1413
1414 delete [] rstr;
1415} 1420}
1416 OUTPUT: 1421 OUTPUT:
1417 RETVAL 1422 RETVAL
1418 1423
1419void 1424void
1420rxvt_term::_resource (char *name, int index, SV *newval = 0) 1425rxvt_term::_resource (char *name, int index, SV *newval = 0)
1421 PPCODE: 1426 PPCODE:
1422{ 1427{
1423 struct resval { const char *name; int value; } rslist [] = { 1428 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1424# define def(name) { # name, Rs_ ## name }, 1429# define def(name) { # name, Rs_ ## name },
1425# define reserve(name,count) 1430# define reserve(name,count)
1426# include "rsinc.h" 1431# include "rsinc.h"
1427# undef def 1432# undef def
1428# undef reserve 1433# undef reserve
1429 }; 1434 };
1430 1435
1431 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1436 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1432 1437
1438 if (*name)
1433 do { 1439 {
1440 do {
1434 if (rs-- == rslist) 1441 if (rs-- == rslist)
1435 croak ("no such resource '%s', requested", name); 1442 croak ("no such resource '%s', requested", name);
1436 } while (strcmp (name, rs->name)); 1443 } while (strcmp (name, rs->name));
1437 1444
1438 index += rs->value; 1445 index += rs->value;
1446 }
1447 else
1448 {
1449 --rs;
1450 name = "";
1451 }
1439 1452
1440 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1453 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1441 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1454 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1442 1455
1443 if (GIMME_V != G_VOID) 1456 if (GIMME_V != G_VOID)
… …
1458 1471
1459const char * 1472const char *
1460rxvt_term::x_resource (const char *name) 1473rxvt_term::x_resource (const char *name)
1461 1474
1462bool 1475bool
1463rxvt_term::option (U32 optval, int set = -1) 1476rxvt_term::option (U8 optval, int set = -1)
1464 CODE: 1477 CODE:
1465{ 1478{
1466 RETVAL = THIS->options & optval; 1479 RETVAL = THIS->option (optval);
1467 1480
1468 if (set >= 0) 1481 if (set >= 0)
1469 { 1482 {
1470 if (set)
1471 THIS->options |= optval; 1483 THIS->set_option (optval, set);
1472 else
1473 THIS->options &= ~optval;
1474 1484
1475 if (THIS->check_ev.is_active ()) // avoid doing this before START 1485 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1476 switch (optval) 1486 switch (optval)
1477 { 1487 {
1478 case Opt_skipBuiltinGlyphs: 1488 case Opt_skipBuiltinGlyphs:
1479 THIS->set_fonts (); 1489 THIS->set_fonts ();
1480 THIS->scr_remap_chars (); 1490 THIS->scr_remap_chars ();
1481 THIS->scr_touch (true); 1491 THIS->scr_touch (true);
1482 THIS->want_refresh = 1; 1492 THIS->want_refresh = 1;
1493 THIS->refresh_check ();
1483 break; 1494 break;
1484 1495
1485 case Opt_cursorUnderline: 1496 case Opt_cursorUnderline:
1486 THIS->want_refresh = 1; 1497 THIS->want_refresh = 1;
1498 THIS->refresh_check ();
1487 break; 1499 break;
1488 1500
1489# case Opt_scrollBar_floating: 1501# case Opt_scrollBar_floating:
1490# case Opt_scrollBar_right: 1502# case Opt_scrollBar_right:
1491# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1503# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1529 if (items == 3) 1541 if (items == 3)
1530 { 1542 {
1531 rc.row = SvIV (ST (1)); 1543 rc.row = SvIV (ST (1));
1532 rc.col = SvIV (ST (2)); 1544 rc.col = SvIV (ST (2));
1533 1545
1534 if (ix == 2 && rc.col == 0) 1546 if (ix == 2)
1535 { 1547 {
1548 if (rc.col == 0)
1549 {
1550 // col == 0 means end of previous line
1536 rc.row--; 1551 rc.row--;
1537 rc.col = THIS->ncol; 1552 rc.col = THIS->ncol;
1553 }
1554 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1555 && rc.col > ROW(rc.row).l)
1556 {
1557 // col >= length means while line and add newline
1558 rc.col = THIS->ncol;
1559 }
1538 } 1560 }
1539 1561
1540 clamp_it (rc.col, 0, THIS->ncol); 1562 clamp_it (rc.col, 0, THIS->ncol);
1541 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1563 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1542 1564
1543 if (ix) 1565 if (ix)
1566 {
1544 THIS->want_refresh = 1; 1567 THIS->want_refresh = 1;
1568 THIS->refresh_check ();
1569 }
1545 } 1570 }
1546} 1571}
1547 1572
1548char 1573char
1549rxvt_term::cur_charset () 1574rxvt_term::cur_charset ()
1550 CODE: 1575 CODE:
1551 RETVAL = THIS->charsets [THIS->screen.charset]; 1576 RETVAL = THIS->charsets [THIS->screen.charset];
1552 OUTPUT: 1577 OUTPUT:
1553 RETVAL 1578 RETVAL
1554 1579
1555#void 1580void
1556#rxvt_term::selection_clear () 1581rxvt_term::selection_clear ()
1557 1582
1558void 1583void
1559rxvt_term::selection_make (Time eventtime, bool rect = false) 1584rxvt_term::selection_make (Time eventtime, bool rect = false)
1560 CODE: 1585 CODE:
1561 THIS->selection.op = SELECTION_CONT; 1586 THIS->selection.op = SELECTION_CONT;
… …
1651void 1676void
1652rxvt_term::XListProperties (Window window) 1677rxvt_term::XListProperties (Window window)
1653 PPCODE: 1678 PPCODE:
1654{ 1679{
1655 int count; 1680 int count;
1656 Atom *props = XListProperties (THIS->display->display, window, &count); 1681 Atom *props = XListProperties (THIS->dpy, window, &count);
1657 1682
1658 EXTEND (SP, count); 1683 EXTEND (SP, count);
1659 while (count--) 1684 while (count--)
1660 PUSHs (newSVuv ((U32)props [count])); 1685 PUSHs (newSVuv ((U32)props [count]));
1661 1686
1662 XFree (props); 1687 XFree (props);
1663} 1688}
1664 1689
1665void 1690void
1666rxvt_term::XGetWindowProperty (Window window, Atom property) 1691rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1670 int format; 1695 int format;
1671 unsigned long nitems; 1696 unsigned long nitems;
1672 unsigned long bytes_after; 1697 unsigned long bytes_after;
1673 unsigned char *prop; 1698 unsigned char *prop;
1674 1699
1675 XGetWindowProperty (THIS->display->display, window, property, 1700 XGetWindowProperty (THIS->dpy, window, property,
1676 0, 1<<24, 0, AnyPropertyType, 1701 0, 1<<24, 0, AnyPropertyType,
1677 &type, &format, &nitems, &bytes_after, &prop); 1702 &type, &format, &nitems, &bytes_after, &prop);
1678 1703
1679 if (type != None) 1704 if (type != None)
1680 { 1705 {
… …
1689 XFree (prop); 1714 XFree (prop);
1690 } 1715 }
1691} 1716}
1692 1717
1693void 1718void
1694rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1719rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1695 CODE: 1720 CODE:
1696{ 1721{
1697 STRLEN len; 1722 STRLEN len;
1698 char *data_ = SvPVbyte (data, len); 1723 char *data_ = SvPVbyte (data, len);
1699 1724
1700 int elemsize = format == 16 ? sizeof (short) 1725 int elemsize = format == 16 ? sizeof (short)
1701 : format == 32 ? sizeof (long) 1726 : format == 32 ? sizeof (long)
1702 : 1; 1727 : 1;
1703 1728
1704 XChangeProperty (THIS->display->display, window, property, 1729 XChangeProperty (THIS->dpy, window, property,
1705 type, format, PropModeReplace, 1730 type, format, PropModeReplace,
1706 (unsigned char *)data_, len / elemsize); 1731 (unsigned char *)data_, len / elemsize);
1707 XSync (THIS->display->display, 0);
1708} 1732}
1709 1733
1710Atom 1734Atom
1711XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1735XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1712 C_ARGS: term->display->display, atom_name, only_if_exists 1736 C_ARGS: term->dpy, atom_name, only_if_exists
1713 1737
1714char * 1738char *
1715XGetAtomName (rxvt_term *term, Atom atom) 1739XGetAtomName (rxvt_term *term, Atom atom)
1716 C_ARGS: term->display->display, atom 1740 C_ARGS: term->dpy, atom
1717 CLEANUP: 1741 CLEANUP:
1718 XFree (RETVAL); 1742 XFree (RETVAL);
1719 1743
1720void 1744void
1721XDeleteProperty (rxvt_term *term, Window window, Atom property) 1745XDeleteProperty (rxvt_term *term, Window window, Atom property)
1722 C_ARGS: term->display->display, window, property 1746 C_ARGS: term->dpy, window, property
1723 1747
1724Window 1748Window
1725rxvt_term::DefaultRootWindow () 1749rxvt_term::DefaultRootWindow ()
1726 CODE: 1750 CODE:
1727 RETVAL = THIS->display->root; 1751 RETVAL = THIS->display->root;
… …
1730 1754
1731#if 0 1755#if 0
1732 1756
1733Window 1757Window
1734XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1758XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1735 C_ARGS: term->display->display, (Window)parent, 1759 C_ARGS: term->dpy, (Window)parent,
1736 x, y, width, height, 0, 1760 x, y, width, height, 0,
1737 term->pix_colors_focused[Color_border], 1761 term->pix_colors_focused[Color_border],
1738 term->pix_colors_focused[Color_border] 1762 term->pix_colors_focused[Color_border]
1739 1763
1740#endif 1764#endif
1741 1765
1742void 1766void
1743XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1767XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1744 C_ARGS: term->display->display, window, parent, x, y 1768 C_ARGS: term->dpy, window, parent, x, y
1745 1769
1746void 1770void
1747XMapWindow (rxvt_term *term, Window window) 1771XMapWindow (rxvt_term *term, Window window)
1748 C_ARGS: term->display->display, window 1772 C_ARGS: term->dpy, window
1749 1773
1750void 1774void
1751XUnmapWindow (rxvt_term *term, Window window) 1775XUnmapWindow (rxvt_term *term, Window window)
1752 C_ARGS: term->display->display, window 1776 C_ARGS: term->dpy, window
1753 1777
1754void 1778void
1755XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1779XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1756 C_ARGS: term->display->display, window, x, y, width, height 1780 C_ARGS: term->dpy, window, x, y, width, height
1757 1781
1758void 1782void
1759rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1783rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1760 CODE: 1784 CODE:
1761{ 1785{
1762 XWindowAttributes attr; 1786 XWindowAttributes attr;
1763 XGetWindowAttributes (THIS->display->display, window, &attr); 1787 XGetWindowAttributes (THIS->dpy, window, &attr);
1764 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1788 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1765} 1789}
1766 1790
1767void 1791void
1768rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1792rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1769 PPCODE: 1793 PPCODE:
1770{ 1794{
1771 int dx, dy; 1795 int dx, dy;
1772 Window child; 1796 Window child;
1773 1797
1774 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1798 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1775 { 1799 {
1776 EXTEND (SP, 3); 1800 EXTEND (SP, 3);
1777 PUSHs (newSViv (dx)); 1801 PUSHs (newSViv (dx));
1778 PUSHs (newSViv (dy)); 1802 PUSHs (newSViv (dy));
1779 PUSHs (newSVuv (child)); 1803 PUSHs (newSVuv (child));
… …
1796overlay::hide () 1820overlay::hide ()
1797 1821
1798void 1822void
1799overlay::DESTROY () 1823overlay::DESTROY ()
1800 1824
1801############################################################################# 1825INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1802# urxvt::watcher
1803#############################################################################
1804 1826
1805MODULE = urxvt PACKAGE = urxvt::watcher
1806
1807CHAINED
1808perl_watcher::cb (SV *cb)
1809 CODE:
1810 THIS->cb (cb);
1811 OUTPUT:
1812 RETVAL
1813
1814#############################################################################
1815# urxvt::timer
1816#############################################################################
1817
1818MODULE = urxvt PACKAGE = urxvt::timer
1819
1820SV *
1821timer::new ()
1822 CODE:
1823 timer *w = new timer;
1824 w->start (NOW);
1825 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1826 w->self = (HV *)SvRV (RETVAL);
1827 OUTPUT:
1828 RETVAL
1829
1830NV
1831timer::at ()
1832 CODE:
1833 RETVAL = THIS->at;
1834 OUTPUT:
1835 RETVAL
1836
1837CHAINED
1838timer::interval (NV interval)
1839 CODE:
1840 THIS->interval = interval;
1841 OUTPUT:
1842 RETVAL
1843
1844CHAINED
1845timer::set (NV tstamp)
1846 CODE:
1847 THIS->set (tstamp);
1848 OUTPUT:
1849 RETVAL
1850
1851CHAINED
1852timer::start (NV tstamp = THIS->at)
1853 CODE:
1854 THIS->start (tstamp);
1855 OUTPUT:
1856 RETVAL
1857
1858CHAINED
1859timer::after (NV delay)
1860 CODE:
1861 THIS->start (NOW + delay);
1862 OUTPUT:
1863 RETVAL
1864
1865CHAINED
1866timer::stop ()
1867 CODE:
1868 THIS->stop ();
1869 OUTPUT:
1870 RETVAL
1871
1872void
1873timer::DESTROY ()
1874
1875#############################################################################
1876# urxvt::iow
1877#############################################################################
1878
1879MODULE = urxvt PACKAGE = urxvt::iow
1880
1881SV *
1882iow::new ()
1883 CODE:
1884 iow *w = new iow;
1885 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1886 w->self = (HV *)SvRV (RETVAL);
1887 OUTPUT:
1888 RETVAL
1889
1890CHAINED
1891iow::fd (int fd)
1892 CODE:
1893 THIS->fd = fd;
1894 OUTPUT:
1895 RETVAL
1896
1897CHAINED
1898iow::events (short events)
1899 CODE:
1900 THIS->events = events;
1901 OUTPUT:
1902 RETVAL
1903
1904CHAINED
1905iow::start ()
1906 CODE:
1907 THIS->start ();
1908 OUTPUT:
1909 RETVAL
1910
1911CHAINED
1912iow::stop ()
1913 CODE:
1914 THIS->stop ();
1915 OUTPUT:
1916 RETVAL
1917
1918void
1919iow::DESTROY ()
1920
1921#############################################################################
1922# urxvt::iw
1923#############################################################################
1924
1925MODULE = urxvt PACKAGE = urxvt::iw
1926
1927SV *
1928iw::new ()
1929 CODE:
1930 iw *w = new iw;
1931 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1932 w->self = (HV *)SvRV (RETVAL);
1933 OUTPUT:
1934 RETVAL
1935
1936CHAINED
1937iw::start ()
1938 CODE:
1939 THIS->start ();
1940 OUTPUT:
1941 RETVAL
1942
1943CHAINED
1944iw::stop ()
1945 CODE:
1946 THIS->stop ();
1947 OUTPUT:
1948 RETVAL
1949
1950void
1951iw::DESTROY ()
1952
1953#############################################################################
1954# urxvt::pw
1955#############################################################################
1956
1957MODULE = urxvt PACKAGE = urxvt::pw
1958
1959SV *
1960pw::new ()
1961 CODE:
1962 pw *w = new pw;
1963 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1964 w->self = (HV *)SvRV (RETVAL);
1965 OUTPUT:
1966 RETVAL
1967
1968CHAINED
1969pw::start (int pid)
1970 CODE:
1971 THIS->start (pid);
1972 OUTPUT:
1973 RETVAL
1974
1975CHAINED
1976pw::stop ()
1977 CODE:
1978 THIS->stop ();
1979 OUTPUT:
1980 RETVAL
1981
1982void
1983pw::DESTROY ()
1984
1985

Diff Legend

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