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.82 by root, Fri Jan 20 14:41:07 2006 UTC vs.
Revision 1.119 by ayin, Fri Jan 4 17:57:28 2008 UTC

… …
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 44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else 46#else
47# define GRAB_CURSOR None 47# define GRAB_CURSOR None
48#endif 48#endif
49 49
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
58 56
59static wchar_t * 57static wchar_t *
60sv2wcs (SV *sv) 58sv2wcs (SV *sv)
61{ 59{
… …
75 73
76 return sv; 74 return sv;
77} 75}
78 76
79static SV * 77static 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) 78newSVptr (void *ptr, const char *klass)
88{ 79{
89 HV *hv = newHV (); 80 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 81 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 82 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); 104 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 105
115 return (long)mg->mg_ptr; 106 return (long)mg->mg_ptr;
116} 107}
117 108
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 109#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 110#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 111
121///////////////////////////////////////////////////////////////////////////// 112/////////////////////////////////////////////////////////////////////////////
122 113
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") 114#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 115
249struct overlay { 116class overlay {
250 HV *self;
251 bool visible;
252 rxvt_term *THIS; 117 rxvt_term *THIS;
118 AV *overlay_av;
253 int x, y, w, h; 119 int x, y, w, h;
254 int border; 120 int border;
255 text_t **text; 121 text_t **text;
256 rend_t **rend; 122 rend_t **rend;
257 123
124public:
125 HV *self;
126
258 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 127 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
259 ~overlay (); 128 ~overlay ();
260 129
261 void show (); 130 void show ();
262 void hide (); 131 void hide ();
… …
265 134
266 void set (int x, int y, SV *str, SV *rend); 135 void set (int x, int y, SV *str, SV *rend);
267}; 136};
268 137
269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 138overlay::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) 139: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
271{ 140{
141 if (w < 0) w = 0;
142 if (h < 0) h = 0;
143
272 if (border == 2) 144 if (border == 2)
273 { 145 {
274 w += 2; 146 w += 2;
275 h += 2; 147 h += 2;
276 } 148 }
… …
314 *rp++ = r; 186 *rp++ = r;
315 } 187 }
316 } 188 }
317 189
318 show (); 190 show ();
319 THIS->want_refresh = 1;
320} 191}
321 192
322overlay::~overlay () 193overlay::~overlay ()
323{ 194{
324 hide (); 195 hide ();
… …
329 delete [] rend[y]; 200 delete [] rend[y];
330 } 201 }
331 202
332 delete [] text; 203 delete [] text;
333 delete [] rend; 204 delete [] rend;
205}
206
207void
208overlay::show ()
209{
210 if (overlay_av)
211 return;
212
213 overlay_av = (AV *)SvREFCNT_inc (SvRV (
214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
215 ));
216 av_push (overlay_av, newSViv ((long)this));
334 217
335 THIS->want_refresh = 1; 218 THIS->want_refresh = 1;
219 THIS->refresh_check ();
336} 220}
337 221
338void 222void
339overlay::show () 223overlay::hide ()
340{ 224{
341 if (visible) 225 if (!overlay_av)
342 return; 226 return;
343 227
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; 228 int i;
361 229
362 for (i = AvFILL (av); i >= 0; i--) 230 for (i = AvFILL (overlay_av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this) 231 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364 {
365 av_delete (av, i, G_DISCARD);
366 break; 232 break;
367 }
368 233
369 for (; i < AvFILL (av); i++) 234 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 235 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 236
372 av_pop (av); 237 av_pop (overlay_av);
238
239 SvREFCNT_dec (overlay_av);
240 overlay_av = 0;
241
242 THIS->want_refresh = 1;
243 THIS->refresh_check ();
373} 244}
374 245
375void overlay::swap () 246void overlay::swap ()
376{ 247{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 248 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--; ) 293 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
423 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 294 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
424 } 295 }
425 296
426 THIS->want_refresh = 1; 297 THIS->want_refresh = 1;
298 THIS->refresh_check ();
427} 299}
428 300
301/////////////////////////////////////////////////////////////////////////////
302
303#define IOM_CLASS "urxvt"
304#define IOM_WARN rxvt_warn
305#include "iom_perl.h"
429 306
430///////////////////////////////////////////////////////////////////////////// 307/////////////////////////////////////////////////////////////////////////////
431 308
432struct rxvt_perl_interp rxvt_perl; 309struct rxvt_perl_interp rxvt_perl;
433 310
… …
492static void 369static void
493ungrab (rxvt_term *THIS) 370ungrab (rxvt_term *THIS)
494{ 371{
495 if (THIS->perl.grabtime) 372 if (THIS->perl.grabtime)
496 { 373 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 374 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 375 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 376 THIS->perl.grabtime = 0;
500 } 377 }
501} 378}
502 379
503bool 380bool
… …
508 385
509 // pre-handling of some events 386 // pre-handling of some events
510 if (htype == HOOK_REFRESH_END) 387 if (htype == HOOK_REFRESH_END)
511 { 388 {
512 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 389 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
513 390
514 for (int i = 0; i <= AvFILL (av); i++) 391 for (int i = 0; i <= AvFILL (av); i++)
515 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 392 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
516 } 393 }
517 394
518 swap (perl_environ, environ); 395 swap (perl_environ, environ);
… …
554 break; 431 break;
555 432
556 case DT_STR_LEN: 433 case DT_STR_LEN:
557 { 434 {
558 char *str = va_arg (ap, char *); 435 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 436 int len = va_arg (ap, int);
560 437
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 438 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 439 }
563 break; 440 break;
564 441
565 case DT_WCS_LEN: 442 case DT_WCS_LEN:
566 { 443 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 444 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 445 int wlen = va_arg (ap, int);
569 446
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 447 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
448 }
449 break;
450
451 case DT_LCS_LEN:
452 {
453 long *lstr = va_arg (ap, long *);
454 int llen = va_arg (ap, int);
455
456 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 457 }
572 break; 458 break;
573 459
574 case DT_XEVENT: 460 case DT_XEVENT:
575 { 461 {
576 XEvent *xe = va_arg (ap, XEvent *); 462 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 463 HV *hv = newHV ();
578 464
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 465# 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) 466# 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) 467# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 468# undef set
583 469
584 setiv (type, xe->type); 470 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 471 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 472 setiv (serial, xe->xany.serial);
587 473
… …
596 setuv (root, xe->xmotion.root); 482 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 483 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 484 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 485 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 486 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight); 487 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 488 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 489 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 490 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 491 setuv (state, xe->xmotion.state);
606 492
… …
640 break; 526 break;
641 } 527 }
642 528
643 break; 529 break;
644 530
531 case PropertyNotify:
532 setuv (window, xe->xproperty.window);
533 setuv (atom, xe->xproperty.atom);
534 setuv (time, xe->xproperty.time);
535 setiv (state, xe->xproperty.state);
536 break;
537
645 case ClientMessage: 538 case ClientMessage:
646 setuv (window, xe->xclient.window); 539 setuv (window, xe->xclient.window);
647 setuv (message_type, xe->xclient.message_type); 540 setuv (message_type, xe->xclient.message_type);
648 setuv (format, xe->xclient.format); 541 setuv (format, xe->xclient.format);
649 setuv (l0, xe->xclient.data.l[0]); 542 setuv (l0, xe->xclient.data.l[0]);
650 setuv (l1, xe->xclient.data.l[1]); 543 setuv (l1, xe->xclient.data.l[1]);
651 setuv (l2, xe->xclient.data.l[2]); 544 setuv (l2, xe->xclient.data.l[2]);
652 setuv (l3, xe->xclient.data.l[3]); 545 setuv (l3, xe->xclient.data.l[3]);
653 setuv (l4, xe->xclient.data.l[4]); 546 setuv (l4, xe->xclient.data.l[4]);
547 break;
654 } 548 }
655 549
656 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 550 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
657 } 551 }
658 break; 552 break;
… …
700 594
701 // post-handling of some events 595 // post-handling of some events
702 if (htype == HOOK_REFRESH_BEGIN) 596 if (htype == HOOK_REFRESH_BEGIN)
703 { 597 {
704 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 598 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
705 599
706 for (int i = AvFILL (av); i >= 0; i--) 600 for (int i = AvFILL (av); i >= 0; i--)
707 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 601 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
708 } 602 }
709 else if (htype == HOOK_DESTROY) 603 else if (htype == HOOK_DESTROY)
710 { 604 {
711 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
712 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
607
608 // don't allow further calls
609 term->perl.self = 0;
713 } 610 }
714 611
715 swap (perl_environ, environ); 612 swap (perl_environ, environ);
716 613
717 return event_consumed; 614 return event_consumed;
… …
741# include "optinc.h" 638# include "optinc.h"
742# undef nodef 639# undef nodef
743# undef def 640# undef def
744 641
745 HV *stash = gv_stashpv ("urxvt", 1); 642 HV *stash = gv_stashpv ("urxvt", 1);
746 struct { 643 static const struct {
747 const char *name; 644 const char *name;
748 IV iv; 645 IV iv;
749 } *civ, const_iv[] = { 646 } *civ, const_iv[] = {
750# define const_iv(name) { # name, (IV)name } 647# define const_iv(name) { # name, (IV)name }
751 const_iv (DEFAULT_RSTYLE), 648 const_iv (DEFAULT_RSTYLE),
… …
770 const_iv (Button3Mask), 667 const_iv (Button3Mask),
771 const_iv (Button4Mask), 668 const_iv (Button4Mask),
772 const_iv (Button5Mask), 669 const_iv (Button5Mask),
773 const_iv (AnyModifier), 670 const_iv (AnyModifier),
774 671
775 const_iv (EVENT_NONE), 672 const_iv (NoSymbol),
776 const_iv (EVENT_READ), 673 const_iv (GrabModeSync),
777 const_iv (EVENT_WRITE), 674 const_iv (GrabModeAsync),
778 675
779 const_iv (NoEventMask), 676 const_iv (NoEventMask),
780 const_iv (KeyPressMask), 677 const_iv (KeyPressMask),
781 const_iv (KeyReleaseMask), 678 const_iv (KeyReleaseMask),
782 const_iv (ButtonPressMask), 679 const_iv (ButtonPressMask),
… …
834 const_iv (SelectionRequest), 731 const_iv (SelectionRequest),
835 const_iv (SelectionNotify), 732 const_iv (SelectionNotify),
836 const_iv (ColormapNotify), 733 const_iv (ColormapNotify),
837 const_iv (ClientMessage), 734 const_iv (ClientMessage),
838 const_iv (MappingNotify), 735 const_iv (MappingNotify),
736# if ENABLE_XIM_ONTHESPOT
737 const_iv (XIMReverse),
738 const_iv (XIMUnderline),
739 const_iv (XIMHighlight),
740 const_iv (XIMPrimary),
741 const_iv (XIMSecondary),
742 const_iv (XIMTertiary),
743 const_iv (XIMVisibleToForward),
744 const_iv (XIMVisibleToBackword),
745 const_iv (XIMVisibleToCenter),
746# if 0
747 const_iv (XIMForwardChar),
748 const_iv (XIMBackwardChar),
749 const_iv (XIMForwardWord),
750 const_iv (XIMBackwardWord),
751 const_iv (XIMCaretUp),
752 const_iv (XIMCaretDown),
753 const_iv (XIMNextLine),
754 const_iv (XIMPreviousLine),
755 const_iv (XIMLineStart),
756 const_iv (XIMLineEnd),
757 const_iv (XIMAbsolutePosition),
758 const_iv (XIMDontChange),
759# endif
760# endif
839 }; 761 };
840 762
841 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 763 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
842 civ-- > const_iv; )
843 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 764 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
844} 765}
845 766
846void 767void
847warn (const char *msg) 768warn (const char *msg)
… …
857_exit (int status) 778_exit (int status)
858 779
859NV 780NV
860NOW () 781NOW ()
861 CODE: 782 CODE:
862 RETVAL = NOW; 783 RETVAL = ev::now ();
863 OUTPUT: 784 OUTPUT:
864 RETVAL 785 RETVAL
865 786
866int 787int
867GET_BASEFG (int rend) 788GET_BASEFG (int rend)
… …
878 RETVAL 799 RETVAL
879 800
880int 801int
881SET_FGCOLOR (int rend, int new_color) 802SET_FGCOLOR (int rend, int new_color)
882 CODE: 803 CODE:
883 RETVAL = SET_FGCOLOR (rend, new_color); 804 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
884 OUTPUT: 805 OUTPUT:
885 RETVAL 806 RETVAL
886 807
887int 808int
888SET_BGCOLOR (int rend, int new_color) 809SET_BGCOLOR (int rend, int new_color)
889 CODE: 810 CODE:
890 RETVAL = SET_BGCOLOR (rend, new_color); 811 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
891 OUTPUT: 812 OUTPUT:
892 RETVAL 813 RETVAL
893 814
894int 815int
895GET_CUSTOM (int rend) 816GET_CUSTOM (int rend)
896 CODE: 817 CODE:
897 RETVAL = (rend && RS_customMask) >> RS_customShift; 818 RETVAL = (rend & RS_customMask) >> RS_customShift;
898 OUTPUT: 819 OUTPUT:
899 RETVAL 820 RETVAL
900 821
901int 822int
902SET_CUSTOM (int rend, int new_value) 823SET_CUSTOM (int rend, int new_value)
… …
909 | ((new_value << RS_customShift) & RS_customMask); 830 | ((new_value << RS_customShift) & RS_customMask);
910} 831}
911 OUTPUT: 832 OUTPUT:
912 RETVAL 833 RETVAL
913 834
835void
836termlist ()
837 PPCODE:
838{
839 EXTEND (SP, rxvt_term::termlist.size ());
840
841 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
842 if ((*t)->perl.self)
843 PUSHs (sv_2mortal (newSVterm (*t)));
844}
845
914MODULE = urxvt PACKAGE = urxvt::term 846MODULE = urxvt PACKAGE = urxvt::term
915 847
916SV * 848SV *
917_new (...) 849_new (AV *env, AV *arg)
918 CODE: 850 CODE:
919{ 851{
920 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
921 croak ("first argument to urxvt::term->_new must be arrayref");
922
923 rxvt_term *term = new rxvt_term; 852 rxvt_term *term = new rxvt_term;
924 853
925 term->argv = new stringvec; 854 stringvec *argv = new stringvec;
926 term->envv = new stringvec; 855 stringvec *envv = new stringvec;
927 856
928 for (int i = 1; i < items; i++) 857 for (int i = 0; i <= AvFILL (arg); i++)
929 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 858 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
930 859
931 AV *envv = (AV *)SvRV (ST (0));
932 for (int i = AvFILL (envv) + 1; i--; ) 860 for (int i = AvFILL (env) + 1; i--; )
933 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 861 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
934 862
935 term->envv->push_back (0); 863 envv->push_back (0);
936
937 bool success;
938 864
939 try 865 try
940 { 866 {
941 success = term->init (term->argv->size (), term->argv->begin ()); 867 term->init (argv, envv);
942 } 868 }
943 catch (const class rxvt_failure_exception &e) 869 catch (const class rxvt_failure_exception &e)
944 {
945 success = false;
946 }
947
948 if (!success)
949 { 870 {
950 term->destroy (); 871 term->destroy ();
951 croak ("error while initializing new terminal instance"); 872 croak ("error while initializing new terminal instance");
952 } 873 }
953 874
… …
963void 884void
964rxvt_term::set_should_invoke (int htype, int inc) 885rxvt_term::set_should_invoke (int htype, int inc)
965 CODE: 886 CODE:
966 THIS->perl.should_invoke [htype] += inc; 887 THIS->perl.should_invoke [htype] += inc;
967 888
968void 889int
969rxvt_term::grab_button (int button, U32 modifiers) 890rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
970 CODE: 891 CODE:
971 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 892 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
972 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 893 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
973 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 894 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
895 OUTPUT: RETVAL
896
897int
898rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
899 CODE:
900 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
901 OUTPUT: RETVAL
902
903void
904rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
905 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
906 CODE:
907 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
908
909void
910rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
911 CODE:
912 XUngrabKey (THIS->dpy, keycode, modifiers, window);
913
914void
915rxvt_term::XUngrabKeyboard (Time eventtime)
916 CODE:
917 XUngrabKeyboard (THIS->dpy, eventtime);
974 918
975bool 919bool
976rxvt_term::grab (Time eventtime, int sync = 0) 920rxvt_term::grab (Time eventtime, int sync = 0)
977 CODE: 921 CODE:
978{ 922{
979 int mode = sync ? GrabModeSync : GrabModeAsync; 923 int mode = sync ? GrabModeSync : GrabModeAsync;
980 924
981 THIS->perl.grabtime = 0; 925 THIS->perl.grabtime = 0;
982 926
983 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 927 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
984 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 928 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
985 mode, mode, None, GRAB_CURSOR, eventtime)) 929 mode, mode, None, GRAB_CURSOR, eventtime))
986 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 930 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
987 THIS->perl.grabtime = eventtime; 931 THIS->perl.grabtime = eventtime;
988 else 932 else
989 XUngrabPointer (THIS->display->display, eventtime); 933 XUngrabPointer (THIS->dpy, eventtime);
990 934
991 RETVAL = !!THIS->perl.grabtime; 935 RETVAL = !!THIS->perl.grabtime;
992} 936}
993 OUTPUT: 937 OUTPUT:
994 RETVAL 938 RETVAL
995 939
996void 940void
997rxvt_term::allow_events_async () 941rxvt_term::allow_events_async ()
998 CODE: 942 CODE:
999 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 943 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1000 944
1001void 945void
1002rxvt_term::allow_events_sync () 946rxvt_term::allow_events_sync ()
1003 CODE: 947 CODE:
1004 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 948 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1005 949
1006void 950void
1007rxvt_term::allow_events_replay () 951rxvt_term::allow_events_replay ()
1008 CODE: 952 CODE:
1009 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 953 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1010 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 954 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1011 955
1012void 956void
1013rxvt_term::ungrab () 957rxvt_term::ungrab ()
1014 CODE: 958 CODE:
1015 ungrab (THIS); 959 ungrab (THIS);
960
961int
962rxvt_term::XStringToKeysym (char *string)
963 CODE:
964 RETVAL = XStringToKeysym (string);
965 OUTPUT: RETVAL
966
967char *
968rxvt_term::XKeysymToString (int sym)
969 CODE:
970 RETVAL = XKeysymToString (sym);
971 OUTPUT: RETVAL
972
973int
974rxvt_term::XKeysymToKeycode (int sym)
975 CODE:
976 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
977 OUTPUT: RETVAL
978
979int
980rxvt_term::XKeycodeToKeysym (int code, int index)
981 CODE:
982 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
983 OUTPUT: RETVAL
1016 984
1017int 985int
1018rxvt_term::strwidth (SV *str) 986rxvt_term::strwidth (SV *str)
1019 CODE: 987 CODE:
1020{ 988{
1021 wchar_t *wstr = sv2wcs (str); 989 wchar_t *wstr = sv2wcs (str);
1022 990
1023 rxvt_push_locale (THIS->locale); 991 rxvt_push_locale (THIS->locale);
1024 RETVAL = wcswidth (wstr, wcslen (wstr)); 992 RETVAL = 0;
993 for (wchar_t *wc = wstr; *wc; wc++)
994 {
995 int w = WCWIDTH (*wc);
996
997 if (w)
998 RETVAL += max (w, 1);
999 }
1025 rxvt_pop_locale (); 1000 rxvt_pop_locale ();
1026 1001
1027 free (wstr); 1002 free (wstr);
1028} 1003}
1029 OUTPUT: 1004 OUTPUT:
… …
1059 rxvt_pop_locale (); 1034 rxvt_pop_locale ();
1060 1035
1061 RETVAL = wcs2sv (wstr); 1036 RETVAL = wcs2sv (wstr);
1062 free (wstr); 1037 free (wstr);
1063} 1038}
1039 OUTPUT:
1040 RETVAL
1041
1042char *
1043rxvt_term::locale ()
1044 CODE:
1045 RETVAL = THIS->locale;
1064 OUTPUT: 1046 OUTPUT:
1065 RETVAL 1047 RETVAL
1066 1048
1067#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1049#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1068 1050
… …
1109rxvt_term::ModLevel3Mask () 1091rxvt_term::ModLevel3Mask ()
1110 ALIAS: 1092 ALIAS:
1111 ModLevel3Mask = 0 1093 ModLevel3Mask = 0
1112 ModMetaMask = 1 1094 ModMetaMask = 1
1113 ModNumLockMask = 2 1095 ModNumLockMask = 2
1096 current_screen = 3
1097 hidden_cursor = 4
1114 CODE: 1098 CODE:
1115 switch (ix) 1099 switch (ix)
1116 { 1100 {
1117 case 0: RETVAL = THIS->ModLevel3Mask; break; 1101 case 0: RETVAL = THIS->ModLevel3Mask; break;
1118 case 1: RETVAL = THIS->ModMetaMask; break; 1102 case 1: RETVAL = THIS->ModMetaMask; break;
1119 case 2: RETVAL = THIS->ModNumLockMask; break; 1103 case 2: RETVAL = THIS->ModNumLockMask; break;
1104 case 3: RETVAL = THIS->current_screen; break;
1105 case 4: RETVAL = THIS->hidden_cursor; break;
1120 } 1106 }
1121 OUTPUT: 1107 OUTPUT:
1122 RETVAL 1108 RETVAL
1123 1109
1124char * 1110char *
… …
1134 } 1120 }
1135 OUTPUT: 1121 OUTPUT:
1136 RETVAL 1122 RETVAL
1137 1123
1138SV * 1124SV *
1139rxvt_term::_env () 1125rxvt_term::envv ()
1126 ALIAS:
1127 argv = 1
1140 CODE: 1128 PPCODE:
1141{ 1129{
1142 if (THIS->envv) 1130 stringvec *vec = ix ? THIS->argv : THIS->envv;
1143 {
1144 AV *av = newAV ();
1145 1131
1132 EXTEND (SP, vec->size ());
1133
1146 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1134 for (char **i = vec->begin (); i != vec->end (); ++i)
1147 if (*i) 1135 if (*i)
1148 av_push (av, newSVpv (*i, 0)); 1136 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1149
1150 RETVAL = newRV_noinc ((SV *)av);
1151 }
1152 else
1153 RETVAL = &PL_sv_undef;
1154} 1137}
1155 OUTPUT:
1156 RETVAL
1157 1138
1158int 1139int
1159rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1140rxvt_term::pty_ev_events (int events = ev::UNDEF)
1160 CODE: 1141 CODE:
1161 RETVAL = THIS->pty_ev.events; 1142 RETVAL = THIS->pty_ev.events;
1162 if (events != EVENT_UNDEF) 1143 if (events != ev::UNDEF)
1163 THIS->pty_ev.set (events); 1144 THIS->pty_ev.set (events);
1145 OUTPUT:
1146 RETVAL
1147
1148int
1149rxvt_term::pty_fd ()
1150 CODE:
1151 RETVAL = THIS->pty->pty;
1164 OUTPUT: 1152 OUTPUT:
1165 RETVAL 1153 RETVAL
1166 1154
1167Window 1155Window
1168rxvt_term::parent () 1156rxvt_term::parent ()
… …
1204} 1192}
1205 OUTPUT: 1193 OUTPUT:
1206 RETVAL 1194 RETVAL
1207 1195
1208void 1196void
1197rxvt_term::focus_in ()
1198
1199void
1200rxvt_term::focus_out ()
1201
1202void
1203rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1204 ALIAS:
1205 key_release = 1
1206 CODE:
1207{
1208 XKeyEvent xkey;
1209
1210 memset (&xkey, 0, sizeof (xkey));
1211
1212 xkey.time = time;
1213 xkey.state = state;
1214 xkey.keycode = keycode;
1215
1216 xkey.type = ix ? KeyRelease : KeyPress;
1217 xkey.display = THIS->dpy;
1218 xkey.window = THIS->vt;
1219 xkey.root = THIS->display->root;
1220 xkey.subwindow = THIS->vt;
1221
1222 if (ix)
1223 THIS->key_release (xkey);
1224 else
1225 THIS->key_press (xkey);
1226}
1227
1228void
1209rxvt_term::want_refresh () 1229rxvt_term::want_refresh ()
1210 CODE: 1230 CODE:
1211 THIS->want_refresh = 1; 1231 THIS->want_refresh = 1;
1232 THIS->refresh_check ();
1212 1233
1213void 1234void
1214rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1235rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1215 PPCODE: 1236 PPCODE:
1216{ 1237{
… …
1219 1240
1220 line_t &l = ROW(row_number); 1241 line_t &l = ROW(row_number);
1221 1242
1222 if (GIMME_V != G_VOID) 1243 if (GIMME_V != G_VOID)
1223 { 1244 {
1224 wchar_t *wstr = new wchar_t [THIS->ncol]; 1245 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1225 1246
1226 for (int col = 0; col < THIS->ncol; col++) 1247 for (int col = 0; col < THIS->ncol; col++)
1227 wstr [col] = l.t [col]; 1248 wstr [col] = l.t [col];
1228 1249
1229 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1250 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1230
1231 delete [] wstr;
1232 } 1251 }
1233 1252
1234 if (new_text) 1253 if (new_text)
1235 { 1254 {
1236 wchar_t *wstr = sv2wcs (new_text); 1255 wchar_t *wstr = sv2wcs (new_text);
1237 1256
1238 int len = min (wcslen (wstr) - start_ofs, max_len); 1257 int len = min (wcslen (wstr) - start_ofs, max_len);
1239 1258
1240 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1259 if (start_col < 0 || start_col + len > THIS->ncol)
1241 { 1260 {
1242 free (wstr); 1261 free (wstr);
1243 croak ("new_text extends beyond horizontal margins"); 1262 croak ("new_text extends beyond horizontal margins");
1244 } 1263 }
1245 1264
… …
1279 croak ("new_rend must be arrayref"); 1298 croak ("new_rend must be arrayref");
1280 1299
1281 AV *av = (AV *)SvRV (new_rend); 1300 AV *av = (AV *)SvRV (new_rend);
1282 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1301 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1283 1302
1284 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1303 if (start_col < 0 || start_col + len > THIS->ncol)
1285 croak ("new_rend array extends beyond horizontal margins"); 1304 croak ("new_rend array extends beyond horizontal margins");
1286 1305
1287 for (int col = start_col; col < start_col + len; col++) 1306 for (int col = start_col; col < start_col + len; col++)
1288 { 1307 {
1289 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1308 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1329rxvt_term::special_encode (SV *string) 1348rxvt_term::special_encode (SV *string)
1330 CODE: 1349 CODE:
1331{ 1350{
1332 wchar_t *wstr = sv2wcs (string); 1351 wchar_t *wstr = sv2wcs (string);
1333 int wlen = wcslen (wstr); 1352 int wlen = wcslen (wstr);
1334 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1353 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1335 1354
1336 rxvt_push_locale (THIS->locale); 1355 rxvt_push_locale (THIS->locale);
1337 1356
1338 wchar_t *r = rstr; 1357 wchar_t *r = rstr;
1339 for (wchar_t *s = wstr; *s; s++) 1358 for (wchar_t *s = wstr; *s; s++)
1359 {
1360 int w = WCWIDTH (*s);
1361
1340 if (wcwidth (*s) == 0) 1362 if (w == 0)
1341 { 1363 {
1342 if (r == rstr) 1364 if (r == rstr)
1343 croak ("leading combining character unencodable"); 1365 croak ("leading combining character unencodable");
1344 1366
1345 unicode_t n = rxvt_compose (r[-1], *s); 1367 unicode_t n = rxvt_compose (r[-1], *s);
1346 if (n == NOCHAR) 1368 if (n == NOCHAR)
1347 n = rxvt_composite.compose (r[-1], *s); 1369 n = rxvt_composite.compose (r[-1], *s);
1348 1370
1349 r[-1] = n; 1371 r[-1] = n;
1350 } 1372 }
1351#if !UNICODE_3 1373#if !UNICODE_3
1352 else if (*s >= 0x10000) 1374 else if (*s >= 0x10000)
1353 *r++ = rxvt_composite.compose (*s); 1375 *r++ = rxvt_composite.compose (*s);
1354#endif 1376#endif
1355 else 1377 else
1356 *r++ = *s; 1378 *r++ = *s;
1379
1380 // the *2 above only allows wcwidth <= 2
1381 if (w > 1)
1382 *r++ = NOCHAR;
1383 }
1357 1384
1358 rxvt_pop_locale (); 1385 rxvt_pop_locale ();
1359 1386
1360 RETVAL = wcs2sv (rstr, r - rstr); 1387 RETVAL = wcs2sv (rstr, r - rstr);
1361
1362 delete [] rstr;
1363} 1388}
1364 OUTPUT: 1389 OUTPUT:
1365 RETVAL 1390 RETVAL
1366 1391
1367SV * 1392SV *
1368rxvt_term::special_decode (SV *text) 1393rxvt_term::special_decode (SV *text)
1369 CODE: 1394 CODE:
1370{ 1395{
1371 wchar_t *wstr = sv2wcs (text); 1396 wchar_t *wstr = sv2wcs (text);
1372 int wlen = wcslen (wstr);
1373 int dlen = 0; 1397 int dlen = 0;
1374 1398
1375 // find length 1399 // find length
1376 for (wchar_t *s = wstr; *s; s++) 1400 for (wchar_t *s = wstr; *s; s++)
1377 if (*s == NOCHAR) 1401 if (*s == NOCHAR)
… …
1379 else if (IS_COMPOSE (*s)) 1403 else if (IS_COMPOSE (*s))
1380 dlen += rxvt_composite.expand (*s, 0); 1404 dlen += rxvt_composite.expand (*s, 0);
1381 else 1405 else
1382 dlen++; 1406 dlen++;
1383 1407
1384 wchar_t *rstr = new wchar_t [dlen]; 1408 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1385 1409
1386 // decode 1410 // decode
1387 wchar_t *r = rstr; 1411 wchar_t *r = rstr;
1388 for (wchar_t *s = wstr; *s; s++) 1412 for (wchar_t *s = wstr; *s; s++)
1389 if (*s == NOCHAR) 1413 if (*s == NOCHAR)
… …
1392 r += rxvt_composite.expand (*s, r); 1416 r += rxvt_composite.expand (*s, r);
1393 else 1417 else
1394 *r++ = *s; 1418 *r++ = *s;
1395 1419
1396 RETVAL = wcs2sv (rstr, r - rstr); 1420 RETVAL = wcs2sv (rstr, r - rstr);
1397
1398 delete [] rstr;
1399} 1421}
1400 OUTPUT: 1422 OUTPUT:
1401 RETVAL 1423 RETVAL
1402 1424
1403void 1425void
1404rxvt_term::_resource (char *name, int index, SV *newval = 0) 1426rxvt_term::_resource (char *name, int index, SV *newval = 0)
1405 PPCODE: 1427 PPCODE:
1406{ 1428{
1407 struct resval { const char *name; int value; } rslist [] = { 1429 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1408# define def(name) { # name, Rs_ ## name }, 1430# define def(name) { # name, Rs_ ## name },
1409# define reserve(name,count) 1431# define reserve(name,count)
1410# include "rsinc.h" 1432# include "rsinc.h"
1411# undef def 1433# undef def
1412# undef reserve 1434# undef reserve
1413 }; 1435 };
1414 1436
1415 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1437 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1416 1438
1417 do { 1439 do {
1418 if (rs-- == rslist) 1440 if (rs-- == rslist)
1419 croak ("no such resource '%s', requested", name); 1441 croak ("no such resource '%s', requested", name);
1420 } while (strcmp (name, rs->name)); 1442 } while (strcmp (name, rs->name));
… …
1442 1464
1443const char * 1465const char *
1444rxvt_term::x_resource (const char *name) 1466rxvt_term::x_resource (const char *name)
1445 1467
1446bool 1468bool
1447rxvt_term::option (U32 optval, int set = -1) 1469rxvt_term::option (U8 optval, int set = -1)
1448 CODE: 1470 CODE:
1449{ 1471{
1450 RETVAL = THIS->options & optval; 1472 RETVAL = THIS->option (optval);
1451 1473
1452 if (set >= 0) 1474 if (set >= 0)
1453 { 1475 {
1454 if (set)
1455 THIS->options |= optval; 1476 THIS->set_option (optval, set);
1456 else
1457 THIS->options &= ~optval;
1458 1477
1459 if (THIS->check_ev.is_active ()) // avoid doing this before START 1478 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1460 switch (optval) 1479 switch (optval)
1461 { 1480 {
1462 case Opt_skipBuiltinGlyphs: 1481 case Opt_skipBuiltinGlyphs:
1463 THIS->set_fonts (); 1482 THIS->set_fonts ();
1464 THIS->scr_remap_chars (); 1483 THIS->scr_remap_chars ();
1465 THIS->scr_touch (true); 1484 THIS->scr_touch (true);
1466 THIS->want_refresh = 1; 1485 THIS->want_refresh = 1;
1486 THIS->refresh_check ();
1467 break; 1487 break;
1468 1488
1469 case Opt_cursorUnderline: 1489 case Opt_cursorUnderline:
1470 THIS->want_refresh = 1; 1490 THIS->want_refresh = 1;
1491 THIS->refresh_check ();
1471 break; 1492 break;
1472 1493
1473# case Opt_scrollBar_floating: 1494# case Opt_scrollBar_floating:
1474# case Opt_scrollBar_right: 1495# case Opt_scrollBar_right:
1475# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1496# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1513 if (items == 3) 1534 if (items == 3)
1514 { 1535 {
1515 rc.row = SvIV (ST (1)); 1536 rc.row = SvIV (ST (1));
1516 rc.col = SvIV (ST (2)); 1537 rc.col = SvIV (ST (2));
1517 1538
1518 if (ix == 2 && rc.col == 0) 1539 if (ix == 2)
1519 { 1540 {
1541 if (rc.col == 0)
1542 {
1543 // col == 0 means end of previous line
1520 rc.row--; 1544 rc.row--;
1521 rc.col = THIS->ncol; 1545 rc.col = THIS->ncol;
1546 }
1547 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1548 && rc.col > ROW(rc.row).l)
1549 {
1550 // col >= length means while line and add newline
1551 rc.col = THIS->ncol;
1552 }
1522 } 1553 }
1523 1554
1524 clamp_it (rc.col, 0, THIS->ncol); 1555 clamp_it (rc.col, 0, THIS->ncol);
1525 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1556 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1526 1557
1527 if (ix) 1558 if (ix)
1559 {
1528 THIS->want_refresh = 1; 1560 THIS->want_refresh = 1;
1561 THIS->refresh_check ();
1562 }
1529 } 1563 }
1530} 1564}
1531 1565
1532char 1566char
1533rxvt_term::cur_charset () 1567rxvt_term::cur_charset ()
1534 CODE: 1568 CODE:
1535 RETVAL = THIS->charsets [THIS->screen.charset]; 1569 RETVAL = THIS->charsets [THIS->screen.charset];
1536 OUTPUT: 1570 OUTPUT:
1537 RETVAL 1571 RETVAL
1538 1572
1539#void 1573void
1540#rxvt_term::selection_clear () 1574rxvt_term::selection_clear ()
1541 1575
1542void 1576void
1543rxvt_term::selection_make (Time eventtime, bool rect = false) 1577rxvt_term::selection_make (Time eventtime, bool rect = false)
1544 CODE: 1578 CODE:
1545 THIS->selection.op = SELECTION_CONT; 1579 THIS->selection.op = SELECTION_CONT;
… …
1573void 1607void
1574rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1608rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1575 1609
1576void 1610void
1577rxvt_term::scr_bell () 1611rxvt_term::scr_bell ()
1612
1613void
1614rxvt_term::scr_change_screen (int screen)
1578 1615
1579void 1616void
1580rxvt_term::scr_add_lines (SV *string) 1617rxvt_term::scr_add_lines (SV *string)
1581 CODE: 1618 CODE:
1582{ 1619{
… …
1632void 1669void
1633rxvt_term::XListProperties (Window window) 1670rxvt_term::XListProperties (Window window)
1634 PPCODE: 1671 PPCODE:
1635{ 1672{
1636 int count; 1673 int count;
1637 Atom *props = XListProperties (THIS->display->display, window, &count); 1674 Atom *props = XListProperties (THIS->dpy, window, &count);
1638 1675
1639 EXTEND (SP, count); 1676 EXTEND (SP, count);
1640 while (count--) 1677 while (count--)
1641 PUSHs (newSVuv ((U32)props [count])); 1678 PUSHs (newSVuv ((U32)props [count]));
1642 1679
1643 XFree (props); 1680 XFree (props);
1644} 1681}
1645 1682
1646void 1683void
1647rxvt_term::XGetWindowProperty (Window window, Atom property) 1684rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1651 int format; 1688 int format;
1652 unsigned long nitems; 1689 unsigned long nitems;
1653 unsigned long bytes_after; 1690 unsigned long bytes_after;
1654 unsigned char *prop; 1691 unsigned char *prop;
1655 1692
1656 XGetWindowProperty (THIS->display->display, window, property, 1693 XGetWindowProperty (THIS->dpy, window, property,
1657 0, 1<<24, 0, AnyPropertyType, 1694 0, 1<<24, 0, AnyPropertyType,
1658 &type, &format, &nitems, &bytes_after, &prop); 1695 &type, &format, &nitems, &bytes_after, &prop);
1659 1696
1660 if (type != None) 1697 if (type != None)
1661 { 1698 {
… …
1680 1717
1681 int elemsize = format == 16 ? sizeof (short) 1718 int elemsize = format == 16 ? sizeof (short)
1682 : format == 32 ? sizeof (long) 1719 : format == 32 ? sizeof (long)
1683 : 1; 1720 : 1;
1684 1721
1685 XChangeProperty (THIS->display->display, window, property, 1722 XChangeProperty (THIS->dpy, window, property,
1686 type, format, PropModeReplace, 1723 type, format, PropModeReplace,
1687 (unsigned char *)data_, len / elemsize); 1724 (unsigned char *)data_, len / elemsize);
1688 XSync (THIS->display->display, 0);
1689} 1725}
1690 1726
1691Atom 1727Atom
1692XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1728XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1693 C_ARGS: term->display->display, atom_name, only_if_exists 1729 C_ARGS: term->dpy, atom_name, only_if_exists
1694 1730
1695char * 1731char *
1696XGetAtomName (rxvt_term *term, Atom atom) 1732XGetAtomName (rxvt_term *term, Atom atom)
1697 C_ARGS: term->display->display, atom 1733 C_ARGS: term->dpy, atom
1698 CLEANUP: 1734 CLEANUP:
1699 XFree (RETVAL); 1735 XFree (RETVAL);
1700 1736
1701void 1737void
1702XDeleteProperty (rxvt_term *term, Window window, Atom property) 1738XDeleteProperty (rxvt_term *term, Window window, Atom property)
1703 C_ARGS: term->display->display, window, property 1739 C_ARGS: term->dpy, window, property
1704 1740
1705Window 1741Window
1706rxvt_term::DefaultRootWindow () 1742rxvt_term::DefaultRootWindow ()
1707 CODE: 1743 CODE:
1708 RETVAL = THIS->display->root; 1744 RETVAL = THIS->display->root;
… …
1711 1747
1712#if 0 1748#if 0
1713 1749
1714Window 1750Window
1715XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1751XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1716 C_ARGS: term->display->display, (Window)parent, 1752 C_ARGS: term->dpy, (Window)parent,
1717 x, y, width, height, 0, 1753 x, y, width, height, 0,
1718 term->pix_colors_focused[Color_border], 1754 term->pix_colors_focused[Color_border],
1719 term->pix_colors_focused[Color_border] 1755 term->pix_colors_focused[Color_border]
1720 1756
1721#endif 1757#endif
1722 1758
1723void 1759void
1724XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1760XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1725 C_ARGS: term->display->display, window, parent, x, y 1761 C_ARGS: term->dpy, window, parent, x, y
1726 1762
1727void 1763void
1728XMapWindow (rxvt_term *term, Window window) 1764XMapWindow (rxvt_term *term, Window window)
1729 C_ARGS: term->display->display, window 1765 C_ARGS: term->dpy, window
1730 1766
1731void 1767void
1732XUnmapWindow (rxvt_term *term, Window window) 1768XUnmapWindow (rxvt_term *term, Window window)
1733 C_ARGS: term->display->display, window 1769 C_ARGS: term->dpy, window
1734 1770
1735void 1771void
1736XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1772XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1737 C_ARGS: term->display->display, (Window)window, x, y, width, height 1773 C_ARGS: term->dpy, window, x, y, width, height
1774
1775void
1776rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1777 CODE:
1778{
1779 XWindowAttributes attr;
1780 XGetWindowAttributes (THIS->dpy, window, &attr);
1781 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1782}
1738 1783
1739void 1784void
1740rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1785rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1741 PPCODE: 1786 PPCODE:
1742{ 1787{
1743 int dx, dy; 1788 int dx, dy;
1744 Window child; 1789 Window child;
1745 1790
1746 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1791 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1747 { 1792 {
1748 EXTEND (SP, 3); 1793 EXTEND (SP, 3);
1749 PUSHs (newSViv (dx)); 1794 PUSHs (newSViv (dx));
1750 PUSHs (newSViv (dy)); 1795 PUSHs (newSViv (dy));
1751 PUSHs (newSVuv (child)); 1796 PUSHs (newSVuv (child));
… …
1768overlay::hide () 1813overlay::hide ()
1769 1814
1770void 1815void
1771overlay::DESTROY () 1816overlay::DESTROY ()
1772 1817
1773############################################################################# 1818INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1774# urxvt::watcher
1775#############################################################################
1776 1819
1777MODULE = urxvt PACKAGE = urxvt::watcher
1778
1779CHAINED
1780perl_watcher::cb (SV *cb)
1781 CODE:
1782 THIS->cb (cb);
1783 OUTPUT:
1784 RETVAL
1785
1786#############################################################################
1787# urxvt::timer
1788#############################################################################
1789
1790MODULE = urxvt PACKAGE = urxvt::timer
1791
1792SV *
1793timer::new ()
1794 CODE:
1795 timer *w = new timer;
1796 w->start (NOW);
1797 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1798 w->self = (HV *)SvRV (RETVAL);
1799 OUTPUT:
1800 RETVAL
1801
1802NV
1803timer::at ()
1804 CODE:
1805 RETVAL = THIS->at;
1806 OUTPUT:
1807 RETVAL
1808
1809CHAINED
1810timer::interval (NV interval)
1811 CODE:
1812 THIS->interval = interval;
1813 OUTPUT:
1814 RETVAL
1815
1816CHAINED
1817timer::set (NV tstamp)
1818 CODE:
1819 THIS->set (tstamp);
1820 OUTPUT:
1821 RETVAL
1822
1823CHAINED
1824timer::start (NV tstamp = THIS->at)
1825 CODE:
1826 THIS->start (tstamp);
1827 OUTPUT:
1828 RETVAL
1829
1830CHAINED
1831timer::after (NV delay)
1832 CODE:
1833 THIS->start (NOW + delay);
1834 OUTPUT:
1835 RETVAL
1836
1837CHAINED
1838timer::stop ()
1839 CODE:
1840 THIS->stop ();
1841 OUTPUT:
1842 RETVAL
1843
1844void
1845timer::DESTROY ()
1846
1847#############################################################################
1848# urxvt::iow
1849#############################################################################
1850
1851MODULE = urxvt PACKAGE = urxvt::iow
1852
1853SV *
1854iow::new ()
1855 CODE:
1856 iow *w = new iow;
1857 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1858 w->self = (HV *)SvRV (RETVAL);
1859 OUTPUT:
1860 RETVAL
1861
1862CHAINED
1863iow::fd (int fd)
1864 CODE:
1865 THIS->fd = fd;
1866 OUTPUT:
1867 RETVAL
1868
1869CHAINED
1870iow::events (short events)
1871 CODE:
1872 THIS->events = events;
1873 OUTPUT:
1874 RETVAL
1875
1876CHAINED
1877iow::start ()
1878 CODE:
1879 THIS->start ();
1880 OUTPUT:
1881 RETVAL
1882
1883CHAINED
1884iow::stop ()
1885 CODE:
1886 THIS->stop ();
1887 OUTPUT:
1888 RETVAL
1889
1890void
1891iow::DESTROY ()
1892
1893#############################################################################
1894# urxvt::iw
1895#############################################################################
1896
1897MODULE = urxvt PACKAGE = urxvt::iw
1898
1899SV *
1900iw::new ()
1901 CODE:
1902 iw *w = new iw;
1903 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1904 w->self = (HV *)SvRV (RETVAL);
1905 OUTPUT:
1906 RETVAL
1907
1908CHAINED
1909iw::start ()
1910 CODE:
1911 THIS->start ();
1912 OUTPUT:
1913 RETVAL
1914
1915CHAINED
1916iw::stop ()
1917 CODE:
1918 THIS->stop ();
1919 OUTPUT:
1920 RETVAL
1921
1922void
1923iw::DESTROY ()
1924
1925#############################################################################
1926# urxvt::pw
1927#############################################################################
1928
1929MODULE = urxvt PACKAGE = urxvt::pw
1930
1931SV *
1932pw::new ()
1933 CODE:
1934 pw *w = new pw;
1935 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1936 w->self = (HV *)SvRV (RETVAL);
1937 OUTPUT:
1938 RETVAL
1939
1940CHAINED
1941pw::start (int pid)
1942 CODE:
1943 THIS->start (pid);
1944 OUTPUT:
1945 RETVAL
1946
1947CHAINED
1948pw::stop ()
1949 CODE:
1950 THIS->stop ();
1951 OUTPUT:
1952 RETVAL
1953
1954void
1955pw::DESTROY ()
1956
1957

Diff Legend

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