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.79 by root, Fri Jan 20 10:27:08 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
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#include <iom_perl.h>
429 308
430///////////////////////////////////////////////////////////////////////////// 309/////////////////////////////////////////////////////////////////////////////
431 310
432struct rxvt_perl_interp rxvt_perl; 311struct rxvt_perl_interp rxvt_perl;
433 312
… …
492static void 371static void
493ungrab (rxvt_term *THIS) 372ungrab (rxvt_term *THIS)
494{ 373{
495 if (THIS->perl.grabtime) 374 if (THIS->perl.grabtime)
496 { 375 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 376 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 377 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 378 THIS->perl.grabtime = 0;
500 } 379 }
501} 380}
502 381
503bool 382bool
… …
554 break; 433 break;
555 434
556 case DT_STR_LEN: 435 case DT_STR_LEN:
557 { 436 {
558 char *str = va_arg (ap, char *); 437 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 438 int len = va_arg (ap, int);
560 439
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 440 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 441 }
563 break; 442 break;
564 443
565 case DT_WCS_LEN: 444 case DT_WCS_LEN:
566 { 445 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 446 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 447 int wlen = va_arg (ap, int);
569 448
570 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))));
571 } 459 }
572 break; 460 break;
573 461
574 case DT_XEVENT: 462 case DT_XEVENT:
575 { 463 {
576 XEvent *xe = va_arg (ap, XEvent *); 464 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 465 HV *hv = newHV ();
578 466
579# 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)
580# 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)
581# 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)
582# undef set 470# undef set
583 471
584 setiv (type, xe->type); 472 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 473 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 474 setiv (serial, xe->xany.serial);
587 475
… …
596 setuv (root, xe->xmotion.root); 484 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 485 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 486 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 487 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 488 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight); 489 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 490 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 491 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 492 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 493 setuv (state, xe->xmotion.state);
606 494
… …
638 setiv (height, xe->xconfigure.height); 526 setiv (height, xe->xconfigure.height);
639 setuv (above, xe->xconfigure.above); 527 setuv (above, xe->xconfigure.above);
640 break; 528 break;
641 } 529 }
642 530
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]);
643 break; 549 break;
644 } 550 }
645 551
646 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 552 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
647 } 553 }
… …
698 } 604 }
699 else if (htype == HOOK_DESTROY) 605 else if (htype == HOOK_DESTROY)
700 { 606 {
701 clearSVptr ((SV *)term->perl.self); 607 clearSVptr ((SV *)term->perl.self);
702 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;
703 } 612 }
704 613
705 swap (perl_environ, environ); 614 swap (perl_environ, environ);
706 615
707 return event_consumed; 616 return event_consumed;
… …
731# include "optinc.h" 640# include "optinc.h"
732# undef nodef 641# undef nodef
733# undef def 642# undef def
734 643
735 HV *stash = gv_stashpv ("urxvt", 1); 644 HV *stash = gv_stashpv ("urxvt", 1);
736 struct { 645 static const struct {
737 const char *name; 646 const char *name;
738 IV iv; 647 IV iv;
739 } *civ, const_iv[] = { 648 } *civ, const_iv[] = {
740# define const_iv(name) { # name, (IV)name } 649# define const_iv(name) { # name, (IV)name }
741 const_iv (DEFAULT_RSTYLE), 650 const_iv (DEFAULT_RSTYLE),
… …
760 const_iv (Button3Mask), 669 const_iv (Button3Mask),
761 const_iv (Button4Mask), 670 const_iv (Button4Mask),
762 const_iv (Button5Mask), 671 const_iv (Button5Mask),
763 const_iv (AnyModifier), 672 const_iv (AnyModifier),
764 673
765 const_iv (EVENT_NONE), 674 const_iv (NoSymbol),
766 const_iv (EVENT_READ), 675 const_iv (GrabModeSync),
767 const_iv (EVENT_WRITE), 676 const_iv (GrabModeAsync),
768 677
769 const_iv (NoEventMask), 678 const_iv (NoEventMask),
770 const_iv (KeyPressMask), 679 const_iv (KeyPressMask),
771 const_iv (KeyReleaseMask), 680 const_iv (KeyReleaseMask),
772 const_iv (ButtonPressMask), 681 const_iv (ButtonPressMask),
… …
824 const_iv (SelectionRequest), 733 const_iv (SelectionRequest),
825 const_iv (SelectionNotify), 734 const_iv (SelectionNotify),
826 const_iv (ColormapNotify), 735 const_iv (ColormapNotify),
827 const_iv (ClientMessage), 736 const_iv (ClientMessage),
828 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
829 }; 763 };
830 764
831 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; )
832 civ-- > const_iv; )
833 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 766 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
834} 767}
835 768
836void 769void
837warn (const char *msg) 770warn (const char *msg)
… …
868 RETVAL 801 RETVAL
869 802
870int 803int
871SET_FGCOLOR (int rend, int new_color) 804SET_FGCOLOR (int rend, int new_color)
872 CODE: 805 CODE:
873 RETVAL = SET_FGCOLOR (rend, new_color); 806 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
874 OUTPUT: 807 OUTPUT:
875 RETVAL 808 RETVAL
876 809
877int 810int
878SET_BGCOLOR (int rend, int new_color) 811SET_BGCOLOR (int rend, int new_color)
879 CODE: 812 CODE:
880 RETVAL = SET_BGCOLOR (rend, new_color); 813 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
881 OUTPUT: 814 OUTPUT:
882 RETVAL 815 RETVAL
883 816
884int 817int
885GET_CUSTOM (int rend) 818GET_CUSTOM (int rend)
886 CODE: 819 CODE:
887 RETVAL = (rend && RS_customMask) >> RS_customShift; 820 RETVAL = (rend & RS_customMask) >> RS_customShift;
888 OUTPUT: 821 OUTPUT:
889 RETVAL 822 RETVAL
890 823
891int 824int
892SET_CUSTOM (int rend, int new_value) 825SET_CUSTOM (int rend, int new_value)
… …
899 | ((new_value << RS_customShift) & RS_customMask); 832 | ((new_value << RS_customShift) & RS_customMask);
900} 833}
901 OUTPUT: 834 OUTPUT:
902 RETVAL 835 RETVAL
903 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
904MODULE = urxvt PACKAGE = urxvt::term 848MODULE = urxvt PACKAGE = urxvt::term
905 849
906SV * 850SV *
907_new (...) 851_new (AV *env, AV *arg)
908 CODE: 852 CODE:
909{ 853{
910 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
911 croak ("first argument to urxvt::term->_new must be arrayref");
912
913 rxvt_term *term = new rxvt_term; 854 rxvt_term *term = new rxvt_term;
914 855
915 term->argv = new stringvec; 856 stringvec *argv = new stringvec;
916 term->envv = new stringvec; 857 stringvec *envv = new stringvec;
917 858
918 for (int i = 1; i < items; i++) 859 for (int i = 0; i <= AvFILL (arg); i++)
919 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 860 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
920 861
921 AV *envv = (AV *)SvRV (ST (0));
922 for (int i = AvFILL (envv) + 1; i--; ) 862 for (int i = AvFILL (env) + 1; i--; )
923 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 863 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
924 864
925 term->envv->push_back (0); 865 envv->push_back (0);
926 866
927 bool success; 867 bool success;
928 868
929 try 869 try
930 { 870 {
931 success = term->init (term->argv->size (), term->argv->begin ()); 871 success = term->init (argv, envv);
932 } 872 }
933 catch (const class rxvt_failure_exception &e) 873 catch (const class rxvt_failure_exception &e)
934 { 874 {
935 success = false; 875 success = false;
936 } 876 }
… …
953void 893void
954rxvt_term::set_should_invoke (int htype, int inc) 894rxvt_term::set_should_invoke (int htype, int inc)
955 CODE: 895 CODE:
956 THIS->perl.should_invoke [htype] += inc; 896 THIS->perl.should_invoke [htype] += inc;
957 897
958void 898int
959rxvt_term::grab_button (int button, U32 modifiers) 899rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
960 CODE: 900 CODE:
961 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 901 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
962 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 902 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
963 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);
964 927
965bool 928bool
966rxvt_term::grab (Time eventtime, int sync = 0) 929rxvt_term::grab (Time eventtime, int sync = 0)
967 CODE: 930 CODE:
968{ 931{
969 int mode = sync ? GrabModeSync : GrabModeAsync; 932 int mode = sync ? GrabModeSync : GrabModeAsync;
970 933
971 THIS->perl.grabtime = 0; 934 THIS->perl.grabtime = 0;
972 935
973 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 936 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
974 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 937 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
975 mode, mode, None, GRAB_CURSOR, eventtime)) 938 mode, mode, None, GRAB_CURSOR, eventtime))
976 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 939 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
977 THIS->perl.grabtime = eventtime; 940 THIS->perl.grabtime = eventtime;
978 else 941 else
979 XUngrabPointer (THIS->display->display, eventtime); 942 XUngrabPointer (THIS->dpy, eventtime);
980 943
981 RETVAL = !!THIS->perl.grabtime; 944 RETVAL = !!THIS->perl.grabtime;
982} 945}
983 OUTPUT: 946 OUTPUT:
984 RETVAL 947 RETVAL
985 948
986void 949void
987rxvt_term::allow_events_async () 950rxvt_term::allow_events_async ()
988 CODE: 951 CODE:
989 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 952 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
990 953
991void 954void
992rxvt_term::allow_events_sync () 955rxvt_term::allow_events_sync ()
993 CODE: 956 CODE:
994 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 957 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
995 958
996void 959void
997rxvt_term::allow_events_replay () 960rxvt_term::allow_events_replay ()
998 CODE: 961 CODE:
999 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 962 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1000 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1001 964
1002void 965void
1003rxvt_term::ungrab () 966rxvt_term::ungrab ()
1004 CODE: 967 CODE:
1005 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
1006 993
1007int 994int
1008rxvt_term::strwidth (SV *str) 995rxvt_term::strwidth (SV *str)
1009 CODE: 996 CODE:
1010{ 997{
1011 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1012 999
1013 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1014 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 }
1015 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1016 1010
1017 free (wstr); 1011 free (wstr);
1018} 1012}
1019 OUTPUT: 1013 OUTPUT:
… …
1049 rxvt_pop_locale (); 1043 rxvt_pop_locale ();
1050 1044
1051 RETVAL = wcs2sv (wstr); 1045 RETVAL = wcs2sv (wstr);
1052 free (wstr); 1046 free (wstr);
1053} 1047}
1048 OUTPUT:
1049 RETVAL
1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1054 OUTPUT: 1055 OUTPUT:
1055 RETVAL 1056 RETVAL
1056 1057
1057#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1058 1059
… …
1063#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1064#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1065#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1066#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1067#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)
1068#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1072#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1069#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1073#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1070#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1074#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1071 1075
1072int 1076int
… …
1079 fbase = TERM_OFFSET_fbase 1083 fbase = TERM_OFFSET_fbase
1080 nrow = TERM_OFFSET_nrow 1084 nrow = TERM_OFFSET_nrow
1081 ncol = TERM_OFFSET_ncol 1085 ncol = TERM_OFFSET_ncol
1082 focus = TERM_OFFSET_focus 1086 focus = TERM_OFFSET_focus
1083 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
1084 saveLines = TERM_OFFSET_saveLines 1091 saveLines = TERM_OFFSET_saveLines
1085 total_rows = TERM_OFFSET_total_rows 1092 total_rows = TERM_OFFSET_total_rows
1086 top_row = TERM_OFFSET_top_row 1093 top_row = TERM_OFFSET_top_row
1087 CODE: 1094 CODE:
1088 RETVAL = *(int *)((char *)THIS + ix); 1095 RETVAL = *(int *)((char *)THIS + ix);
… …
1093rxvt_term::ModLevel3Mask () 1100rxvt_term::ModLevel3Mask ()
1094 ALIAS: 1101 ALIAS:
1095 ModLevel3Mask = 0 1102 ModLevel3Mask = 0
1096 ModMetaMask = 1 1103 ModMetaMask = 1
1097 ModNumLockMask = 2 1104 ModNumLockMask = 2
1105 current_screen = 3
1106 hidden_cursor = 4
1098 CODE: 1107 CODE:
1099 switch (ix) 1108 switch (ix)
1100 { 1109 {
1101 case 0: RETVAL = THIS->ModLevel3Mask; break; 1110 case 0: RETVAL = THIS->ModLevel3Mask; break;
1102 case 1: RETVAL = THIS->ModMetaMask; break; 1111 case 1: RETVAL = THIS->ModMetaMask; break;
1103 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;
1104 } 1115 }
1105 OUTPUT: 1116 OUTPUT:
1106 RETVAL 1117 RETVAL
1107 1118
1108char * 1119char *
… …
1118 } 1129 }
1119 OUTPUT: 1130 OUTPUT:
1120 RETVAL 1131 RETVAL
1121 1132
1122SV * 1133SV *
1123rxvt_term::_env () 1134rxvt_term::envv ()
1135 ALIAS:
1136 argv = 1
1124 CODE: 1137 PPCODE:
1125{ 1138{
1126 if (THIS->envv) 1139 stringvec *vec = ix ? THIS->argv : THIS->envv;
1127 {
1128 AV *av = newAV ();
1129 1140
1141 EXTEND (SP, vec->size ());
1142
1130 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1143 for (char **i = vec->begin (); i != vec->end (); ++i)
1131 if (*i) 1144 if (*i)
1132 av_push (av, newSVpv (*i, 0)); 1145 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1133
1134 RETVAL = newRV_noinc ((SV *)av);
1135 }
1136 else
1137 RETVAL = &PL_sv_undef;
1138} 1146}
1139 OUTPUT:
1140 RETVAL
1141 1147
1142int 1148int
1143rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1149rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1144 CODE: 1150 CODE:
1145 RETVAL = THIS->pty_ev.events; 1151 RETVAL = THIS->pty_ev.events;
1146 if (events != EVENT_UNDEF) 1152 if (events != EVENT_UNDEF)
1147 THIS->pty_ev.set (events); 1153 THIS->pty_ev.set (events);
1148 OUTPUT: 1154 OUTPUT:
1149 RETVAL 1155 RETVAL
1150 1156
1157int
1158rxvt_term::pty_fd ()
1159 CODE:
1160 RETVAL = THIS->pty->pty;
1161 OUTPUT:
1162 RETVAL
1163
1151Window 1164Window
1152rxvt_term::parent () 1165rxvt_term::parent ()
1153 CODE: 1166 CODE:
1154 RETVAL = THIS->parent [0]; 1167 RETVAL = THIS->parent [0];
1155 OUTPUT: 1168 OUTPUT:
… …
1188} 1201}
1189 OUTPUT: 1202 OUTPUT:
1190 RETVAL 1203 RETVAL
1191 1204
1192void 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
1193rxvt_term::want_refresh () 1238rxvt_term::want_refresh ()
1194 CODE: 1239 CODE:
1195 THIS->want_refresh = 1; 1240 THIS->want_refresh = 1;
1196 1241
1197void 1242void
… …
1203 1248
1204 line_t &l = ROW(row_number); 1249 line_t &l = ROW(row_number);
1205 1250
1206 if (GIMME_V != G_VOID) 1251 if (GIMME_V != G_VOID)
1207 { 1252 {
1208 wchar_t *wstr = new wchar_t [THIS->ncol]; 1253 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1209 1254
1210 for (int col = 0; col < THIS->ncol; col++) 1255 for (int col = 0; col < THIS->ncol; col++)
1211 wstr [col] = l.t [col]; 1256 wstr [col] = l.t [col];
1212 1257
1213 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1258 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1214
1215 delete [] wstr;
1216 } 1259 }
1217 1260
1218 if (new_text) 1261 if (new_text)
1219 { 1262 {
1220 wchar_t *wstr = sv2wcs (new_text); 1263 wchar_t *wstr = sv2wcs (new_text);
1221 1264
1222 int len = min (wcslen (wstr) - start_ofs, max_len); 1265 int len = min (wcslen (wstr) - start_ofs, max_len);
1223 1266
1224 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1267 if (start_col < 0 || start_col + len > THIS->ncol)
1225 { 1268 {
1226 free (wstr); 1269 free (wstr);
1227 croak ("new_text extends beyond horizontal margins"); 1270 croak ("new_text extends beyond horizontal margins");
1228 } 1271 }
1229 1272
… …
1263 croak ("new_rend must be arrayref"); 1306 croak ("new_rend must be arrayref");
1264 1307
1265 AV *av = (AV *)SvRV (new_rend); 1308 AV *av = (AV *)SvRV (new_rend);
1266 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1309 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1267 1310
1268 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1311 if (start_col < 0 || start_col + len > THIS->ncol)
1269 croak ("new_rend array extends beyond horizontal margins"); 1312 croak ("new_rend array extends beyond horizontal margins");
1270 1313
1271 for (int col = start_col; col < start_col + len; col++) 1314 for (int col = start_col; col < start_col + len; col++)
1272 { 1315 {
1273 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;
… …
1313rxvt_term::special_encode (SV *string) 1356rxvt_term::special_encode (SV *string)
1314 CODE: 1357 CODE:
1315{ 1358{
1316 wchar_t *wstr = sv2wcs (string); 1359 wchar_t *wstr = sv2wcs (string);
1317 int wlen = wcslen (wstr); 1360 int wlen = wcslen (wstr);
1318 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1361 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1319 1362
1320 rxvt_push_locale (THIS->locale); 1363 rxvt_push_locale (THIS->locale);
1321 1364
1322 wchar_t *r = rstr; 1365 wchar_t *r = rstr;
1323 for (wchar_t *s = wstr; *s; s++) 1366 for (wchar_t *s = wstr; *s; s++)
1367 {
1368 int w = WCWIDTH (*s);
1369
1324 if (wcwidth (*s) == 0) 1370 if (w == 0)
1325 { 1371 {
1326 if (r == rstr) 1372 if (r == rstr)
1327 croak ("leading combining character unencodable"); 1373 croak ("leading combining character unencodable");
1328 1374
1329 unicode_t n = rxvt_compose (r[-1], *s); 1375 unicode_t n = rxvt_compose (r[-1], *s);
1330 if (n == NOCHAR) 1376 if (n == NOCHAR)
1331 n = rxvt_composite.compose (r[-1], *s); 1377 n = rxvt_composite.compose (r[-1], *s);
1332 1378
1333 r[-1] = n; 1379 r[-1] = n;
1334 } 1380 }
1335#if !UNICODE_3 1381#if !UNICODE_3
1336 else if (*s >= 0x10000) 1382 else if (*s >= 0x10000)
1337 *r++ = rxvt_composite.compose (*s); 1383 *r++ = rxvt_composite.compose (*s);
1338#endif 1384#endif
1339 else 1385 else
1340 *r++ = *s; 1386 *r++ = *s;
1387
1388 // the *2 above only allows wcwidth <= 2
1389 if (w > 1)
1390 *r++ = NOCHAR;
1391 }
1341 1392
1342 rxvt_pop_locale (); 1393 rxvt_pop_locale ();
1343 1394
1344 RETVAL = wcs2sv (rstr, r - rstr); 1395 RETVAL = wcs2sv (rstr, r - rstr);
1345
1346 delete [] rstr;
1347} 1396}
1348 OUTPUT: 1397 OUTPUT:
1349 RETVAL 1398 RETVAL
1350 1399
1351SV * 1400SV *
… …
1363 else if (IS_COMPOSE (*s)) 1412 else if (IS_COMPOSE (*s))
1364 dlen += rxvt_composite.expand (*s, 0); 1413 dlen += rxvt_composite.expand (*s, 0);
1365 else 1414 else
1366 dlen++; 1415 dlen++;
1367 1416
1368 wchar_t *rstr = new wchar_t [dlen]; 1417 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1369 1418
1370 // decode 1419 // decode
1371 wchar_t *r = rstr; 1420 wchar_t *r = rstr;
1372 for (wchar_t *s = wstr; *s; s++) 1421 for (wchar_t *s = wstr; *s; s++)
1373 if (*s == NOCHAR) 1422 if (*s == NOCHAR)
… …
1376 r += rxvt_composite.expand (*s, r); 1425 r += rxvt_composite.expand (*s, r);
1377 else 1426 else
1378 *r++ = *s; 1427 *r++ = *s;
1379 1428
1380 RETVAL = wcs2sv (rstr, r - rstr); 1429 RETVAL = wcs2sv (rstr, r - rstr);
1381
1382 delete [] rstr;
1383} 1430}
1384 OUTPUT: 1431 OUTPUT:
1385 RETVAL 1432 RETVAL
1386 1433
1387void 1434void
1388rxvt_term::_resource (char *name, int index, SV *newval = 0) 1435rxvt_term::_resource (char *name, int index, SV *newval = 0)
1389 PPCODE: 1436 PPCODE:
1390{ 1437{
1391 struct resval { const char *name; int value; } rslist [] = { 1438 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1392# define def(name) { # name, Rs_ ## name }, 1439# define def(name) { # name, Rs_ ## name },
1393# define reserve(name,count) 1440# define reserve(name,count)
1394# include "rsinc.h" 1441# include "rsinc.h"
1395# undef def 1442# undef def
1396# undef reserve 1443# undef reserve
1397 }; 1444 };
1398 1445
1399 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1446 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1400 1447
1401 do { 1448 do {
1402 if (rs-- == rslist) 1449 if (rs-- == rslist)
1403 croak ("no such resource '%s', requested", name); 1450 croak ("no such resource '%s', requested", name);
1404 } while (strcmp (name, rs->name)); 1451 } while (strcmp (name, rs->name));
… …
1497 if (items == 3) 1544 if (items == 3)
1498 { 1545 {
1499 rc.row = SvIV (ST (1)); 1546 rc.row = SvIV (ST (1));
1500 rc.col = SvIV (ST (2)); 1547 rc.col = SvIV (ST (2));
1501 1548
1502 if (ix == 2 && rc.col == 0) 1549 if (ix == 2)
1503 { 1550 {
1551 if (rc.col == 0)
1552 {
1553 // col == 0 means end of previous line
1504 rc.row--; 1554 rc.row--;
1505 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 }
1506 } 1563 }
1507 1564
1508 clamp_it (rc.col, 0, THIS->ncol); 1565 clamp_it (rc.col, 0, THIS->ncol);
1509 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1566 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1510 1567
… …
1518 CODE: 1575 CODE:
1519 RETVAL = THIS->charsets [THIS->screen.charset]; 1576 RETVAL = THIS->charsets [THIS->screen.charset];
1520 OUTPUT: 1577 OUTPUT:
1521 RETVAL 1578 RETVAL
1522 1579
1523#void 1580void
1524#rxvt_term::selection_clear () 1581rxvt_term::selection_clear ()
1525 1582
1526void 1583void
1527rxvt_term::selection_make (Time eventtime, bool rect = false) 1584rxvt_term::selection_make (Time eventtime, bool rect = false)
1528 CODE: 1585 CODE:
1529 THIS->selection.op = SELECTION_CONT; 1586 THIS->selection.op = SELECTION_CONT;
… …
1557void 1614void
1558rxvt_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)
1559 1616
1560void 1617void
1561rxvt_term::scr_bell () 1618rxvt_term::scr_bell ()
1619
1620void
1621rxvt_term::scr_change_screen (int screen)
1562 1622
1563void 1623void
1564rxvt_term::scr_add_lines (SV *string) 1624rxvt_term::scr_add_lines (SV *string)
1565 CODE: 1625 CODE:
1566{ 1626{
… …
1616void 1676void
1617rxvt_term::XListProperties (Window window) 1677rxvt_term::XListProperties (Window window)
1618 PPCODE: 1678 PPCODE:
1619{ 1679{
1620 int count; 1680 int count;
1621 Atom *props = XListProperties (THIS->display->display, window, &count); 1681 Atom *props = XListProperties (THIS->dpy, window, &count);
1622 1682
1623 EXTEND (SP, count); 1683 EXTEND (SP, count);
1624 while (count--) 1684 while (count--)
1625 PUSHs (newSVuv ((U32)props [count])); 1685 PUSHs (newSVuv ((U32)props [count]));
1626 1686
… …
1634 Atom type; 1694 Atom type;
1635 int format; 1695 int format;
1636 unsigned long nitems; 1696 unsigned long nitems;
1637 unsigned long bytes_after; 1697 unsigned long bytes_after;
1638 unsigned char *prop; 1698 unsigned char *prop;
1699
1639 XGetWindowProperty (THIS->display->display, window, property, 1700 XGetWindowProperty (THIS->dpy, window, property,
1640 0, 1<<30, 0, AnyPropertyType, 1701 0, 1<<24, 0, AnyPropertyType,
1641 &type, &format, &nitems, &bytes_after, &prop); 1702 &type, &format, &nitems, &bytes_after, &prop);
1703
1642 if (type != None) 1704 if (type != None)
1643 { 1705 {
1706 int elemsize = format == 16 ? sizeof (short)
1707 : format == 32 ? sizeof (long)
1708 : 1;
1709
1644 EXTEND (SP, 3); 1710 EXTEND (SP, 3);
1645 PUSHs (newSVuv ((U32)type)); 1711 PUSHs (newSVuv ((U32)type));
1646 PUSHs (newSViv (format)); 1712 PUSHs (newSViv (format));
1647 PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); 1713 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1648 XFree (prop); 1714 XFree (prop);
1649 } 1715 }
1650} 1716}
1651 1717
1652void 1718void
… …
1654 CODE: 1720 CODE:
1655{ 1721{
1656 STRLEN len; 1722 STRLEN len;
1657 char *data_ = SvPVbyte (data, len); 1723 char *data_ = SvPVbyte (data, len);
1658 1724
1725 int elemsize = format == 16 ? sizeof (short)
1726 : format == 32 ? sizeof (long)
1727 : 1;
1728
1659 XChangeProperty (THIS->display->display, window, property, 1729 XChangeProperty (THIS->dpy, window, property,
1660 type, format, PropModeReplace, 1730 type, format, PropModeReplace,
1661 (unsigned char *)data, len * 8 / format); 1731 (unsigned char *)data_, len / elemsize);
1662} 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);
1663 1743
1664void 1744void
1665XDeleteProperty (rxvt_term *term, Window window, Atom property) 1745XDeleteProperty (rxvt_term *term, Window window, Atom property)
1666 C_ARGS: term->display->display, window, property 1746 C_ARGS: term->dpy, window, property
1667 1747
1668Window 1748Window
1669rxvt_term::DefaultRootWindow () 1749rxvt_term::DefaultRootWindow ()
1670 CODE: 1750 CODE:
1671 RETVAL = THIS->display->root; 1751 RETVAL = THIS->display->root;
1672 OUTPUT: 1752 OUTPUT:
1673 RETVAL 1753 RETVAL
1674 1754
1755#if 0
1756
1675Window 1757Window
1676XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1758XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1677 C_ARGS: term->display->display, (Window)parent, 1759 C_ARGS: term->dpy, (Window)parent,
1678 x, y, width, height, 0, 1760 x, y, width, height, 0,
1679 term->pix_colors_focused[Color_border], 1761 term->pix_colors_focused[Color_border],
1680 term->pix_colors_focused[Color_border] 1762 term->pix_colors_focused[Color_border]
1681 1763
1764#endif
1765
1682void 1766void
1683XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1767XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1684 C_ARGS: term->display->display, window, parent, x, y 1768 C_ARGS: term->dpy, window, parent, x, y
1685 1769
1686void 1770void
1687XMapWindow (rxvt_term *term, Window window) 1771XMapWindow (rxvt_term *term, Window window)
1688 C_ARGS: term->display->display, window 1772 C_ARGS: term->dpy, window
1689 1773
1690void 1774void
1691XUnmapWindow (rxvt_term *term, Window window) 1775XUnmapWindow (rxvt_term *term, Window window)
1692 C_ARGS: term->display->display, window 1776 C_ARGS: term->dpy, window
1693 1777
1694void 1778void
1695XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1779XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1696 C_ARGS: term->display->display, (Window)window, x, y, width, 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}
1697 1806
1698############################################################################# 1807#############################################################################
1699# urxvt::overlay 1808# urxvt::overlay
1700############################################################################# 1809#############################################################################
1701 1810
… …
1711overlay::hide () 1820overlay::hide ()
1712 1821
1713void 1822void
1714overlay::DESTROY () 1823overlay::DESTROY ()
1715 1824
1716############################################################################# 1825INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1717# urxvt::watcher
1718#############################################################################
1719 1826
1720MODULE = urxvt PACKAGE = urxvt::watcher
1721
1722CHAINED
1723perl_watcher::cb (SV *cb)
1724 CODE:
1725 THIS->cb (cb);
1726 OUTPUT:
1727 RETVAL
1728
1729#############################################################################
1730# urxvt::timer
1731#############################################################################
1732
1733MODULE = urxvt PACKAGE = urxvt::timer
1734
1735SV *
1736timer::new ()
1737 CODE:
1738 timer *w = new timer;
1739 w->start (NOW);
1740 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1741 w->self = (HV *)SvRV (RETVAL);
1742 OUTPUT:
1743 RETVAL
1744
1745NV
1746timer::at ()
1747 CODE:
1748 RETVAL = THIS->at;
1749 OUTPUT:
1750 RETVAL
1751
1752CHAINED
1753timer::interval (NV interval)
1754 CODE:
1755 THIS->interval = interval;
1756 OUTPUT:
1757 RETVAL
1758
1759CHAINED
1760timer::set (NV tstamp)
1761 CODE:
1762 THIS->set (tstamp);
1763 OUTPUT:
1764 RETVAL
1765
1766CHAINED
1767timer::start (NV tstamp = THIS->at)
1768 CODE:
1769 THIS->start (tstamp);
1770 OUTPUT:
1771 RETVAL
1772
1773CHAINED
1774timer::after (NV delay)
1775 CODE:
1776 THIS->start (NOW + delay);
1777 OUTPUT:
1778 RETVAL
1779
1780CHAINED
1781timer::stop ()
1782 CODE:
1783 THIS->stop ();
1784 OUTPUT:
1785 RETVAL
1786
1787void
1788timer::DESTROY ()
1789
1790#############################################################################
1791# urxvt::iow
1792#############################################################################
1793
1794MODULE = urxvt PACKAGE = urxvt::iow
1795
1796SV *
1797iow::new ()
1798 CODE:
1799 iow *w = new iow;
1800 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1801 w->self = (HV *)SvRV (RETVAL);
1802 OUTPUT:
1803 RETVAL
1804
1805CHAINED
1806iow::fd (int fd)
1807 CODE:
1808 THIS->fd = fd;
1809 OUTPUT:
1810 RETVAL
1811
1812CHAINED
1813iow::events (short events)
1814 CODE:
1815 THIS->events = events;
1816 OUTPUT:
1817 RETVAL
1818
1819CHAINED
1820iow::start ()
1821 CODE:
1822 THIS->start ();
1823 OUTPUT:
1824 RETVAL
1825
1826CHAINED
1827iow::stop ()
1828 CODE:
1829 THIS->stop ();
1830 OUTPUT:
1831 RETVAL
1832
1833void
1834iow::DESTROY ()
1835
1836#############################################################################
1837# urxvt::iw
1838#############################################################################
1839
1840MODULE = urxvt PACKAGE = urxvt::iw
1841
1842SV *
1843iw::new ()
1844 CODE:
1845 iw *w = new iw;
1846 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1847 w->self = (HV *)SvRV (RETVAL);
1848 OUTPUT:
1849 RETVAL
1850
1851CHAINED
1852iow::start ()
1853 CODE:
1854 THIS->start ();
1855 OUTPUT:
1856 RETVAL
1857
1858CHAINED
1859iow::stop ()
1860 CODE:
1861 THIS->stop ();
1862 OUTPUT:
1863 RETVAL
1864
1865void
1866iw::DESTROY ()
1867
1868#############################################################################
1869# urxvt::pw
1870#############################################################################
1871
1872MODULE = urxvt PACKAGE = urxvt::pw
1873
1874SV *
1875pw::new ()
1876 CODE:
1877 pw *w = new pw;
1878 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1879 w->self = (HV *)SvRV (RETVAL);
1880 OUTPUT:
1881 RETVAL
1882
1883CHAINED
1884pw::start (int pid)
1885 CODE:
1886 THIS->start (pid);
1887 OUTPUT:
1888 RETVAL
1889
1890CHAINED
1891iow::stop ()
1892 CODE:
1893 THIS->stop ();
1894 OUTPUT:
1895 RETVAL
1896
1897void
1898pw::DESTROY ()
1899
1900

Diff Legend

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