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.84 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.117 by root, Thu Dec 13 18:24:36 2007 UTC

… …
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h" 34#include "unistd.h"
35 35
36#include "iom.h" 36#include "ev_cpp.h"
37#include "rxvt.h" 37#include "rxvt.h"
38#include "keyboard.h" 38#include "keyboard.h"
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
… …
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
58 56
59static wchar_t * 57static wchar_t *
60sv2wcs (SV *sv) 58sv2wcs (SV *sv)
61{ 59{
… …
75 73
76 return sv; 74 return sv;
77} 75}
78 76
79static SV * 77static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85//TODO: use magic
86static SV *
87newSVptr (void *ptr, const char *klass) 78newSVptr (void *ptr, const char *klass)
88{ 79{
89 HV *hv = newHV (); 80 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 81 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 82 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 104 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 105
115 return (long)mg->mg_ptr; 106 return (long)mg->mg_ptr;
116} 107}
117 108
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 109#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 110#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 111
121///////////////////////////////////////////////////////////////////////////// 112/////////////////////////////////////////////////////////////////////////////
122 113
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
125struct perl_watcher
126{
127 SV *cbsv;
128 HV *self;
129
130 perl_watcher ()
131 : cbsv (0)
132 {
133 }
134
135 ~perl_watcher ()
136 {
137 SvREFCNT_dec (cbsv);
138 }
139
140 void cb (SV *cb)
141 {
142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
144 }
145
146 void invoke (const char *type, SV *self, int arg = -1);
147};
148
149void
150perl_watcher::invoke (const char *type, SV *self, int arg)
151{
152 dSP;
153
154 ENTER;
155 SAVETMPS;
156
157 PUSHMARK (SP);
158
159 XPUSHs (sv_2mortal (self));
160
161 if (arg >= 0)
162 XPUSHs (sv_2mortal (newSViv (arg)));
163
164 PUTBACK;
165 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
166 SPAGAIN;
167
168 PUTBACK;
169 FREETMPS;
170 LEAVE;
171
172 if (SvTRUE (ERRSV))
173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
174}
175
176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
178
179struct timer : perl_watcher, time_watcher
180{
181 tstamp interval;
182
183 timer ()
184 : time_watcher (this, &timer::execute)
185 {
186 }
187
188 void execute (time_watcher &w)
189 {
190 if (interval)
191 start (at + interval);
192
193 invoke ("urxvt::timer", newSVtimer (this));
194 }
195};
196
197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
199
200struct iow : perl_watcher, io_watcher
201{
202 iow ()
203 : io_watcher (this, &iow::execute)
204 {
205 }
206
207 void execute (io_watcher &w, short revents)
208 {
209 invoke ("urxvt::iow", newSViow (this), revents);
210 }
211};
212
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
215
216struct iw : perl_watcher, idle_watcher
217{
218 iw ()
219 : idle_watcher (this, &iw::execute)
220 {
221 }
222
223 void execute (idle_watcher &w)
224 {
225 invoke ("urxvt::iw", newSViw (this));
226 }
227};
228
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
231
232struct pw : perl_watcher, child_watcher
233{
234 pw ()
235 : child_watcher (this, &pw::execute)
236 {
237 }
238
239 void execute (child_watcher &w, int status)
240 {
241 invoke ("urxvt::pw", newSVpw (this), status);
242 }
243};
244
245/////////////////////////////////////////////////////////////////////////////
246
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 114#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 115
249struct overlay { 116class overlay {
250 HV *self;
251 bool visible;
252 rxvt_term *THIS; 117 rxvt_term *THIS;
118 AV *overlay_av;
253 int x, y, w, h; 119 int x, y, w, h;
254 int border; 120 int border;
255 text_t **text; 121 text_t **text;
256 rend_t **rend; 122 rend_t **rend;
257 123
124public:
125 HV *self;
126
258 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 127 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
259 ~overlay (); 128 ~overlay ();
260 129
261 void show (); 130 void show ();
262 void hide (); 131 void hide ();
… …
265 134
266 void set (int x, int y, SV *str, SV *rend); 135 void set (int x, int y, SV *str, SV *rend);
267}; 136};
268 137
269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 138overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
270: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false) 139: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
271{ 140{
141 if (w < 0) w = 0;
142 if (h < 0) h = 0;
143
272 if (border == 2) 144 if (border == 2)
273 { 145 {
274 w += 2; 146 w += 2;
275 h += 2; 147 h += 2;
276 } 148 }
… …
314 *rp++ = r; 186 *rp++ = r;
315 } 187 }
316 } 188 }
317 189
318 show (); 190 show ();
319 THIS->want_refresh = 1;
320} 191}
321 192
322overlay::~overlay () 193overlay::~overlay ()
323{ 194{
324 hide (); 195 hide ();
… …
329 delete [] rend[y]; 200 delete [] rend[y];
330 } 201 }
331 202
332 delete [] text; 203 delete [] text;
333 delete [] rend; 204 delete [] rend;
205}
206
207void
208overlay::show ()
209{
210 if (overlay_av)
211 return;
212
213 overlay_av = (AV *)SvREFCNT_inc (SvRV (
214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
215 ));
216 av_push (overlay_av, newSViv ((long)this));
334 217
335 THIS->want_refresh = 1; 218 THIS->want_refresh = 1;
336} 219}
337 220
338void 221void
339overlay::show () 222overlay::hide ()
340{ 223{
341 if (visible) 224 if (!overlay_av)
342 return; 225 return;
343 226
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; 227 int i;
361 228
362 for (i = AvFILL (av); i >= 0; i--) 229 for (i = AvFILL (overlay_av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this) 230 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364 {
365 av_delete (av, i, G_DISCARD);
366 break; 231 break;
367 }
368 232
369 for (; i < AvFILL (av); i++) 233 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 234 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 235
372 av_pop (av); 236 av_pop (overlay_av);
237
238 SvREFCNT_dec (overlay_av);
239 overlay_av = 0;
240
241 THIS->want_refresh = 1;
373} 242}
374 243
375void overlay::swap () 244void overlay::swap ()
376{ 245{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 246 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
424 } 293 }
425 294
426 THIS->want_refresh = 1; 295 THIS->want_refresh = 1;
427} 296}
428 297
298/////////////////////////////////////////////////////////////////////////////
299
300#define IOM_CLASS "urxvt"
301#define IOM_WARN rxvt_warn
302#include <iom_perl.h>
429 303
430///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
431 305
432struct rxvt_perl_interp rxvt_perl; 306struct rxvt_perl_interp rxvt_perl;
433 307
… …
492static void 366static void
493ungrab (rxvt_term *THIS) 367ungrab (rxvt_term *THIS)
494{ 368{
495 if (THIS->perl.grabtime) 369 if (THIS->perl.grabtime)
496 { 370 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 371 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 372 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 373 THIS->perl.grabtime = 0;
500 } 374 }
501} 375}
502 376
503bool 377bool
… …
508 382
509 // pre-handling of some events 383 // pre-handling of some events
510 if (htype == HOOK_REFRESH_END) 384 if (htype == HOOK_REFRESH_END)
511 { 385 {
512 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 386 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
513 387
514 for (int i = 0; i <= AvFILL (av); i++) 388 for (int i = 0; i <= AvFILL (av); i++)
515 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 389 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
516 } 390 }
517 391
518 swap (perl_environ, environ); 392 swap (perl_environ, environ);
… …
554 break; 428 break;
555 429
556 case DT_STR_LEN: 430 case DT_STR_LEN:
557 { 431 {
558 char *str = va_arg (ap, char *); 432 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 433 int len = va_arg (ap, int);
560 434
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 435 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 436 }
563 break; 437 break;
564 438
565 case DT_WCS_LEN: 439 case DT_WCS_LEN:
566 { 440 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 441 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 442 int wlen = va_arg (ap, int);
569 443
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 444 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
445 }
446 break;
447
448 case DT_LCS_LEN:
449 {
450 long *lstr = va_arg (ap, long *);
451 int llen = va_arg (ap, int);
452
453 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 454 }
572 break; 455 break;
573 456
574 case DT_XEVENT: 457 case DT_XEVENT:
575 { 458 {
576 XEvent *xe = va_arg (ap, XEvent *); 459 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 460 HV *hv = newHV ();
578 461
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 462# 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) 463# 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) 464# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 465# undef set
583 466
584 setiv (type, xe->type); 467 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 468 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 469 setiv (serial, xe->xany.serial);
587 470
… …
596 setuv (root, xe->xmotion.root); 479 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 480 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 481 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 482 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 483 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight); 484 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 485 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 486 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 487 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 488 setuv (state, xe->xmotion.state);
606 489
… …
708 591
709 // post-handling of some events 592 // post-handling of some events
710 if (htype == HOOK_REFRESH_BEGIN) 593 if (htype == HOOK_REFRESH_BEGIN)
711 { 594 {
712 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 595 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
713 596
714 for (int i = AvFILL (av); i >= 0; i--) 597 for (int i = AvFILL (av); i >= 0; i--)
715 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 598 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
716 } 599 }
717 else if (htype == HOOK_DESTROY) 600 else if (htype == HOOK_DESTROY)
718 { 601 {
719 clearSVptr ((SV *)term->perl.self); 602 clearSVptr ((SV *)term->perl.self);
720 SvREFCNT_dec ((SV *)term->perl.self); 603 SvREFCNT_dec ((SV *)term->perl.self);
604
605 // don't allow further calls
606 term->perl.self = 0;
721 } 607 }
722 608
723 swap (perl_environ, environ); 609 swap (perl_environ, environ);
724 610
725 return event_consumed; 611 return event_consumed;
… …
749# include "optinc.h" 635# include "optinc.h"
750# undef nodef 636# undef nodef
751# undef def 637# undef def
752 638
753 HV *stash = gv_stashpv ("urxvt", 1); 639 HV *stash = gv_stashpv ("urxvt", 1);
754 struct { 640 static const struct {
755 const char *name; 641 const char *name;
756 IV iv; 642 IV iv;
757 } *civ, const_iv[] = { 643 } *civ, const_iv[] = {
758# define const_iv(name) { # name, (IV)name } 644# define const_iv(name) { # name, (IV)name }
759 const_iv (DEFAULT_RSTYLE), 645 const_iv (DEFAULT_RSTYLE),
… …
778 const_iv (Button3Mask), 664 const_iv (Button3Mask),
779 const_iv (Button4Mask), 665 const_iv (Button4Mask),
780 const_iv (Button5Mask), 666 const_iv (Button5Mask),
781 const_iv (AnyModifier), 667 const_iv (AnyModifier),
782 668
783 const_iv (EVENT_NONE), 669 const_iv (NoSymbol),
784 const_iv (EVENT_READ), 670 const_iv (GrabModeSync),
785 const_iv (EVENT_WRITE), 671 const_iv (GrabModeAsync),
786 672
787 const_iv (NoEventMask), 673 const_iv (NoEventMask),
788 const_iv (KeyPressMask), 674 const_iv (KeyPressMask),
789 const_iv (KeyReleaseMask), 675 const_iv (KeyReleaseMask),
790 const_iv (ButtonPressMask), 676 const_iv (ButtonPressMask),
… …
842 const_iv (SelectionRequest), 728 const_iv (SelectionRequest),
843 const_iv (SelectionNotify), 729 const_iv (SelectionNotify),
844 const_iv (ColormapNotify), 730 const_iv (ColormapNotify),
845 const_iv (ClientMessage), 731 const_iv (ClientMessage),
846 const_iv (MappingNotify), 732 const_iv (MappingNotify),
733# if ENABLE_XIM_ONTHESPOT
734 const_iv (XIMReverse),
735 const_iv (XIMUnderline),
736 const_iv (XIMHighlight),
737 const_iv (XIMPrimary),
738 const_iv (XIMSecondary),
739 const_iv (XIMTertiary),
740 const_iv (XIMVisibleToForward),
741 const_iv (XIMVisibleToBackword),
742 const_iv (XIMVisibleToCenter),
743# if 0
744 const_iv (XIMForwardChar),
745 const_iv (XIMBackwardChar),
746 const_iv (XIMForwardWord),
747 const_iv (XIMBackwardWord),
748 const_iv (XIMCaretUp),
749 const_iv (XIMCaretDown),
750 const_iv (XIMNextLine),
751 const_iv (XIMPreviousLine),
752 const_iv (XIMLineStart),
753 const_iv (XIMLineEnd),
754 const_iv (XIMAbsolutePosition),
755 const_iv (XIMDontChange),
756# endif
757# endif
847 }; 758 };
848 759
849 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 760 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
850 civ-- > const_iv; )
851 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
852} 762}
853 763
854void 764void
855warn (const char *msg) 765warn (const char *msg)
… …
865_exit (int status) 775_exit (int status)
866 776
867NV 777NV
868NOW () 778NOW ()
869 CODE: 779 CODE:
870 RETVAL = NOW; 780 RETVAL = ev::now ();
871 OUTPUT: 781 OUTPUT:
872 RETVAL 782 RETVAL
873 783
874int 784int
875GET_BASEFG (int rend) 785GET_BASEFG (int rend)
… …
886 RETVAL 796 RETVAL
887 797
888int 798int
889SET_FGCOLOR (int rend, int new_color) 799SET_FGCOLOR (int rend, int new_color)
890 CODE: 800 CODE:
891 RETVAL = SET_FGCOLOR (rend, new_color); 801 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
892 OUTPUT: 802 OUTPUT:
893 RETVAL 803 RETVAL
894 804
895int 805int
896SET_BGCOLOR (int rend, int new_color) 806SET_BGCOLOR (int rend, int new_color)
897 CODE: 807 CODE:
898 RETVAL = SET_BGCOLOR (rend, new_color); 808 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
899 OUTPUT: 809 OUTPUT:
900 RETVAL 810 RETVAL
901 811
902int 812int
903GET_CUSTOM (int rend) 813GET_CUSTOM (int rend)
904 CODE: 814 CODE:
905 RETVAL = (rend && RS_customMask) >> RS_customShift; 815 RETVAL = (rend & RS_customMask) >> RS_customShift;
906 OUTPUT: 816 OUTPUT:
907 RETVAL 817 RETVAL
908 818
909int 819int
910SET_CUSTOM (int rend, int new_value) 820SET_CUSTOM (int rend, int new_value)
… …
917 | ((new_value << RS_customShift) & RS_customMask); 827 | ((new_value << RS_customShift) & RS_customMask);
918} 828}
919 OUTPUT: 829 OUTPUT:
920 RETVAL 830 RETVAL
921 831
832void
833termlist ()
834 PPCODE:
835{
836 EXTEND (SP, rxvt_term::termlist.size ());
837
838 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
839 if ((*t)->perl.self)
840 PUSHs (sv_2mortal (newSVterm (*t)));
841}
842
922MODULE = urxvt PACKAGE = urxvt::term 843MODULE = urxvt PACKAGE = urxvt::term
923 844
924SV * 845SV *
925_new (...) 846_new (AV *env, AV *arg)
926 CODE: 847 CODE:
927{ 848{
928 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
929 croak ("first argument to urxvt::term->_new must be arrayref");
930
931 rxvt_term *term = new rxvt_term; 849 rxvt_term *term = new rxvt_term;
932 850
933 term->argv = new stringvec; 851 stringvec *argv = new stringvec;
934 term->envv = new stringvec; 852 stringvec *envv = new stringvec;
935 853
936 for (int i = 1; i < items; i++) 854 for (int i = 0; i <= AvFILL (arg); i++)
937 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 855 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
938 856
939 AV *envv = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (envv) + 1; i--; ) 857 for (int i = AvFILL (env) + 1; i--; )
941 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 859
943 term->envv->push_back (0); 860 envv->push_back (0);
944
945 bool success;
946 861
947 try 862 try
948 { 863 {
949 success = term->init (term->argv->size (), term->argv->begin ()); 864 term->init (argv, envv);
950 } 865 }
951 catch (const class rxvt_failure_exception &e) 866 catch (const class rxvt_failure_exception &e)
952 {
953 success = false;
954 }
955
956 if (!success)
957 { 867 {
958 term->destroy (); 868 term->destroy ();
959 croak ("error while initializing new terminal instance"); 869 croak ("error while initializing new terminal instance");
960 } 870 }
961 871
… …
971void 881void
972rxvt_term::set_should_invoke (int htype, int inc) 882rxvt_term::set_should_invoke (int htype, int inc)
973 CODE: 883 CODE:
974 THIS->perl.should_invoke [htype] += inc; 884 THIS->perl.should_invoke [htype] += inc;
975 885
976void 886int
977rxvt_term::grab_button (int button, U32 modifiers) 887rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
978 CODE: 888 CODE:
979 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 889 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
980 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 890 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
981 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 891 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
892 OUTPUT: RETVAL
893
894int
895rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
896 CODE:
897 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
898 OUTPUT: RETVAL
899
900void
901rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
902 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
903 CODE:
904 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
905
906void
907rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
908 CODE:
909 XUngrabKey (THIS->dpy, keycode, modifiers, window);
910
911void
912rxvt_term::XUngrabKeyboard (Time eventtime)
913 CODE:
914 XUngrabKeyboard (THIS->dpy, eventtime);
982 915
983bool 916bool
984rxvt_term::grab (Time eventtime, int sync = 0) 917rxvt_term::grab (Time eventtime, int sync = 0)
985 CODE: 918 CODE:
986{ 919{
987 int mode = sync ? GrabModeSync : GrabModeAsync; 920 int mode = sync ? GrabModeSync : GrabModeAsync;
988 921
989 THIS->perl.grabtime = 0; 922 THIS->perl.grabtime = 0;
990 923
991 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 924 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
992 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 925 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
993 mode, mode, None, GRAB_CURSOR, eventtime)) 926 mode, mode, None, GRAB_CURSOR, eventtime))
994 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 927 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
995 THIS->perl.grabtime = eventtime; 928 THIS->perl.grabtime = eventtime;
996 else 929 else
997 XUngrabPointer (THIS->display->display, eventtime); 930 XUngrabPointer (THIS->dpy, eventtime);
998 931
999 RETVAL = !!THIS->perl.grabtime; 932 RETVAL = !!THIS->perl.grabtime;
1000} 933}
1001 OUTPUT: 934 OUTPUT:
1002 RETVAL 935 RETVAL
1003 936
1004void 937void
1005rxvt_term::allow_events_async () 938rxvt_term::allow_events_async ()
1006 CODE: 939 CODE:
1007 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 940 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1008 941
1009void 942void
1010rxvt_term::allow_events_sync () 943rxvt_term::allow_events_sync ()
1011 CODE: 944 CODE:
1012 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 945 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1013 946
1014void 947void
1015rxvt_term::allow_events_replay () 948rxvt_term::allow_events_replay ()
1016 CODE: 949 CODE:
1017 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 950 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1018 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 951 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1019 952
1020void 953void
1021rxvt_term::ungrab () 954rxvt_term::ungrab ()
1022 CODE: 955 CODE:
1023 ungrab (THIS); 956 ungrab (THIS);
957
958int
959rxvt_term::XStringToKeysym (char *string)
960 CODE:
961 RETVAL = XStringToKeysym (string);
962 OUTPUT: RETVAL
963
964char *
965rxvt_term::XKeysymToString (int sym)
966 CODE:
967 RETVAL = XKeysymToString (sym);
968 OUTPUT: RETVAL
969
970int
971rxvt_term::XKeysymToKeycode (int sym)
972 CODE:
973 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
974 OUTPUT: RETVAL
975
976int
977rxvt_term::XKeycodeToKeysym (int code, int index)
978 CODE:
979 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
980 OUTPUT: RETVAL
1024 981
1025int 982int
1026rxvt_term::strwidth (SV *str) 983rxvt_term::strwidth (SV *str)
1027 CODE: 984 CODE:
1028{ 985{
1029 wchar_t *wstr = sv2wcs (str); 986 wchar_t *wstr = sv2wcs (str);
1030 987
1031 rxvt_push_locale (THIS->locale); 988 rxvt_push_locale (THIS->locale);
1032 RETVAL = wcswidth (wstr, wcslen (wstr)); 989 RETVAL = 0;
990 for (wchar_t *wc = wstr; *wc; wc++)
991 {
992 int w = WCWIDTH (*wc);
993
994 if (w)
995 RETVAL += max (w, 1);
996 }
1033 rxvt_pop_locale (); 997 rxvt_pop_locale ();
1034 998
1035 free (wstr); 999 free (wstr);
1036} 1000}
1037 OUTPUT: 1001 OUTPUT:
… …
1067 rxvt_pop_locale (); 1031 rxvt_pop_locale ();
1068 1032
1069 RETVAL = wcs2sv (wstr); 1033 RETVAL = wcs2sv (wstr);
1070 free (wstr); 1034 free (wstr);
1071} 1035}
1036 OUTPUT:
1037 RETVAL
1038
1039char *
1040rxvt_term::locale ()
1041 CODE:
1042 RETVAL = THIS->locale;
1072 OUTPUT: 1043 OUTPUT:
1073 RETVAL 1044 RETVAL
1074 1045
1075#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1046#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1076 1047
… …
1117rxvt_term::ModLevel3Mask () 1088rxvt_term::ModLevel3Mask ()
1118 ALIAS: 1089 ALIAS:
1119 ModLevel3Mask = 0 1090 ModLevel3Mask = 0
1120 ModMetaMask = 1 1091 ModMetaMask = 1
1121 ModNumLockMask = 2 1092 ModNumLockMask = 2
1093 current_screen = 3
1094 hidden_cursor = 4
1122 CODE: 1095 CODE:
1123 switch (ix) 1096 switch (ix)
1124 { 1097 {
1125 case 0: RETVAL = THIS->ModLevel3Mask; break; 1098 case 0: RETVAL = THIS->ModLevel3Mask; break;
1126 case 1: RETVAL = THIS->ModMetaMask; break; 1099 case 1: RETVAL = THIS->ModMetaMask; break;
1127 case 2: RETVAL = THIS->ModNumLockMask; break; 1100 case 2: RETVAL = THIS->ModNumLockMask; break;
1101 case 3: RETVAL = THIS->current_screen; break;
1102 case 4: RETVAL = THIS->hidden_cursor; break;
1128 } 1103 }
1129 OUTPUT: 1104 OUTPUT:
1130 RETVAL 1105 RETVAL
1131 1106
1132char * 1107char *
… …
1142 } 1117 }
1143 OUTPUT: 1118 OUTPUT:
1144 RETVAL 1119 RETVAL
1145 1120
1146SV * 1121SV *
1147rxvt_term::_env () 1122rxvt_term::envv ()
1123 ALIAS:
1124 argv = 1
1148 CODE: 1125 PPCODE:
1149{ 1126{
1150 if (THIS->envv) 1127 stringvec *vec = ix ? THIS->argv : THIS->envv;
1151 {
1152 AV *av = newAV ();
1153 1128
1129 EXTEND (SP, vec->size ());
1130
1154 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1131 for (char **i = vec->begin (); i != vec->end (); ++i)
1155 if (*i) 1132 if (*i)
1156 av_push (av, newSVpv (*i, 0)); 1133 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1157
1158 RETVAL = newRV_noinc ((SV *)av);
1159 }
1160 else
1161 RETVAL = &PL_sv_undef;
1162} 1134}
1163 OUTPUT:
1164 RETVAL
1165 1135
1166int 1136int
1167rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1137rxvt_term::pty_ev_events (int events = ev::UNDEF)
1168 CODE: 1138 CODE:
1169 RETVAL = THIS->pty_ev.events; 1139 RETVAL = THIS->pty_ev.events;
1170 if (events != EVENT_UNDEF) 1140 if (events != ev::UNDEF)
1171 THIS->pty_ev.set (events); 1141 THIS->pty_ev.set (events);
1142 OUTPUT:
1143 RETVAL
1144
1145int
1146rxvt_term::pty_fd ()
1147 CODE:
1148 RETVAL = THIS->pty->pty;
1172 OUTPUT: 1149 OUTPUT:
1173 RETVAL 1150 RETVAL
1174 1151
1175Window 1152Window
1176rxvt_term::parent () 1153rxvt_term::parent ()
… …
1218 1195
1219void 1196void
1220rxvt_term::focus_out () 1197rxvt_term::focus_out ()
1221 1198
1222void 1199void
1200rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1201 ALIAS:
1202 key_release = 1
1203 CODE:
1204{
1205 XKeyEvent xkey;
1206
1207 memset (&xkey, 0, sizeof (xkey));
1208
1209 xkey.time = time;
1210 xkey.state = state;
1211 xkey.keycode = keycode;
1212
1213 xkey.type = ix ? KeyRelease : KeyPress;
1214 xkey.display = THIS->dpy;
1215 xkey.window = THIS->vt;
1216 xkey.root = THIS->display->root;
1217 xkey.subwindow = THIS->vt;
1218
1219 if (ix)
1220 THIS->key_release (xkey);
1221 else
1222 THIS->key_press (xkey);
1223}
1224
1225void
1223rxvt_term::want_refresh () 1226rxvt_term::want_refresh ()
1224 CODE: 1227 CODE:
1225 THIS->want_refresh = 1; 1228 THIS->want_refresh = 1;
1226 1229
1227void 1230void
… …
1233 1236
1234 line_t &l = ROW(row_number); 1237 line_t &l = ROW(row_number);
1235 1238
1236 if (GIMME_V != G_VOID) 1239 if (GIMME_V != G_VOID)
1237 { 1240 {
1238 wchar_t *wstr = new wchar_t [THIS->ncol]; 1241 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1239 1242
1240 for (int col = 0; col < THIS->ncol; col++) 1243 for (int col = 0; col < THIS->ncol; col++)
1241 wstr [col] = l.t [col]; 1244 wstr [col] = l.t [col];
1242 1245
1243 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1246 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1244
1245 delete [] wstr;
1246 } 1247 }
1247 1248
1248 if (new_text) 1249 if (new_text)
1249 { 1250 {
1250 wchar_t *wstr = sv2wcs (new_text); 1251 wchar_t *wstr = sv2wcs (new_text);
… …
1343rxvt_term::special_encode (SV *string) 1344rxvt_term::special_encode (SV *string)
1344 CODE: 1345 CODE:
1345{ 1346{
1346 wchar_t *wstr = sv2wcs (string); 1347 wchar_t *wstr = sv2wcs (string);
1347 int wlen = wcslen (wstr); 1348 int wlen = wcslen (wstr);
1348 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1349 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1349 1350
1350 rxvt_push_locale (THIS->locale); 1351 rxvt_push_locale (THIS->locale);
1351 1352
1352 wchar_t *r = rstr; 1353 wchar_t *r = rstr;
1353 for (wchar_t *s = wstr; *s; s++) 1354 for (wchar_t *s = wstr; *s; s++)
1355 {
1356 int w = WCWIDTH (*s);
1357
1354 if (wcwidth (*s) == 0) 1358 if (w == 0)
1355 { 1359 {
1356 if (r == rstr) 1360 if (r == rstr)
1357 croak ("leading combining character unencodable"); 1361 croak ("leading combining character unencodable");
1358 1362
1359 unicode_t n = rxvt_compose (r[-1], *s); 1363 unicode_t n = rxvt_compose (r[-1], *s);
1360 if (n == NOCHAR) 1364 if (n == NOCHAR)
1361 n = rxvt_composite.compose (r[-1], *s); 1365 n = rxvt_composite.compose (r[-1], *s);
1362 1366
1363 r[-1] = n; 1367 r[-1] = n;
1364 } 1368 }
1365#if !UNICODE_3 1369#if !UNICODE_3
1366 else if (*s >= 0x10000) 1370 else if (*s >= 0x10000)
1367 *r++ = rxvt_composite.compose (*s); 1371 *r++ = rxvt_composite.compose (*s);
1368#endif 1372#endif
1369 else 1373 else
1370 *r++ = *s; 1374 *r++ = *s;
1375
1376 // the *2 above only allows wcwidth <= 2
1377 if (w > 1)
1378 *r++ = NOCHAR;
1379 }
1371 1380
1372 rxvt_pop_locale (); 1381 rxvt_pop_locale ();
1373 1382
1374 RETVAL = wcs2sv (rstr, r - rstr); 1383 RETVAL = wcs2sv (rstr, r - rstr);
1375
1376 delete [] rstr;
1377} 1384}
1378 OUTPUT: 1385 OUTPUT:
1379 RETVAL 1386 RETVAL
1380 1387
1381SV * 1388SV *
1382rxvt_term::special_decode (SV *text) 1389rxvt_term::special_decode (SV *text)
1383 CODE: 1390 CODE:
1384{ 1391{
1385 wchar_t *wstr = sv2wcs (text); 1392 wchar_t *wstr = sv2wcs (text);
1386 int wlen = wcslen (wstr);
1387 int dlen = 0; 1393 int dlen = 0;
1388 1394
1389 // find length 1395 // find length
1390 for (wchar_t *s = wstr; *s; s++) 1396 for (wchar_t *s = wstr; *s; s++)
1391 if (*s == NOCHAR) 1397 if (*s == NOCHAR)
… …
1393 else if (IS_COMPOSE (*s)) 1399 else if (IS_COMPOSE (*s))
1394 dlen += rxvt_composite.expand (*s, 0); 1400 dlen += rxvt_composite.expand (*s, 0);
1395 else 1401 else
1396 dlen++; 1402 dlen++;
1397 1403
1398 wchar_t *rstr = new wchar_t [dlen]; 1404 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1399 1405
1400 // decode 1406 // decode
1401 wchar_t *r = rstr; 1407 wchar_t *r = rstr;
1402 for (wchar_t *s = wstr; *s; s++) 1408 for (wchar_t *s = wstr; *s; s++)
1403 if (*s == NOCHAR) 1409 if (*s == NOCHAR)
… …
1406 r += rxvt_composite.expand (*s, r); 1412 r += rxvt_composite.expand (*s, r);
1407 else 1413 else
1408 *r++ = *s; 1414 *r++ = *s;
1409 1415
1410 RETVAL = wcs2sv (rstr, r - rstr); 1416 RETVAL = wcs2sv (rstr, r - rstr);
1411
1412 delete [] rstr;
1413} 1417}
1414 OUTPUT: 1418 OUTPUT:
1415 RETVAL 1419 RETVAL
1416 1420
1417void 1421void
1418rxvt_term::_resource (char *name, int index, SV *newval = 0) 1422rxvt_term::_resource (char *name, int index, SV *newval = 0)
1419 PPCODE: 1423 PPCODE:
1420{ 1424{
1421 struct resval { const char *name; int value; } rslist [] = { 1425 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1422# define def(name) { # name, Rs_ ## name }, 1426# define def(name) { # name, Rs_ ## name },
1423# define reserve(name,count) 1427# define reserve(name,count)
1424# include "rsinc.h" 1428# include "rsinc.h"
1425# undef def 1429# undef def
1426# undef reserve 1430# undef reserve
1427 }; 1431 };
1428 1432
1429 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1433 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1430 1434
1431 do { 1435 do {
1432 if (rs-- == rslist) 1436 if (rs-- == rslist)
1433 croak ("no such resource '%s', requested", name); 1437 croak ("no such resource '%s', requested", name);
1434 } while (strcmp (name, rs->name)); 1438 } while (strcmp (name, rs->name));
… …
1456 1460
1457const char * 1461const char *
1458rxvt_term::x_resource (const char *name) 1462rxvt_term::x_resource (const char *name)
1459 1463
1460bool 1464bool
1461rxvt_term::option (U32 optval, int set = -1) 1465rxvt_term::option (U8 optval, int set = -1)
1462 CODE: 1466 CODE:
1463{ 1467{
1464 RETVAL = THIS->options & optval; 1468 RETVAL = THIS->option (optval);
1465 1469
1466 if (set >= 0) 1470 if (set >= 0)
1467 { 1471 {
1468 if (set)
1469 THIS->options |= optval; 1472 THIS->set_option (optval, set);
1470 else
1471 THIS->options &= ~optval;
1472 1473
1473 if (THIS->check_ev.is_active ()) // avoid doing this before START 1474 if (THIS->prepare_ev.is_active ()) // avoid doing this before START
1474 switch (optval) 1475 switch (optval)
1475 { 1476 {
1476 case Opt_skipBuiltinGlyphs: 1477 case Opt_skipBuiltinGlyphs:
1477 THIS->set_fonts (); 1478 THIS->set_fonts ();
1478 THIS->scr_remap_chars (); 1479 THIS->scr_remap_chars ();
… …
1527 if (items == 3) 1528 if (items == 3)
1528 { 1529 {
1529 rc.row = SvIV (ST (1)); 1530 rc.row = SvIV (ST (1));
1530 rc.col = SvIV (ST (2)); 1531 rc.col = SvIV (ST (2));
1531 1532
1532 if (ix == 2 && rc.col == 0) 1533 if (ix == 2)
1533 { 1534 {
1535 if (rc.col == 0)
1536 {
1537 // col == 0 means end of previous line
1534 rc.row--; 1538 rc.row--;
1535 rc.col = THIS->ncol; 1539 rc.col = THIS->ncol;
1540 }
1541 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1542 && rc.col > ROW(rc.row).l)
1543 {
1544 // col >= length means while line and add newline
1545 rc.col = THIS->ncol;
1546 }
1536 } 1547 }
1537 1548
1538 clamp_it (rc.col, 0, THIS->ncol); 1549 clamp_it (rc.col, 0, THIS->ncol);
1539 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1550 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1540 1551
… …
1548 CODE: 1559 CODE:
1549 RETVAL = THIS->charsets [THIS->screen.charset]; 1560 RETVAL = THIS->charsets [THIS->screen.charset];
1550 OUTPUT: 1561 OUTPUT:
1551 RETVAL 1562 RETVAL
1552 1563
1553#void 1564void
1554#rxvt_term::selection_clear () 1565rxvt_term::selection_clear ()
1555 1566
1556void 1567void
1557rxvt_term::selection_make (Time eventtime, bool rect = false) 1568rxvt_term::selection_make (Time eventtime, bool rect = false)
1558 CODE: 1569 CODE:
1559 THIS->selection.op = SELECTION_CONT; 1570 THIS->selection.op = SELECTION_CONT;
… …
1587void 1598void
1588rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1599rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1589 1600
1590void 1601void
1591rxvt_term::scr_bell () 1602rxvt_term::scr_bell ()
1603
1604void
1605rxvt_term::scr_change_screen (int screen)
1592 1606
1593void 1607void
1594rxvt_term::scr_add_lines (SV *string) 1608rxvt_term::scr_add_lines (SV *string)
1595 CODE: 1609 CODE:
1596{ 1610{
… …
1646void 1660void
1647rxvt_term::XListProperties (Window window) 1661rxvt_term::XListProperties (Window window)
1648 PPCODE: 1662 PPCODE:
1649{ 1663{
1650 int count; 1664 int count;
1651 Atom *props = XListProperties (THIS->display->display, window, &count); 1665 Atom *props = XListProperties (THIS->dpy, window, &count);
1652 1666
1653 EXTEND (SP, count); 1667 EXTEND (SP, count);
1654 while (count--) 1668 while (count--)
1655 PUSHs (newSVuv ((U32)props [count])); 1669 PUSHs (newSVuv ((U32)props [count]));
1656 1670
1657 XFree (props); 1671 XFree (props);
1658} 1672}
1659 1673
1660void 1674void
1661rxvt_term::XGetWindowProperty (Window window, Atom property) 1675rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1665 int format; 1679 int format;
1666 unsigned long nitems; 1680 unsigned long nitems;
1667 unsigned long bytes_after; 1681 unsigned long bytes_after;
1668 unsigned char *prop; 1682 unsigned char *prop;
1669 1683
1670 XGetWindowProperty (THIS->display->display, window, property, 1684 XGetWindowProperty (THIS->dpy, window, property,
1671 0, 1<<24, 0, AnyPropertyType, 1685 0, 1<<24, 0, AnyPropertyType,
1672 &type, &format, &nitems, &bytes_after, &prop); 1686 &type, &format, &nitems, &bytes_after, &prop);
1673 1687
1674 if (type != None) 1688 if (type != None)
1675 { 1689 {
… …
1694 1708
1695 int elemsize = format == 16 ? sizeof (short) 1709 int elemsize = format == 16 ? sizeof (short)
1696 : format == 32 ? sizeof (long) 1710 : format == 32 ? sizeof (long)
1697 : 1; 1711 : 1;
1698 1712
1699 XChangeProperty (THIS->display->display, window, property, 1713 XChangeProperty (THIS->dpy, window, property,
1700 type, format, PropModeReplace, 1714 type, format, PropModeReplace,
1701 (unsigned char *)data_, len / elemsize); 1715 (unsigned char *)data_, len / elemsize);
1702 XSync (THIS->display->display, 0);
1703} 1716}
1704 1717
1705Atom 1718Atom
1706XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1719XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1707 C_ARGS: term->display->display, atom_name, only_if_exists 1720 C_ARGS: term->dpy, atom_name, only_if_exists
1708 1721
1709char * 1722char *
1710XGetAtomName (rxvt_term *term, Atom atom) 1723XGetAtomName (rxvt_term *term, Atom atom)
1711 C_ARGS: term->display->display, atom 1724 C_ARGS: term->dpy, atom
1712 CLEANUP: 1725 CLEANUP:
1713 XFree (RETVAL); 1726 XFree (RETVAL);
1714 1727
1715void 1728void
1716XDeleteProperty (rxvt_term *term, Window window, Atom property) 1729XDeleteProperty (rxvt_term *term, Window window, Atom property)
1717 C_ARGS: term->display->display, window, property 1730 C_ARGS: term->dpy, window, property
1718 1731
1719Window 1732Window
1720rxvt_term::DefaultRootWindow () 1733rxvt_term::DefaultRootWindow ()
1721 CODE: 1734 CODE:
1722 RETVAL = THIS->display->root; 1735 RETVAL = THIS->display->root;
… …
1725 1738
1726#if 0 1739#if 0
1727 1740
1728Window 1741Window
1729XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1742XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1730 C_ARGS: term->display->display, (Window)parent, 1743 C_ARGS: term->dpy, (Window)parent,
1731 x, y, width, height, 0, 1744 x, y, width, height, 0,
1732 term->pix_colors_focused[Color_border], 1745 term->pix_colors_focused[Color_border],
1733 term->pix_colors_focused[Color_border] 1746 term->pix_colors_focused[Color_border]
1734 1747
1735#endif 1748#endif
1736 1749
1737void 1750void
1738XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1751XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1739 C_ARGS: term->display->display, window, parent, x, y 1752 C_ARGS: term->dpy, window, parent, x, y
1740 1753
1741void 1754void
1742XMapWindow (rxvt_term *term, Window window) 1755XMapWindow (rxvt_term *term, Window window)
1743 C_ARGS: term->display->display, window 1756 C_ARGS: term->dpy, window
1744 1757
1745void 1758void
1746XUnmapWindow (rxvt_term *term, Window window) 1759XUnmapWindow (rxvt_term *term, Window window)
1747 C_ARGS: term->display->display, window 1760 C_ARGS: term->dpy, window
1748 1761
1749void 1762void
1750XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1763XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1751 C_ARGS: term->display->display, window, x, y, width, height 1764 C_ARGS: term->dpy, window, x, y, width, height
1752 1765
1753void 1766void
1754rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1767rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1755 CODE: 1768 CODE:
1756{ 1769{
1757 XWindowAttributes attr; 1770 XWindowAttributes attr;
1758 XGetWindowAttributes (THIS->display->display, window, &attr); 1771 XGetWindowAttributes (THIS->dpy, window, &attr);
1759 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1772 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1760} 1773}
1761 1774
1762void 1775void
1763rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1776rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1764 PPCODE: 1777 PPCODE:
1765{ 1778{
1766 int dx, dy; 1779 int dx, dy;
1767 Window child; 1780 Window child;
1768 1781
1769 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1782 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1770 { 1783 {
1771 EXTEND (SP, 3); 1784 EXTEND (SP, 3);
1772 PUSHs (newSViv (dx)); 1785 PUSHs (newSViv (dx));
1773 PUSHs (newSViv (dy)); 1786 PUSHs (newSViv (dy));
1774 PUSHs (newSVuv (child)); 1787 PUSHs (newSVuv (child));
… …
1791overlay::hide () 1804overlay::hide ()
1792 1805
1793void 1806void
1794overlay::DESTROY () 1807overlay::DESTROY ()
1795 1808
1796############################################################################# 1809INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1797# urxvt::watcher
1798#############################################################################
1799 1810
1800MODULE = urxvt PACKAGE = urxvt::watcher
1801
1802CHAINED
1803perl_watcher::cb (SV *cb)
1804 CODE:
1805 THIS->cb (cb);
1806 OUTPUT:
1807 RETVAL
1808
1809#############################################################################
1810# urxvt::timer
1811#############################################################################
1812
1813MODULE = urxvt PACKAGE = urxvt::timer
1814
1815SV *
1816timer::new ()
1817 CODE:
1818 timer *w = new timer;
1819 w->start (NOW);
1820 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1821 w->self = (HV *)SvRV (RETVAL);
1822 OUTPUT:
1823 RETVAL
1824
1825NV
1826timer::at ()
1827 CODE:
1828 RETVAL = THIS->at;
1829 OUTPUT:
1830 RETVAL
1831
1832CHAINED
1833timer::interval (NV interval)
1834 CODE:
1835 THIS->interval = interval;
1836 OUTPUT:
1837 RETVAL
1838
1839CHAINED
1840timer::set (NV tstamp)
1841 CODE:
1842 THIS->set (tstamp);
1843 OUTPUT:
1844 RETVAL
1845
1846CHAINED
1847timer::start (NV tstamp = THIS->at)
1848 CODE:
1849 THIS->start (tstamp);
1850 OUTPUT:
1851 RETVAL
1852
1853CHAINED
1854timer::after (NV delay)
1855 CODE:
1856 THIS->start (NOW + delay);
1857 OUTPUT:
1858 RETVAL
1859
1860CHAINED
1861timer::stop ()
1862 CODE:
1863 THIS->stop ();
1864 OUTPUT:
1865 RETVAL
1866
1867void
1868timer::DESTROY ()
1869
1870#############################################################################
1871# urxvt::iow
1872#############################################################################
1873
1874MODULE = urxvt PACKAGE = urxvt::iow
1875
1876SV *
1877iow::new ()
1878 CODE:
1879 iow *w = new iow;
1880 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1881 w->self = (HV *)SvRV (RETVAL);
1882 OUTPUT:
1883 RETVAL
1884
1885CHAINED
1886iow::fd (int fd)
1887 CODE:
1888 THIS->fd = fd;
1889 OUTPUT:
1890 RETVAL
1891
1892CHAINED
1893iow::events (short events)
1894 CODE:
1895 THIS->events = events;
1896 OUTPUT:
1897 RETVAL
1898
1899CHAINED
1900iow::start ()
1901 CODE:
1902 THIS->start ();
1903 OUTPUT:
1904 RETVAL
1905
1906CHAINED
1907iow::stop ()
1908 CODE:
1909 THIS->stop ();
1910 OUTPUT:
1911 RETVAL
1912
1913void
1914iow::DESTROY ()
1915
1916#############################################################################
1917# urxvt::iw
1918#############################################################################
1919
1920MODULE = urxvt PACKAGE = urxvt::iw
1921
1922SV *
1923iw::new ()
1924 CODE:
1925 iw *w = new iw;
1926 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1927 w->self = (HV *)SvRV (RETVAL);
1928 OUTPUT:
1929 RETVAL
1930
1931CHAINED
1932iw::start ()
1933 CODE:
1934 THIS->start ();
1935 OUTPUT:
1936 RETVAL
1937
1938CHAINED
1939iw::stop ()
1940 CODE:
1941 THIS->stop ();
1942 OUTPUT:
1943 RETVAL
1944
1945void
1946iw::DESTROY ()
1947
1948#############################################################################
1949# urxvt::pw
1950#############################################################################
1951
1952MODULE = urxvt PACKAGE = urxvt::pw
1953
1954SV *
1955pw::new ()
1956 CODE:
1957 pw *w = new pw;
1958 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1959 w->self = (HV *)SvRV (RETVAL);
1960 OUTPUT:
1961 RETVAL
1962
1963CHAINED
1964pw::start (int pid)
1965 CODE:
1966 THIS->start (pid);
1967 OUTPUT:
1968 RETVAL
1969
1970CHAINED
1971pw::stop ()
1972 CODE:
1973 THIS->stop ();
1974 OUTPUT:
1975 RETVAL
1976
1977void
1978pw::DESTROY ()
1979
1980

Diff Legend

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