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.75 by root, Wed Jan 18 11:05:09 2006 UTC vs.
Revision 1.111 by root, Thu Dec 14 17:33:53 2006 UTC

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
55#define ENABLE_PERL_FRILLS 1
56
57///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
58 56
59static wchar_t * 57static wchar_t *
60sv2wcs (SV *sv) 58sv2wcs (SV *sv)
61{ 59{
80new_ref (HV *hv, const char *klass) 78new_ref (HV *hv, const char *klass)
81{ 79{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 80 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83} 81}
84 82
85//TODO: use magic
86static SV * 83static SV *
87newSVptr (void *ptr, const char *klass) 84newSVptr (void *ptr, const char *klass)
88{ 85{
89 HV *hv = newHV (); 86 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 87 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 110 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 111
115 return (long)mg->mg_ptr; 112 return (long)mg->mg_ptr;
116} 113}
117 114
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 115#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 116#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 117
121///////////////////////////////////////////////////////////////////////////// 118/////////////////////////////////////////////////////////////////////////////
122 119
123struct perl_watcher
124{
125 SV *cbsv;
126 HV *self;
127
128 perl_watcher ()
129 : cbsv (newSV (0))
130 {
131 }
132
133 ~perl_watcher ()
134 {
135 SvREFCNT_dec (cbsv);
136 }
137
138 void cb (SV *cb)
139 {
140 sv_setsv (cbsv, cb);
141 }
142
143 void invoke (const char *type, SV *self, int arg = -1);
144};
145
146void
147perl_watcher::invoke (const char *type, SV *self, int arg)
148{
149 dSP;
150
151 ENTER;
152 SAVETMPS;
153
154 PUSHMARK (SP);
155
156 XPUSHs (sv_2mortal (self));
157
158 if (arg >= 0)
159 XPUSHs (sv_2mortal (newSViv (arg)));
160
161 PUTBACK;
162 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
163 SPAGAIN;
164
165 PUTBACK;
166 FREETMPS;
167 LEAVE;
168
169 if (SvTRUE (ERRSV))
170 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
171}
172
173#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
174#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")
175
176struct timer : time_watcher, perl_watcher
177{
178 tstamp interval;
179
180 timer ()
181 : time_watcher (this, &timer::execute)
182 {
183 }
184
185 void execute (time_watcher &w)
186 {
187 if (interval)
188 start (at + interval);
189
190 invoke ("urxvt::timer", newSVtimer (this));
191 }
192};
193
194#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
195#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow")
196
197struct iow : io_watcher, perl_watcher
198{
199 iow ()
200 : io_watcher (this, &iow::execute)
201 {
202 }
203
204 void execute (io_watcher &w, short revents)
205 {
206 invoke ("urxvt::iow", newSViow (this), revents);
207 }
208};
209
210/////////////////////////////////////////////////////////////////////////////
211
212#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 120#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
213 121
214struct overlay { 122class overlay {
215 HV *self;
216 rxvt_term *THIS; 123 rxvt_term *THIS;
124 AV *overlay_av;
217 int x, y, w, h; 125 int x, y, w, h;
218 int border; 126 int border;
219 text_t **text; 127 text_t **text;
220 rend_t **rend; 128 rend_t **rend;
221 129
130public:
131 HV *self;
132
222 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 133 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
223 ~overlay (); 134 ~overlay ();
224 135
225 void show (); 136 void show ();
226 void hide (); 137 void hide ();
229 140
230 void set (int x, int y, SV *str, SV *rend); 141 void set (int x, int y, SV *str, SV *rend);
231}; 142};
232 143
233overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 144overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
234: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2) 145: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
235{ 146{
147 if (w < 0) w = 0;
148 if (h < 0) h = 0;
149
236 if (border == 2) 150 if (border == 2)
237 { 151 {
238 w += 2; 152 w += 2;
239 h += 2; 153 h += 2;
240 } 154 }
278 *rp++ = r; 192 *rp++ = r;
279 } 193 }
280 } 194 }
281 195
282 show (); 196 show ();
283 THIS->want_refresh = 1;
284} 197}
285 198
286overlay::~overlay () 199overlay::~overlay ()
287{ 200{
288 hide (); 201 hide ();
293 delete [] rend[y]; 206 delete [] rend[y];
294 } 207 }
295 208
296 delete [] text; 209 delete [] text;
297 delete [] rend; 210 delete [] rend;
211}
212
213void
214overlay::show ()
215{
216 if (overlay_av)
217 return;
218
219 overlay_av = (AV *)SvREFCNT_inc (SvRV (
220 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
221 ));
222 av_push (overlay_av, newSViv ((long)this));
298 223
299 THIS->want_refresh = 1; 224 THIS->want_refresh = 1;
300} 225}
301 226
302void 227void
303overlay::show ()
304{
305 char key[33]; sprintf (key, "%32lx", (long)this);
306
307 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
308 hv_store (hv, key, 32, newSViv ((long)this), 0);
309}
310
311void
312overlay::hide () 228overlay::hide ()
313{ 229{
314 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 230 if (!overlay_av)
231 return;
315 232
316 if (ovs) 233 int i;
317 {
318 char key[33]; sprintf (key, "%32lx", (long)this);
319 234
320 HV *hv = (HV *)SvRV (*ovs); 235 for (i = AvFILL (overlay_av); i >= 0; i--)
321 hv_delete (hv, key, 32, G_DISCARD); 236 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
322 } 237 break;
238
239 for (; i < AvFILL (overlay_av); i++)
240 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
241
242 av_pop (overlay_av);
243
244 SvREFCNT_dec (overlay_av);
245 overlay_av = 0;
246
247 THIS->want_refresh = 1;
323} 248}
324 249
325void overlay::swap () 250void overlay::swap ()
326{ 251{
327 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 252 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
367 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 292 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
368 croak ("rend must be arrayref"); 293 croak ("rend must be arrayref");
369 294
370 AV *av = (AV *)SvRV (rend); 295 AV *av = (AV *)SvRV (rend);
371 296
372 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
373 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
374 } 299 }
375 300
376 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
377} 302}
378 303
304/////////////////////////////////////////////////////////////////////////////
305
306#define IOM_CLASS "urxvt"
307#include <iom_perl.h>
379 308
380///////////////////////////////////////////////////////////////////////////// 309/////////////////////////////////////////////////////////////////////////////
381 310
382struct rxvt_perl_interp rxvt_perl; 311struct rxvt_perl_interp rxvt_perl;
383 312
433 362
434 if (perl) 363 if (perl)
435 { 364 {
436 // runs outside of perls ENV 365 // runs outside of perls ENV
437 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 366 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
438 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 367 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
439 } 368 }
440} 369}
441 370
442static void 371static void
443ungrab (rxvt_term *THIS) 372ungrab (rxvt_term *THIS)
444{ 373{
445 if (THIS->perl.grabtime) 374 if (THIS->perl.grabtime)
446 { 375 {
447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 376 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 377 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 378 THIS->perl.grabtime = 0;
450 } 379 }
451} 380}
452 381
453static void
454swap_overlays (rxvt_term *term)
455{
456 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
457
458 if (HvKEYS (hv))
459 {
460 hv_iterinit (hv);
461
462 while (HE *he = hv_iternext (hv))
463 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
464 }
465}
466
467bool 382bool
468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 383rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
469{ 384{
470 if (!perl || !term->perl.self) 385 if (!perl || !term->perl.self)
471 return false; 386 return false;
472 387
473 // pre-handling of some events 388 // pre-handling of some events
474 if (htype == HOOK_REFRESH_END) 389 if (htype == HOOK_REFRESH_END)
475 swap_overlays (term); 390 {
391 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
392
393 for (int i = 0; i <= AvFILL (av); i++)
394 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
395 }
476 396
477 swap (perl_environ, environ); 397 swap (perl_environ, environ);
478 398
479 bool event_consumed; 399 bool event_consumed;
480 400
513 break; 433 break;
514 434
515 case DT_STR_LEN: 435 case DT_STR_LEN:
516 { 436 {
517 char *str = va_arg (ap, char *); 437 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int); 438 int len = va_arg (ap, int);
519 439
520 XPUSHs (sv_2mortal (newSVpvn (str, len))); 440 XPUSHs (sv_2mortal (newSVpvn (str, len)));
521 } 441 }
522 break; 442 break;
523 443
524 case DT_WCS_LEN: 444 case DT_WCS_LEN:
525 { 445 {
526 wchar_t *wstr = va_arg (ap, wchar_t *); 446 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int); 447 int wlen = va_arg (ap, int);
528 448
529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 449 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
450 }
451 break;
452
453 case DT_LCS_LEN:
454 {
455 long *lstr = va_arg (ap, long *);
456 int llen = va_arg (ap, int);
457
458 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
530 } 459 }
531 break; 460 break;
532 461
533 case DT_XEVENT: 462 case DT_XEVENT:
534 { 463 {
535 XEvent *xe = va_arg (ap, XEvent *); 464 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV (); 465 HV *hv = newHV ();
537 466
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 467# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
539# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 468# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
540# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 469# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
541# undef set 470# undef set
542 471
543 setiv (type, xe->type); 472 setiv (type, xe->type);
544 setiv (send_event, xe->xany.send_event); 473 setiv (send_event, xe->xany.send_event);
545 setiv (serial, xe->xany.serial); 474 setiv (serial, xe->xany.serial);
546 475
555 setuv (root, xe->xmotion.root); 484 setuv (root, xe->xmotion.root);
556 setuv (subwindow, xe->xmotion.subwindow); 485 setuv (subwindow, xe->xmotion.subwindow);
557 setuv (time, xe->xmotion.time); 486 setuv (time, xe->xmotion.time);
558 setiv (x, xe->xmotion.x); 487 setiv (x, xe->xmotion.x);
559 setiv (y, xe->xmotion.y); 488 setiv (y, xe->xmotion.y);
560 setiv (row, xe->xmotion.y / term->fheight); 489 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
561 setiv (col, xe->xmotion.x / term->fwidth); 490 setiv (col, xe->xmotion.x / term->fwidth);
562 setiv (x_root, xe->xmotion.x_root); 491 setiv (x_root, xe->xmotion.x_root);
563 setiv (y_root, xe->xmotion.y_root); 492 setiv (y_root, xe->xmotion.y_root);
564 setuv (state, xe->xmotion.state); 493 setuv (state, xe->xmotion.state);
565 494
598 setuv (above, xe->xconfigure.above); 527 setuv (above, xe->xconfigure.above);
599 break; 528 break;
600 } 529 }
601 530
602 break; 531 break;
532
533 case PropertyNotify:
534 setuv (window, xe->xproperty.window);
535 setuv (atom, xe->xproperty.atom);
536 setuv (time, xe->xproperty.time);
537 setiv (state, xe->xproperty.state);
538 break;
539
540 case ClientMessage:
541 setuv (window, xe->xclient.window);
542 setuv (message_type, xe->xclient.message_type);
543 setuv (format, xe->xclient.format);
544 setuv (l0, xe->xclient.data.l[0]);
545 setuv (l1, xe->xclient.data.l[1]);
546 setuv (l2, xe->xclient.data.l[2]);
547 setuv (l3, xe->xclient.data.l[3]);
548 setuv (l4, xe->xclient.data.l[4]);
549 break;
603 } 550 }
604 551
605 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 552 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
606 } 553 }
607 break; 554 break;
647 else 594 else
648 event_consumed = false; 595 event_consumed = false;
649 596
650 // post-handling of some events 597 // post-handling of some events
651 if (htype == HOOK_REFRESH_BEGIN) 598 if (htype == HOOK_REFRESH_BEGIN)
652 swap_overlays (term); 599 {
600 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
601
602 for (int i = AvFILL (av); i >= 0; i--)
603 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
604 }
653 else if (htype == HOOK_DESTROY) 605 else if (htype == HOOK_DESTROY)
654 { 606 {
655 clearSVptr ((SV *)term->perl.self); 607 clearSVptr ((SV *)term->perl.self);
656 SvREFCNT_dec ((SV *)term->perl.self); 608 SvREFCNT_dec ((SV *)term->perl.self);
609
610 // don't allow further calls
611 term->perl.self = 0;
657 } 612 }
658 613
659 swap (perl_environ, environ); 614 swap (perl_environ, environ);
660 615
661 return event_consumed; 616 return event_consumed;
685# include "optinc.h" 640# include "optinc.h"
686# undef nodef 641# undef nodef
687# undef def 642# undef def
688 643
689 HV *stash = gv_stashpv ("urxvt", 1); 644 HV *stash = gv_stashpv ("urxvt", 1);
690 struct { 645 static const struct {
691 const char *name; 646 const char *name;
692 IV iv; 647 IV iv;
693 } *civ, const_iv[] = { 648 } *civ, const_iv[] = {
694# define const_iv(name) { # name, (IV)name } 649# define const_iv(name) { # name, (IV)name }
695 const_iv (DEFAULT_RSTYLE), 650 const_iv (DEFAULT_RSTYLE),
714 const_iv (Button3Mask), 669 const_iv (Button3Mask),
715 const_iv (Button4Mask), 670 const_iv (Button4Mask),
716 const_iv (Button5Mask), 671 const_iv (Button5Mask),
717 const_iv (AnyModifier), 672 const_iv (AnyModifier),
718 673
719 const_iv (EVENT_NONE), 674 const_iv (NoSymbol),
720 const_iv (EVENT_READ), 675 const_iv (GrabModeSync),
721 const_iv (EVENT_WRITE), 676 const_iv (GrabModeAsync),
722 677
723 const_iv (NoEventMask), 678 const_iv (NoEventMask),
724 const_iv (KeyPressMask), 679 const_iv (KeyPressMask),
725 const_iv (KeyReleaseMask), 680 const_iv (KeyReleaseMask),
726 const_iv (ButtonPressMask), 681 const_iv (ButtonPressMask),
778 const_iv (SelectionRequest), 733 const_iv (SelectionRequest),
779 const_iv (SelectionNotify), 734 const_iv (SelectionNotify),
780 const_iv (ColormapNotify), 735 const_iv (ColormapNotify),
781 const_iv (ClientMessage), 736 const_iv (ClientMessage),
782 const_iv (MappingNotify), 737 const_iv (MappingNotify),
738# if ENABLE_XIM_ONTHESPOT
739 const_iv (XIMReverse),
740 const_iv (XIMUnderline),
741 const_iv (XIMHighlight),
742 const_iv (XIMPrimary),
743 const_iv (XIMSecondary),
744 const_iv (XIMTertiary),
745 const_iv (XIMVisibleToForward),
746 const_iv (XIMVisibleToBackword),
747 const_iv (XIMVisibleToCenter),
748# if 0
749 const_iv (XIMForwardChar),
750 const_iv (XIMBackwardChar),
751 const_iv (XIMForwardWord),
752 const_iv (XIMBackwardWord),
753 const_iv (XIMCaretUp),
754 const_iv (XIMCaretDown),
755 const_iv (XIMNextLine),
756 const_iv (XIMPreviousLine),
757 const_iv (XIMLineStart),
758 const_iv (XIMLineEnd),
759 const_iv (XIMAbsolutePosition),
760 const_iv (XIMDontChange),
761# endif
762# endif
783 }; 763 };
784 764
785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 765 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
786 civ-- > const_iv; )
787 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 766 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
788} 767}
789 768
790void 769void
791warn (const char *msg) 770warn (const char *msg)
822 RETVAL 801 RETVAL
823 802
824int 803int
825SET_FGCOLOR (int rend, int new_color) 804SET_FGCOLOR (int rend, int new_color)
826 CODE: 805 CODE:
827 RETVAL = SET_FGCOLOR (rend, new_color); 806 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
828 OUTPUT: 807 OUTPUT:
829 RETVAL 808 RETVAL
830 809
831int 810int
832SET_BGCOLOR (int rend, int new_color) 811SET_BGCOLOR (int rend, int new_color)
833 CODE: 812 CODE:
834 RETVAL = SET_BGCOLOR (rend, new_color); 813 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
835 OUTPUT: 814 OUTPUT:
836 RETVAL 815 RETVAL
837 816
838int 817int
839GET_CUSTOM (int rend) 818GET_CUSTOM (int rend)
840 CODE: 819 CODE:
841 RETVAL = (rend && RS_customMask) >> RS_customShift; 820 RETVAL = (rend & RS_customMask) >> RS_customShift;
842 OUTPUT: 821 OUTPUT:
843 RETVAL 822 RETVAL
844 823
845int 824int
846SET_CUSTOM (int rend, int new_value) 825SET_CUSTOM (int rend, int new_value)
853 | ((new_value << RS_customShift) & RS_customMask); 832 | ((new_value << RS_customShift) & RS_customMask);
854} 833}
855 OUTPUT: 834 OUTPUT:
856 RETVAL 835 RETVAL
857 836
837void
838termlist ()
839 PPCODE:
840{
841 EXTEND (SP, rxvt_term::termlist.size ());
842
843 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
844 if ((*t)->perl.self)
845 PUSHs (sv_2mortal (newSVterm (*t)));
846}
847
858MODULE = urxvt PACKAGE = urxvt::term 848MODULE = urxvt PACKAGE = urxvt::term
859 849
860SV * 850SV *
861_new (...) 851_new (AV *env, AV *arg)
862 CODE: 852 CODE:
863{ 853{
864 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
865 croak ("first argument to urxvt::term->_new must be arrayref");
866
867 rxvt_term *term = new rxvt_term; 854 rxvt_term *term = new rxvt_term;
868 855
869 term->argv = new stringvec; 856 stringvec *argv = new stringvec;
870 term->envv = new stringvec; 857 stringvec *envv = new stringvec;
871 858
872 for (int i = 1; i < items; i++) 859 for (int i = 0; i <= AvFILL (arg); i++)
873 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 860 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
874 861
875 AV *envv = (AV *)SvRV (ST (0));
876 for (int i = av_len (envv) + 1; i--; ) 862 for (int i = AvFILL (env) + 1; i--; )
877 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 863 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
878 864
879 term->envv->push_back (0); 865 envv->push_back (0);
880 866
881 bool success; 867 bool success;
882 868
883 try 869 try
884 { 870 {
885 success = term->init (term->argv->size (), term->argv->begin ()); 871 success = term->init (argv, envv);
886 } 872 }
887 catch (const class rxvt_failure_exception &e) 873 catch (const class rxvt_failure_exception &e)
888 { 874 {
889 success = false; 875 success = false;
890 } 876 }
902 RETVAL 888 RETVAL
903 889
904void 890void
905rxvt_term::destroy () 891rxvt_term::destroy ()
906 892
907#if ENABLE_PERL_FRILLS
908
909void
910rxvt_term::XListProperties (U32 window)
911 PPCODE:
912{
913 int count;
914 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
915
916 EXTEND (SP, count);
917 while (count--)
918 PUSHs (newSVuv ((U32)props [count]));
919
920 XFree (props);
921}
922
923void
924rxvt_term::XGetWindowProperty (U32 window, U32 property)
925 PPCODE:
926{
927 Atom type;
928 int format;
929 unsigned long nitems;
930 unsigned long bytes_after;
931 unsigned char *prop;
932 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
933 0, 1<<30, 0, AnyPropertyType,
934 &type, &format, &nitems, &bytes_after, &prop);
935 if (type != None)
936 {
937 EXTEND (SP, 3);
938 PUSHs (newSVuv ((U32)type));
939 PUSHs (newSViv (format));
940 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
941 XFree (prop);
942 }
943}
944
945void
946rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
947 CODE:
948{
949 STRLEN len;
950 char *data_ = SvPVbyte (data, len);
951
952 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
953 type, format, PropModeReplace,
954 (unsigned char *)data, len * 8 / format);
955}
956
957void
958rxvt_term::XDeleteProperty (U32 window, U32 property)
959 CODE:
960 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
961
962U32
963rxvt_term::DefaultRootWindow ()
964 CODE:
965 RETVAL = (U32)THIS->display->root;
966 OUTPUT:
967 RETVAL
968
969U32
970rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
971 CODE:
972 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
973 x, y, width, height, 0,
974 THIS->pix_colors_focused[Color_border],
975 THIS->pix_colors_focused[Color_border]);
976 OUTPUT:
977 RETVAL
978
979void
980rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
981 CODE:
982 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
983
984void
985rxvt_term::XMapWindow (U32 window)
986 CODE:
987 XMapWindow (THIS->display->display, (Window)window);
988
989void
990rxvt_term::XUnmapWindow (U32 window)
991 CODE:
992 XUnmapWindow (THIS->display->display, (Window)window);
993
994#endif
995
996void 893void
997rxvt_term::set_should_invoke (int htype, int inc) 894rxvt_term::set_should_invoke (int htype, int inc)
998 CODE: 895 CODE:
999 THIS->perl.should_invoke [htype] += inc; 896 THIS->perl.should_invoke [htype] += inc;
1000 897
1001void 898int
1002rxvt_term::grab_button (int button, U32 modifiers) 899rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1003 CODE: 900 CODE:
1004 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 901 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1005 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 902 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1006 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 903 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
904 OUTPUT: RETVAL
905
906int
907rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
908 CODE:
909 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
910 OUTPUT: RETVAL
911
912void
913rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
914 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
915 CODE:
916 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
917
918void
919rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
920 CODE:
921 XUngrabKey (THIS->dpy, keycode, modifiers, window);
922
923void
924rxvt_term::XUngrabKeyboard (Time eventtime)
925 CODE:
926 XUngrabKeyboard (THIS->dpy, eventtime);
1007 927
1008bool 928bool
1009rxvt_term::grab (U32 eventtime, int sync = 0) 929rxvt_term::grab (Time eventtime, int sync = 0)
1010 CODE: 930 CODE:
1011{ 931{
1012 int mode = sync ? GrabModeSync : GrabModeAsync; 932 int mode = sync ? GrabModeSync : GrabModeAsync;
1013 933
1014 THIS->perl.grabtime = 0; 934 THIS->perl.grabtime = 0;
1015 935
1016 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 936 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1017 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 937 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1018 mode, mode, None, GRAB_CURSOR, eventtime)) 938 mode, mode, None, GRAB_CURSOR, eventtime))
1019 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 939 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1020 THIS->perl.grabtime = eventtime; 940 THIS->perl.grabtime = eventtime;
1021 else 941 else
1022 XUngrabPointer (THIS->display->display, eventtime); 942 XUngrabPointer (THIS->dpy, eventtime);
1023 943
1024 RETVAL = !!THIS->perl.grabtime; 944 RETVAL = !!THIS->perl.grabtime;
1025} 945}
1026 OUTPUT: 946 OUTPUT:
1027 RETVAL 947 RETVAL
1028 948
1029void 949void
1030rxvt_term::allow_events_async () 950rxvt_term::allow_events_async ()
1031 CODE: 951 CODE:
1032 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 952 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1033 953
1034void 954void
1035rxvt_term::allow_events_sync () 955rxvt_term::allow_events_sync ()
1036 CODE: 956 CODE:
1037 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 957 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1038 958
1039void 959void
1040rxvt_term::allow_events_replay () 960rxvt_term::allow_events_replay ()
1041 CODE: 961 CODE:
1042 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 962 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1043 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1044 964
1045void 965void
1046rxvt_term::ungrab () 966rxvt_term::ungrab ()
1047 CODE: 967 CODE:
1048 ungrab (THIS); 968 ungrab (THIS);
969
970int
971rxvt_term::XStringToKeysym (char *string)
972 CODE:
973 RETVAL = XStringToKeysym (string);
974 OUTPUT: RETVAL
975
976char *
977rxvt_term::XKeysymToString (int sym)
978 CODE:
979 RETVAL = XKeysymToString (sym);
980 OUTPUT: RETVAL
981
982int
983rxvt_term::XKeysymToKeycode (int sym)
984 CODE:
985 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
986 OUTPUT: RETVAL
987
988int
989rxvt_term::XKeycodeToKeysym (int code, int index)
990 CODE:
991 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
992 OUTPUT: RETVAL
1049 993
1050int 994int
1051rxvt_term::strwidth (SV *str) 995rxvt_term::strwidth (SV *str)
1052 CODE: 996 CODE:
1053{ 997{
1054 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1055 999
1056 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1057 RETVAL = wcswidth (wstr, wcslen (wstr)); 1001 RETVAL = 0;
1002 for (wchar_t *wc = wstr; *wc; wc++)
1003 {
1004 int w = WCWIDTH (*wc);
1005
1006 if (w)
1007 RETVAL += max (w, 1);
1008 }
1058 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1059 1010
1060 free (wstr); 1011 free (wstr);
1061} 1012}
1062 OUTPUT: 1013 OUTPUT:
1092 rxvt_pop_locale (); 1043 rxvt_pop_locale ();
1093 1044
1094 RETVAL = wcs2sv (wstr); 1045 RETVAL = wcs2sv (wstr);
1095 free (wstr); 1046 free (wstr);
1096} 1047}
1048 OUTPUT:
1049 RETVAL
1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1097 OUTPUT: 1055 OUTPUT:
1098 RETVAL 1056 RETVAL
1099 1057
1100#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1101 1059
1106#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1107#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1108#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1109#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1110#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1111#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1072#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1112#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1073#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1113#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1074#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1114 1075
1115int 1076int
1122 fbase = TERM_OFFSET_fbase 1083 fbase = TERM_OFFSET_fbase
1123 nrow = TERM_OFFSET_nrow 1084 nrow = TERM_OFFSET_nrow
1124 ncol = TERM_OFFSET_ncol 1085 ncol = TERM_OFFSET_ncol
1125 focus = TERM_OFFSET_focus 1086 focus = TERM_OFFSET_focus
1126 mapped = TERM_OFFSET_mapped 1087 mapped = TERM_OFFSET_mapped
1088 int_bwidth = TERM_OFFSET_int_bwidth
1089 ext_bwidth = TERM_OFFSET_ext_bwidth
1090 lineSpace = TERM_OFFSET_lineSpace
1127 saveLines = TERM_OFFSET_saveLines 1091 saveLines = TERM_OFFSET_saveLines
1128 total_rows = TERM_OFFSET_total_rows 1092 total_rows = TERM_OFFSET_total_rows
1129 top_row = TERM_OFFSET_top_row 1093 top_row = TERM_OFFSET_top_row
1130 CODE: 1094 CODE:
1131 RETVAL = *(int *)((char *)THIS + ix); 1095 RETVAL = *(int *)((char *)THIS + ix);
1136rxvt_term::ModLevel3Mask () 1100rxvt_term::ModLevel3Mask ()
1137 ALIAS: 1101 ALIAS:
1138 ModLevel3Mask = 0 1102 ModLevel3Mask = 0
1139 ModMetaMask = 1 1103 ModMetaMask = 1
1140 ModNumLockMask = 2 1104 ModNumLockMask = 2
1105 current_screen = 3
1106 hidden_cursor = 4
1141 CODE: 1107 CODE:
1142 switch (ix) 1108 switch (ix)
1143 { 1109 {
1144 case 0: RETVAL = THIS->ModLevel3Mask; break; 1110 case 0: RETVAL = THIS->ModLevel3Mask; break;
1145 case 1: RETVAL = THIS->ModMetaMask; break; 1111 case 1: RETVAL = THIS->ModMetaMask; break;
1146 case 2: RETVAL = THIS->ModNumLockMask; break; 1112 case 2: RETVAL = THIS->ModNumLockMask; break;
1113 case 3: RETVAL = THIS->current_screen; break;
1114 case 4: RETVAL = THIS->hidden_cursor; break;
1147 } 1115 }
1148 OUTPUT: 1116 OUTPUT:
1149 RETVAL 1117 RETVAL
1150 1118
1151char * 1119char *
1161 } 1129 }
1162 OUTPUT: 1130 OUTPUT:
1163 RETVAL 1131 RETVAL
1164 1132
1165SV * 1133SV *
1166rxvt_term::_env () 1134rxvt_term::envv ()
1135 ALIAS:
1136 argv = 1
1167 CODE: 1137 PPCODE:
1168{ 1138{
1169 if (THIS->envv) 1139 stringvec *vec = ix ? THIS->argv : THIS->envv;
1170 {
1171 AV *av = newAV ();
1172 1140
1141 EXTEND (SP, vec->size ());
1142
1173 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1143 for (char **i = vec->begin (); i != vec->end (); ++i)
1174 if (*i) 1144 if (*i)
1175 av_push (av, newSVpv (*i, 0)); 1145 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1176
1177 RETVAL = newRV_noinc ((SV *)av);
1178 }
1179 else
1180 RETVAL = &PL_sv_undef;
1181} 1146}
1182 OUTPUT:
1183 RETVAL
1184 1147
1185int 1148int
1186rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1149rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1187 CODE: 1150 CODE:
1188 RETVAL = THIS->pty_ev.events; 1151 RETVAL = THIS->pty_ev.events;
1189 if (events != EVENT_UNDEF) 1152 if (events != EVENT_UNDEF)
1190 THIS->pty_ev.set (events); 1153 THIS->pty_ev.set (events);
1191 OUTPUT: 1154 OUTPUT:
1192 RETVAL 1155 RETVAL
1193 1156
1194U32 1157int
1158rxvt_term::pty_fd ()
1159 CODE:
1160 RETVAL = THIS->pty->pty;
1161 OUTPUT:
1162 RETVAL
1163
1164Window
1195rxvt_term::parent () 1165rxvt_term::parent ()
1196 CODE: 1166 CODE:
1197 RETVAL = (U32)THIS->parent [0]; 1167 RETVAL = THIS->parent [0];
1198 OUTPUT: 1168 OUTPUT:
1199 RETVAL 1169 RETVAL
1200 1170
1201U32 1171Window
1202rxvt_term::vt () 1172rxvt_term::vt ()
1203 CODE: 1173 CODE:
1204 RETVAL = (U32)THIS->vt; 1174 RETVAL = THIS->vt;
1205 OUTPUT: 1175 OUTPUT:
1206 RETVAL 1176 RETVAL
1207 1177
1208void 1178void
1209rxvt_term::vt_emask_add (U32 emask) 1179rxvt_term::vt_emask_add (U32 emask)
1231} 1201}
1232 OUTPUT: 1202 OUTPUT:
1233 RETVAL 1203 RETVAL
1234 1204
1235void 1205void
1206rxvt_term::focus_in ()
1207
1208void
1209rxvt_term::focus_out ()
1210
1211void
1212rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1213 ALIAS:
1214 key_release = 1
1215 CODE:
1216{
1217 XKeyEvent xkey;
1218
1219 memset (&xkey, 0, sizeof (xkey));
1220
1221 xkey.time = time;
1222 xkey.state = state;
1223 xkey.keycode = keycode;
1224
1225 xkey.type = ix ? KeyRelease : KeyPress;
1226 xkey.display = THIS->dpy;
1227 xkey.window = THIS->vt;
1228 xkey.root = THIS->display->root;
1229 xkey.subwindow = THIS->vt;
1230
1231 if (ix)
1232 THIS->key_release (xkey);
1233 else
1234 THIS->key_press (xkey);
1235}
1236
1237void
1236rxvt_term::want_refresh () 1238rxvt_term::want_refresh ()
1237 CODE: 1239 CODE:
1238 THIS->want_refresh = 1; 1240 THIS->want_refresh = 1;
1239 1241
1240void 1242void
1246 1248
1247 line_t &l = ROW(row_number); 1249 line_t &l = ROW(row_number);
1248 1250
1249 if (GIMME_V != G_VOID) 1251 if (GIMME_V != G_VOID)
1250 { 1252 {
1251 wchar_t *wstr = new wchar_t [THIS->ncol]; 1253 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1252 1254
1253 for (int col = 0; col < THIS->ncol; col++) 1255 for (int col = 0; col < THIS->ncol; col++)
1254 wstr [col] = l.t [col]; 1256 wstr [col] = l.t [col];
1255 1257
1256 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1258 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1257
1258 delete [] wstr;
1259 } 1259 }
1260 1260
1261 if (new_text) 1261 if (new_text)
1262 { 1262 {
1263 wchar_t *wstr = sv2wcs (new_text); 1263 wchar_t *wstr = sv2wcs (new_text);
1264 1264
1265 int len = min (wcslen (wstr) - start_ofs, max_len); 1265 int len = min (wcslen (wstr) - start_ofs, max_len);
1266 1266
1267 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1267 if (start_col < 0 || start_col + len > THIS->ncol)
1268 { 1268 {
1269 free (wstr); 1269 free (wstr);
1270 croak ("new_text extends beyond horizontal margins"); 1270 croak ("new_text extends beyond horizontal margins");
1271 } 1271 }
1272 1272
1304 { 1304 {
1305 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1305 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1306 croak ("new_rend must be arrayref"); 1306 croak ("new_rend must be arrayref");
1307 1307
1308 AV *av = (AV *)SvRV (new_rend); 1308 AV *av = (AV *)SvRV (new_rend);
1309 int len = min (av_len (av) + 1 - start_ofs, max_len); 1309 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1310 1310
1311 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1311 if (start_col < 0 || start_col + len > THIS->ncol)
1312 croak ("new_rend array extends beyond horizontal margins"); 1312 croak ("new_rend array extends beyond horizontal margins");
1313 1313
1314 for (int col = start_col; col < start_col + len; col++) 1314 for (int col = start_col; col < start_col + len; col++)
1315 { 1315 {
1316 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1316 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1356rxvt_term::special_encode (SV *string) 1356rxvt_term::special_encode (SV *string)
1357 CODE: 1357 CODE:
1358{ 1358{
1359 wchar_t *wstr = sv2wcs (string); 1359 wchar_t *wstr = sv2wcs (string);
1360 int wlen = wcslen (wstr); 1360 int wlen = wcslen (wstr);
1361 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1361 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1362 1362
1363 rxvt_push_locale (THIS->locale); 1363 rxvt_push_locale (THIS->locale);
1364 1364
1365 wchar_t *r = rstr; 1365 wchar_t *r = rstr;
1366 for (wchar_t *s = wstr; *s; s++) 1366 for (wchar_t *s = wstr; *s; s++)
1367 {
1368 int w = WCWIDTH (*s);
1369
1367 if (wcwidth (*s) == 0) 1370 if (w == 0)
1368 { 1371 {
1369 if (r == rstr) 1372 if (r == rstr)
1370 croak ("leading combining character unencodable"); 1373 croak ("leading combining character unencodable");
1371 1374
1372 unicode_t n = rxvt_compose (r[-1], *s); 1375 unicode_t n = rxvt_compose (r[-1], *s);
1373 if (n == NOCHAR) 1376 if (n == NOCHAR)
1374 n = rxvt_composite.compose (r[-1], *s); 1377 n = rxvt_composite.compose (r[-1], *s);
1375 1378
1376 r[-1] = n; 1379 r[-1] = n;
1377 } 1380 }
1378#if !UNICODE_3 1381#if !UNICODE_3
1379 else if (*s >= 0x10000) 1382 else if (*s >= 0x10000)
1380 *r++ = rxvt_composite.compose (*s); 1383 *r++ = rxvt_composite.compose (*s);
1381#endif 1384#endif
1382 else 1385 else
1383 *r++ = *s; 1386 *r++ = *s;
1387
1388 // the *2 above only allows wcwidth <= 2
1389 if (w > 1)
1390 *r++ = NOCHAR;
1391 }
1384 1392
1385 rxvt_pop_locale (); 1393 rxvt_pop_locale ();
1386 1394
1387 RETVAL = wcs2sv (rstr, r - rstr); 1395 RETVAL = wcs2sv (rstr, r - rstr);
1388
1389 delete [] rstr;
1390} 1396}
1391 OUTPUT: 1397 OUTPUT:
1392 RETVAL 1398 RETVAL
1393 1399
1394SV * 1400SV *
1406 else if (IS_COMPOSE (*s)) 1412 else if (IS_COMPOSE (*s))
1407 dlen += rxvt_composite.expand (*s, 0); 1413 dlen += rxvt_composite.expand (*s, 0);
1408 else 1414 else
1409 dlen++; 1415 dlen++;
1410 1416
1411 wchar_t *rstr = new wchar_t [dlen]; 1417 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1412 1418
1413 // decode 1419 // decode
1414 wchar_t *r = rstr; 1420 wchar_t *r = rstr;
1415 for (wchar_t *s = wstr; *s; s++) 1421 for (wchar_t *s = wstr; *s; s++)
1416 if (*s == NOCHAR) 1422 if (*s == NOCHAR)
1419 r += rxvt_composite.expand (*s, r); 1425 r += rxvt_composite.expand (*s, r);
1420 else 1426 else
1421 *r++ = *s; 1427 *r++ = *s;
1422 1428
1423 RETVAL = wcs2sv (rstr, r - rstr); 1429 RETVAL = wcs2sv (rstr, r - rstr);
1424
1425 delete [] rstr;
1426} 1430}
1427 OUTPUT: 1431 OUTPUT:
1428 RETVAL 1432 RETVAL
1429 1433
1430void 1434void
1431rxvt_term::_resource (char *name, int index, SV *newval = 0) 1435rxvt_term::_resource (char *name, int index, SV *newval = 0)
1432 PPCODE: 1436 PPCODE:
1433{ 1437{
1434 struct resval { const char *name; int value; } rslist [] = { 1438 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1435# define def(name) { # name, Rs_ ## name }, 1439# define def(name) { # name, Rs_ ## name },
1436# define reserve(name,count) 1440# define reserve(name,count)
1437# include "rsinc.h" 1441# include "rsinc.h"
1438# undef def 1442# undef def
1439# undef reserve 1443# undef reserve
1440 }; 1444 };
1441 1445
1442 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1446 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1443 1447
1444 do { 1448 do {
1445 if (rs-- == rslist) 1449 if (rs-- == rslist)
1446 croak ("no such resource '%s', requested", name); 1450 croak ("no such resource '%s', requested", name);
1447 } while (strcmp (name, rs->name)); 1451 } while (strcmp (name, rs->name));
1481 if (set) 1485 if (set)
1482 THIS->options |= optval; 1486 THIS->options |= optval;
1483 else 1487 else
1484 THIS->options &= ~optval; 1488 THIS->options &= ~optval;
1485 1489
1490 if (THIS->check_ev.is_active ()) // avoid doing this before START
1486 switch (optval) 1491 switch (optval)
1487 { 1492 {
1488 case Opt_skipBuiltinGlyphs: 1493 case Opt_skipBuiltinGlyphs:
1489 THIS->set_fonts (); 1494 THIS->set_fonts ();
1490 THIS->scr_remap_chars (); 1495 THIS->scr_remap_chars ();
1491 THIS->scr_touch (true); 1496 THIS->scr_touch (true);
1492 THIS->want_refresh = 1; 1497 THIS->want_refresh = 1;
1493 break; 1498 break;
1494 1499
1495 case Opt_cursorUnderline: 1500 case Opt_cursorUnderline:
1496 THIS->want_refresh = 1; 1501 THIS->want_refresh = 1;
1497 break; 1502 break;
1498 1503
1499# case Opt_scrollBar_floating: 1504# case Opt_scrollBar_floating:
1500# case Opt_scrollBar_right: 1505# case Opt_scrollBar_right:
1501# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1506# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1502# break; 1507# break;
1503 } 1508 }
1504 } 1509 }
1505} 1510}
1506 OUTPUT: 1511 OUTPUT:
1507 RETVAL 1512 RETVAL
1508 1513
1539 if (items == 3) 1544 if (items == 3)
1540 { 1545 {
1541 rc.row = SvIV (ST (1)); 1546 rc.row = SvIV (ST (1));
1542 rc.col = SvIV (ST (2)); 1547 rc.col = SvIV (ST (2));
1543 1548
1544 if (ix == 2 && rc.col == 0) 1549 if (ix == 2)
1545 { 1550 {
1551 if (rc.col == 0)
1552 {
1553 // col == 0 means end of previous line
1546 rc.row--; 1554 rc.row--;
1547 rc.col = THIS->ncol; 1555 rc.col = THIS->ncol;
1556 }
1557 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1558 && rc.col > ROW(rc.row).l)
1559 {
1560 // col >= length means while line and add newline
1561 rc.col = THIS->ncol;
1562 }
1548 } 1563 }
1549 1564
1550 clamp_it (rc.col, 0, THIS->ncol); 1565 clamp_it (rc.col, 0, THIS->ncol);
1551 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1566 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1552 1567
1560 CODE: 1575 CODE:
1561 RETVAL = THIS->charsets [THIS->screen.charset]; 1576 RETVAL = THIS->charsets [THIS->screen.charset];
1562 OUTPUT: 1577 OUTPUT:
1563 RETVAL 1578 RETVAL
1564 1579
1565#void 1580void
1566#rxvt_term::selection_clear () 1581rxvt_term::selection_clear ()
1567 1582
1568void 1583void
1569rxvt_term::selection_make (U32 eventtime, bool rect = false) 1584rxvt_term::selection_make (Time eventtime, bool rect = false)
1570 CODE: 1585 CODE:
1571 THIS->selection.op = SELECTION_CONT; 1586 THIS->selection.op = SELECTION_CONT;
1572 THIS->selection.rect = rect; 1587 THIS->selection.rect = rect;
1573 THIS->selection_make (eventtime); 1588 THIS->selection_make (eventtime);
1574 1589
1575int 1590int
1576rxvt_term::selection_grab (U32 eventtime) 1591rxvt_term::selection_grab (Time eventtime)
1577 1592
1578void 1593void
1579rxvt_term::selection (SV *newtext = 0) 1594rxvt_term::selection (SV *newtext = 0)
1580 PPCODE: 1595 PPCODE:
1581{ 1596{
1599void 1614void
1600rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1615rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1601 1616
1602void 1617void
1603rxvt_term::scr_bell () 1618rxvt_term::scr_bell ()
1619
1620void
1621rxvt_term::scr_change_screen (int screen)
1604 1622
1605void 1623void
1606rxvt_term::scr_add_lines (SV *string) 1624rxvt_term::scr_add_lines (SV *string)
1607 CODE: 1625 CODE:
1608{ 1626{
1649 o->self = (HV *)SvRV (RETVAL); 1667 o->self = (HV *)SvRV (RETVAL);
1650} 1668}
1651 OUTPUT: 1669 OUTPUT:
1652 RETVAL 1670 RETVAL
1653 1671
1672#############################################################################
1673# Various X Utility Functions
1674#############################################################################
1675
1676void
1677rxvt_term::XListProperties (Window window)
1678 PPCODE:
1679{
1680 int count;
1681 Atom *props = XListProperties (THIS->dpy, window, &count);
1682
1683 EXTEND (SP, count);
1684 while (count--)
1685 PUSHs (newSVuv ((U32)props [count]));
1686
1687 XFree (props);
1688}
1689
1690void
1691rxvt_term::XGetWindowProperty (Window window, Atom property)
1692 PPCODE:
1693{
1694 Atom type;
1695 int format;
1696 unsigned long nitems;
1697 unsigned long bytes_after;
1698 unsigned char *prop;
1699
1700 XGetWindowProperty (THIS->dpy, window, property,
1701 0, 1<<24, 0, AnyPropertyType,
1702 &type, &format, &nitems, &bytes_after, &prop);
1703
1704 if (type != None)
1705 {
1706 int elemsize = format == 16 ? sizeof (short)
1707 : format == 32 ? sizeof (long)
1708 : 1;
1709
1710 EXTEND (SP, 3);
1711 PUSHs (newSVuv ((U32)type));
1712 PUSHs (newSViv (format));
1713 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1714 XFree (prop);
1715 }
1716}
1717
1718void
1719rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1720 CODE:
1721{
1722 STRLEN len;
1723 char *data_ = SvPVbyte (data, len);
1724
1725 int elemsize = format == 16 ? sizeof (short)
1726 : format == 32 ? sizeof (long)
1727 : 1;
1728
1729 XChangeProperty (THIS->dpy, window, property,
1730 type, format, PropModeReplace,
1731 (unsigned char *)data_, len / elemsize);
1732}
1733
1734Atom
1735XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1736 C_ARGS: term->dpy, atom_name, only_if_exists
1737
1738char *
1739XGetAtomName (rxvt_term *term, Atom atom)
1740 C_ARGS: term->dpy, atom
1741 CLEANUP:
1742 XFree (RETVAL);
1743
1744void
1745XDeleteProperty (rxvt_term *term, Window window, Atom property)
1746 C_ARGS: term->dpy, window, property
1747
1748Window
1749rxvt_term::DefaultRootWindow ()
1750 CODE:
1751 RETVAL = THIS->display->root;
1752 OUTPUT:
1753 RETVAL
1754
1755#if 0
1756
1757Window
1758XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1759 C_ARGS: term->dpy, (Window)parent,
1760 x, y, width, height, 0,
1761 term->pix_colors_focused[Color_border],
1762 term->pix_colors_focused[Color_border]
1763
1764#endif
1765
1766void
1767XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1768 C_ARGS: term->dpy, window, parent, x, y
1769
1770void
1771XMapWindow (rxvt_term *term, Window window)
1772 C_ARGS: term->dpy, window
1773
1774void
1775XUnmapWindow (rxvt_term *term, Window window)
1776 C_ARGS: term->dpy, window
1777
1778void
1779XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1780 C_ARGS: term->dpy, window, x, y, width, height
1781
1782void
1783rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1784 CODE:
1785{
1786 XWindowAttributes attr;
1787 XGetWindowAttributes (THIS->dpy, window, &attr);
1788 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1789}
1790
1791void
1792rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1793 PPCODE:
1794{
1795 int dx, dy;
1796 Window child;
1797
1798 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1799 {
1800 EXTEND (SP, 3);
1801 PUSHs (newSViv (dx));
1802 PUSHs (newSViv (dy));
1803 PUSHs (newSVuv (child));
1804 }
1805}
1806
1807#############################################################################
1808# urxvt::overlay
1809#############################################################################
1810
1654MODULE = urxvt PACKAGE = urxvt::overlay 1811MODULE = urxvt PACKAGE = urxvt::overlay
1655 1812
1656void 1813void
1657overlay::set (int x, int y, SV *text, SV *rend = 0) 1814overlay::set (int x, int y, SV *text, SV *rend = 0)
1658 1815
1663overlay::hide () 1820overlay::hide ()
1664 1821
1665void 1822void
1666overlay::DESTROY () 1823overlay::DESTROY ()
1667 1824
1668MODULE = urxvt PACKAGE = urxvt::timer 1825INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1669 1826
1670SV *
1671timer::new ()
1672 CODE:
1673 timer *w = new timer;
1674 w->start (NOW);
1675 RETVAL = newSVptr ((void *)w, "urxvt::timer");
1676 w->self = (HV *)SvRV (RETVAL);
1677 OUTPUT:
1678 RETVAL
1679
1680timer *
1681timer::cb (SV *cb)
1682 CODE:
1683 THIS->cb (cb);
1684 RETVAL = THIS;
1685 OUTPUT:
1686 RETVAL
1687
1688NV
1689timer::at ()
1690 CODE:
1691 RETVAL = THIS->at;
1692 OUTPUT:
1693 RETVAL
1694
1695timer *
1696timer::interval (NV interval)
1697 CODE:
1698 THIS->interval = interval;
1699 RETVAL = THIS;
1700 OUTPUT:
1701 RETVAL
1702
1703timer *
1704timer::set (NV tstamp)
1705 CODE:
1706 THIS->set (tstamp);
1707 RETVAL = THIS;
1708 OUTPUT:
1709 RETVAL
1710
1711timer *
1712timer::start (NV tstamp = THIS->at)
1713 CODE:
1714 THIS->start (tstamp);
1715 RETVAL = THIS;
1716 OUTPUT:
1717 RETVAL
1718
1719timer *
1720timer::after (NV delay)
1721 CODE:
1722 THIS->start (NOW + delay);
1723 OUTPUT:
1724 RETVAL
1725
1726timer *
1727timer::stop ()
1728 CODE:
1729 THIS->stop ();
1730 RETVAL = THIS;
1731 OUTPUT:
1732 RETVAL
1733
1734void
1735timer::DESTROY ()
1736
1737MODULE = urxvt PACKAGE = urxvt::iow
1738
1739SV *
1740iow::new ()
1741 CODE:
1742 iow *w = new iow;
1743 RETVAL = newSVptr ((void *)w, "urxvt::iow");
1744 w->self = (HV *)SvRV (RETVAL);
1745 OUTPUT:
1746 RETVAL
1747
1748iow *
1749iow::cb (SV *cb)
1750 CODE:
1751 THIS->cb (cb);
1752 RETVAL = THIS;
1753 OUTPUT:
1754 RETVAL
1755
1756iow *
1757iow::fd (int fd)
1758 CODE:
1759 THIS->fd = fd;
1760 RETVAL = THIS;
1761 OUTPUT:
1762 RETVAL
1763
1764iow *
1765iow::events (short events)
1766 CODE:
1767 THIS->events = events;
1768 RETVAL = THIS;
1769 OUTPUT:
1770 RETVAL
1771
1772iow *
1773iow::start ()
1774 CODE:
1775 THIS->start ();
1776 RETVAL = THIS;
1777 OUTPUT:
1778 RETVAL
1779
1780iow *
1781iow::stop ()
1782 CODE:
1783 THIS->stop ();
1784 RETVAL = THIS;
1785 OUTPUT:
1786 RETVAL
1787
1788void
1789iow::DESTROY ()
1790
1791

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines