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

Diff Legend

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