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.93 by root, Wed Jan 25 15:02:47 2006 UTC vs.
Revision 1.119 by ayin, Fri Jan 4 17:57:28 2008 UTC

… …
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h" 34#include "unistd.h"
35 35
36#include "iom.h" 36#include "ev_cpp.h"
37#include "rxvt.h" 37#include "rxvt.h"
38#include "keyboard.h" 38#include "keyboard.h"
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#ifdef HAVE_SCROLLBARS 44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else 46#else
47# define GRAB_CURSOR None 47# define GRAB_CURSOR None
48#endif 48#endif
49 49
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
58 56
59static wchar_t * 57static wchar_t *
60sv2wcs (SV *sv) 58sv2wcs (SV *sv)
61{ 59{
… …
75 73
76 return sv; 74 return sv;
77} 75}
78 76
79static SV * 77static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85//TODO: use magic
86static SV *
87newSVptr (void *ptr, const char *klass) 78newSVptr (void *ptr, const char *klass)
88{ 79{
89 HV *hv = newHV (); 80 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 81 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 82 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 104 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 105
115 return (long)mg->mg_ptr; 106 return (long)mg->mg_ptr;
116} 107}
117 108
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 109#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 110#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120
121/////////////////////////////////////////////////////////////////////////////
122
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 111
245///////////////////////////////////////////////////////////////////////////// 112/////////////////////////////////////////////////////////////////////////////
246 113
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 114#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 115
… …
269}; 136};
270 137
271overlay::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)
272: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 139: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
273{ 140{
141 if (w < 0) w = 0;
142 if (h < 0) h = 0;
143
274 if (border == 2) 144 if (border == 2)
275 { 145 {
276 w += 2; 146 w += 2;
277 h += 2; 147 h += 2;
278 } 148 }
… …
344 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
345 )); 215 ));
346 av_push (overlay_av, newSViv ((long)this)); 216 av_push (overlay_av, newSViv ((long)this));
347 217
348 THIS->want_refresh = 1; 218 THIS->want_refresh = 1;
219 THIS->refresh_check ();
349} 220}
350 221
351void 222void
352overlay::hide () 223overlay::hide ()
353{ 224{
… …
356 227
357 int i; 228 int i;
358 229
359 for (i = AvFILL (overlay_av); i >= 0; i--) 230 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) 231 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361 {
362 av_delete (overlay_av, i, G_DISCARD);
363 break; 232 break;
364 }
365 233
366 for (; i < AvFILL (overlay_av); i++) 234 for (; i < AvFILL (overlay_av); i++)
367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 235 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368 236
369 av_pop (overlay_av); 237 av_pop (overlay_av);
370 238
371 SvREFCNT_dec (overlay_av); 239 SvREFCNT_dec (overlay_av);
372 overlay_av = 0; 240 overlay_av = 0;
373 241
374 THIS->want_refresh = 1; 242 THIS->want_refresh = 1;
243 THIS->refresh_check ();
375} 244}
376 245
377void overlay::swap () 246void overlay::swap ()
378{ 247{
379 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 248 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
424 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 293 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
425 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 294 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
426 } 295 }
427 296
428 THIS->want_refresh = 1; 297 THIS->want_refresh = 1;
298 THIS->refresh_check ();
429} 299}
430 300
301/////////////////////////////////////////////////////////////////////////////
302
303#define IOM_CLASS "urxvt"
304#define IOM_WARN rxvt_warn
305#include "iom_perl.h"
431 306
432///////////////////////////////////////////////////////////////////////////// 307/////////////////////////////////////////////////////////////////////////////
433 308
434struct rxvt_perl_interp rxvt_perl; 309struct rxvt_perl_interp rxvt_perl;
435 310
… …
494static void 369static void
495ungrab (rxvt_term *THIS) 370ungrab (rxvt_term *THIS)
496{ 371{
497 if (THIS->perl.grabtime) 372 if (THIS->perl.grabtime)
498 { 373 {
499 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 374 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
500 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 375 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
501 THIS->perl.grabtime = 0; 376 THIS->perl.grabtime = 0;
502 } 377 }
503} 378}
504 379
505bool 380bool
… …
510 385
511 // pre-handling of some events 386 // pre-handling of some events
512 if (htype == HOOK_REFRESH_END) 387 if (htype == HOOK_REFRESH_END)
513 { 388 {
514 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 389 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
515 390
516 for (int i = 0; i <= AvFILL (av); i++) 391 for (int i = 0; i <= AvFILL (av); i++)
517 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 392 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
518 } 393 }
519 394
520 swap (perl_environ, environ); 395 swap (perl_environ, environ);
… …
558 case DT_STR_LEN: 433 case DT_STR_LEN:
559 { 434 {
560 char *str = va_arg (ap, char *); 435 char *str = va_arg (ap, char *);
561 int len = va_arg (ap, int); 436 int len = va_arg (ap, int);
562 437
563 printf ("pushing str %p:%d\n", str,len);//D
564 XPUSHs (sv_2mortal (newSVpvn (str, len))); 438 XPUSHs (sv_2mortal (newSVpvn (str, len)));
565 } 439 }
566 break; 440 break;
567 441
568 case DT_WCS_LEN: 442 case DT_WCS_LEN:
… …
720 594
721 // post-handling of some events 595 // post-handling of some events
722 if (htype == HOOK_REFRESH_BEGIN) 596 if (htype == HOOK_REFRESH_BEGIN)
723 { 597 {
724 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 598 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
725 599
726 for (int i = AvFILL (av); i >= 0; i--) 600 for (int i = AvFILL (av); i >= 0; i--)
727 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 601 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
728 } 602 }
729 else if (htype == HOOK_DESTROY) 603 else if (htype == HOOK_DESTROY)
730 { 604 {
731 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
732 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
733 607
734 // don't allow further calls 608 // don't allow further calls
735 term->perl.self = 0; 609 term->perl.self = 0;
736 } 610 }
737 611
738 swap (perl_environ, environ); 612 swap (perl_environ, environ);
… …
764# include "optinc.h" 638# include "optinc.h"
765# undef nodef 639# undef nodef
766# undef def 640# undef def
767 641
768 HV *stash = gv_stashpv ("urxvt", 1); 642 HV *stash = gv_stashpv ("urxvt", 1);
769 struct { 643 static const struct {
770 const char *name; 644 const char *name;
771 IV iv; 645 IV iv;
772 } *civ, const_iv[] = { 646 } *civ, const_iv[] = {
773# define const_iv(name) { # name, (IV)name } 647# define const_iv(name) { # name, (IV)name }
774 const_iv (DEFAULT_RSTYLE), 648 const_iv (DEFAULT_RSTYLE),
… …
793 const_iv (Button3Mask), 667 const_iv (Button3Mask),
794 const_iv (Button4Mask), 668 const_iv (Button4Mask),
795 const_iv (Button5Mask), 669 const_iv (Button5Mask),
796 const_iv (AnyModifier), 670 const_iv (AnyModifier),
797 671
798 const_iv (EVENT_NONE), 672 const_iv (NoSymbol),
799 const_iv (EVENT_READ), 673 const_iv (GrabModeSync),
800 const_iv (EVENT_WRITE), 674 const_iv (GrabModeAsync),
801 675
802 const_iv (NoEventMask), 676 const_iv (NoEventMask),
803 const_iv (KeyPressMask), 677 const_iv (KeyPressMask),
804 const_iv (KeyReleaseMask), 678 const_iv (KeyReleaseMask),
805 const_iv (ButtonPressMask), 679 const_iv (ButtonPressMask),
… …
884 const_iv (XIMDontChange), 758 const_iv (XIMDontChange),
885# endif 759# endif
886# endif 760# endif
887 }; 761 };
888 762
889 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 763 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
890 civ-- > const_iv; )
891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 764 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
892} 765}
893 766
894void 767void
895warn (const char *msg) 768warn (const char *msg)
… …
905_exit (int status) 778_exit (int status)
906 779
907NV 780NV
908NOW () 781NOW ()
909 CODE: 782 CODE:
910 RETVAL = NOW; 783 RETVAL = ev::now ();
911 OUTPUT: 784 OUTPUT:
912 RETVAL 785 RETVAL
913 786
914int 787int
915GET_BASEFG (int rend) 788GET_BASEFG (int rend)
… …
926 RETVAL 799 RETVAL
927 800
928int 801int
929SET_FGCOLOR (int rend, int new_color) 802SET_FGCOLOR (int rend, int new_color)
930 CODE: 803 CODE:
931 RETVAL = SET_FGCOLOR (rend, new_color); 804 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
932 OUTPUT: 805 OUTPUT:
933 RETVAL 806 RETVAL
934 807
935int 808int
936SET_BGCOLOR (int rend, int new_color) 809SET_BGCOLOR (int rend, int new_color)
937 CODE: 810 CODE:
938 RETVAL = SET_BGCOLOR (rend, new_color); 811 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
939 OUTPUT: 812 OUTPUT:
940 RETVAL 813 RETVAL
941 814
942int 815int
943GET_CUSTOM (int rend) 816GET_CUSTOM (int rend)
944 CODE: 817 CODE:
945 RETVAL = (rend && RS_customMask) >> RS_customShift; 818 RETVAL = (rend & RS_customMask) >> RS_customShift;
946 OUTPUT: 819 OUTPUT:
947 RETVAL 820 RETVAL
948 821
949int 822int
950SET_CUSTOM (int rend, int new_value) 823SET_CUSTOM (int rend, int new_value)
… …
957 | ((new_value << RS_customShift) & RS_customMask); 830 | ((new_value << RS_customShift) & RS_customMask);
958} 831}
959 OUTPUT: 832 OUTPUT:
960 RETVAL 833 RETVAL
961 834
835void
836termlist ()
837 PPCODE:
838{
839 EXTEND (SP, rxvt_term::termlist.size ());
840
841 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
842 if ((*t)->perl.self)
843 PUSHs (sv_2mortal (newSVterm (*t)));
844}
845
962MODULE = urxvt PACKAGE = urxvt::term 846MODULE = urxvt PACKAGE = urxvt::term
963 847
964SV * 848SV *
965_new (...) 849_new (AV *env, AV *arg)
966 CODE: 850 CODE:
967{ 851{
968 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
969 croak ("first argument to urxvt::term->_new must be arrayref");
970
971 rxvt_term *term = new rxvt_term; 852 rxvt_term *term = new rxvt_term;
972 853
973 stringvec *argv = new stringvec; 854 stringvec *argv = new stringvec;
974 stringvec *envv = new stringvec; 855 stringvec *envv = new stringvec;
975 856
976 for (int i = 1; i < items; i++) 857 for (int i = 0; i <= AvFILL (arg); i++)
977 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 858 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
978 859
979 AV *env = (AV *)SvRV (ST (0));
980 for (int i = AvFILL (env) + 1; i--; ) 860 for (int i = AvFILL (env) + 1; i--; )
981 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 861 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
982 862
983 envv->push_back (0); 863 envv->push_back (0);
984 864
985 bool success;
986
987 try 865 try
988 { 866 {
989 success = term->init (argv, envv); 867 term->init (argv, envv);
990 } 868 }
991 catch (const class rxvt_failure_exception &e) 869 catch (const class rxvt_failure_exception &e)
992 {
993 success = false;
994 }
995
996 if (!success)
997 { 870 {
998 term->destroy (); 871 term->destroy ();
999 croak ("error while initializing new terminal instance"); 872 croak ("error while initializing new terminal instance");
1000 } 873 }
1001 874
… …
1011void 884void
1012rxvt_term::set_should_invoke (int htype, int inc) 885rxvt_term::set_should_invoke (int htype, int inc)
1013 CODE: 886 CODE:
1014 THIS->perl.should_invoke [htype] += inc; 887 THIS->perl.should_invoke [htype] += inc;
1015 888
1016void 889int
1017rxvt_term::grab_button (int button, U32 modifiers) 890rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1018 CODE: 891 CODE:
1019 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 892 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1020 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 893 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1021 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 894 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
895 OUTPUT: RETVAL
896
897int
898rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
899 CODE:
900 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
901 OUTPUT: RETVAL
902
903void
904rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
905 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
906 CODE:
907 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
908
909void
910rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
911 CODE:
912 XUngrabKey (THIS->dpy, keycode, modifiers, window);
913
914void
915rxvt_term::XUngrabKeyboard (Time eventtime)
916 CODE:
917 XUngrabKeyboard (THIS->dpy, eventtime);
1022 918
1023bool 919bool
1024rxvt_term::grab (Time eventtime, int sync = 0) 920rxvt_term::grab (Time eventtime, int sync = 0)
1025 CODE: 921 CODE:
1026{ 922{
1027 int mode = sync ? GrabModeSync : GrabModeAsync; 923 int mode = sync ? GrabModeSync : GrabModeAsync;
1028 924
1029 THIS->perl.grabtime = 0; 925 THIS->perl.grabtime = 0;
1030 926
1031 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 927 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1032 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 928 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1033 mode, mode, None, GRAB_CURSOR, eventtime)) 929 mode, mode, None, GRAB_CURSOR, eventtime))
1034 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 930 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1035 THIS->perl.grabtime = eventtime; 931 THIS->perl.grabtime = eventtime;
1036 else 932 else
1037 XUngrabPointer (THIS->display->display, eventtime); 933 XUngrabPointer (THIS->dpy, eventtime);
1038 934
1039 RETVAL = !!THIS->perl.grabtime; 935 RETVAL = !!THIS->perl.grabtime;
1040} 936}
1041 OUTPUT: 937 OUTPUT:
1042 RETVAL 938 RETVAL
1043 939
1044void 940void
1045rxvt_term::allow_events_async () 941rxvt_term::allow_events_async ()
1046 CODE: 942 CODE:
1047 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 943 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1048 944
1049void 945void
1050rxvt_term::allow_events_sync () 946rxvt_term::allow_events_sync ()
1051 CODE: 947 CODE:
1052 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 948 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1053 949
1054void 950void
1055rxvt_term::allow_events_replay () 951rxvt_term::allow_events_replay ()
1056 CODE: 952 CODE:
1057 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 953 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1058 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 954 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1059 955
1060void 956void
1061rxvt_term::ungrab () 957rxvt_term::ungrab ()
1062 CODE: 958 CODE:
1063 ungrab (THIS); 959 ungrab (THIS);
960
961int
962rxvt_term::XStringToKeysym (char *string)
963 CODE:
964 RETVAL = XStringToKeysym (string);
965 OUTPUT: RETVAL
966
967char *
968rxvt_term::XKeysymToString (int sym)
969 CODE:
970 RETVAL = XKeysymToString (sym);
971 OUTPUT: RETVAL
972
973int
974rxvt_term::XKeysymToKeycode (int sym)
975 CODE:
976 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
977 OUTPUT: RETVAL
978
979int
980rxvt_term::XKeycodeToKeysym (int code, int index)
981 CODE:
982 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
983 OUTPUT: RETVAL
1064 984
1065int 985int
1066rxvt_term::strwidth (SV *str) 986rxvt_term::strwidth (SV *str)
1067 CODE: 987 CODE:
1068{ 988{
1069 wchar_t *wstr = sv2wcs (str); 989 wchar_t *wstr = sv2wcs (str);
1070 990
1071 rxvt_push_locale (THIS->locale); 991 rxvt_push_locale (THIS->locale);
1072 RETVAL = wcswidth (wstr, wcslen (wstr)); 992 RETVAL = 0;
993 for (wchar_t *wc = wstr; *wc; wc++)
994 {
995 int w = WCWIDTH (*wc);
996
997 if (w)
998 RETVAL += max (w, 1);
999 }
1073 rxvt_pop_locale (); 1000 rxvt_pop_locale ();
1074 1001
1075 free (wstr); 1002 free (wstr);
1076} 1003}
1077 OUTPUT: 1004 OUTPUT:
… …
1107 rxvt_pop_locale (); 1034 rxvt_pop_locale ();
1108 1035
1109 RETVAL = wcs2sv (wstr); 1036 RETVAL = wcs2sv (wstr);
1110 free (wstr); 1037 free (wstr);
1111} 1038}
1039 OUTPUT:
1040 RETVAL
1041
1042char *
1043rxvt_term::locale ()
1044 CODE:
1045 RETVAL = THIS->locale;
1112 OUTPUT: 1046 OUTPUT:
1113 RETVAL 1047 RETVAL
1114 1048
1115#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1049#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1116 1050
… …
1186 } 1120 }
1187 OUTPUT: 1121 OUTPUT:
1188 RETVAL 1122 RETVAL
1189 1123
1190SV * 1124SV *
1191rxvt_term::_env () 1125rxvt_term::envv ()
1126 ALIAS:
1127 argv = 1
1192 CODE: 1128 PPCODE:
1193{ 1129{
1194 if (THIS->envv) 1130 stringvec *vec = ix ? THIS->argv : THIS->envv;
1195 {
1196 AV *av = newAV ();
1197 1131
1132 EXTEND (SP, vec->size ());
1133
1198 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1134 for (char **i = vec->begin (); i != vec->end (); ++i)
1199 if (*i) 1135 if (*i)
1200 av_push (av, newSVpv (*i, 0)); 1136 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1201
1202 RETVAL = newRV_noinc ((SV *)av);
1203 }
1204 else
1205 RETVAL = &PL_sv_undef;
1206} 1137}
1207 OUTPUT:
1208 RETVAL
1209 1138
1210int 1139int
1211rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1140rxvt_term::pty_ev_events (int events = ev::UNDEF)
1212 CODE: 1141 CODE:
1213 RETVAL = THIS->pty_ev.events; 1142 RETVAL = THIS->pty_ev.events;
1214 if (events != EVENT_UNDEF) 1143 if (events != ev::UNDEF)
1215 THIS->pty_ev.set (events); 1144 THIS->pty_ev.set (events);
1216 OUTPUT: 1145 OUTPUT:
1217 RETVAL 1146 RETVAL
1218 1147
1219int 1148int
… …
1269 1198
1270void 1199void
1271rxvt_term::focus_out () 1200rxvt_term::focus_out ()
1272 1201
1273void 1202void
1203rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1204 ALIAS:
1205 key_release = 1
1206 CODE:
1207{
1208 XKeyEvent xkey;
1209
1210 memset (&xkey, 0, sizeof (xkey));
1211
1212 xkey.time = time;
1213 xkey.state = state;
1214 xkey.keycode = keycode;
1215
1216 xkey.type = ix ? KeyRelease : KeyPress;
1217 xkey.display = THIS->dpy;
1218 xkey.window = THIS->vt;
1219 xkey.root = THIS->display->root;
1220 xkey.subwindow = THIS->vt;
1221
1222 if (ix)
1223 THIS->key_release (xkey);
1224 else
1225 THIS->key_press (xkey);
1226}
1227
1228void
1274rxvt_term::want_refresh () 1229rxvt_term::want_refresh ()
1275 CODE: 1230 CODE:
1276 THIS->want_refresh = 1; 1231 THIS->want_refresh = 1;
1232 THIS->refresh_check ();
1277 1233
1278void 1234void
1279rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1235rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1280 PPCODE: 1236 PPCODE:
1281{ 1237{
… …
1436SV * 1392SV *
1437rxvt_term::special_decode (SV *text) 1393rxvt_term::special_decode (SV *text)
1438 CODE: 1394 CODE:
1439{ 1395{
1440 wchar_t *wstr = sv2wcs (text); 1396 wchar_t *wstr = sv2wcs (text);
1441 int wlen = wcslen (wstr);
1442 int dlen = 0; 1397 int dlen = 0;
1443 1398
1444 // find length 1399 // find length
1445 for (wchar_t *s = wstr; *s; s++) 1400 for (wchar_t *s = wstr; *s; s++)
1446 if (*s == NOCHAR) 1401 if (*s == NOCHAR)
… …
1469 1424
1470void 1425void
1471rxvt_term::_resource (char *name, int index, SV *newval = 0) 1426rxvt_term::_resource (char *name, int index, SV *newval = 0)
1472 PPCODE: 1427 PPCODE:
1473{ 1428{
1474 struct resval { const char *name; int value; } rslist [] = { 1429 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1475# define def(name) { # name, Rs_ ## name }, 1430# define def(name) { # name, Rs_ ## name },
1476# define reserve(name,count) 1431# define reserve(name,count)
1477# include "rsinc.h" 1432# include "rsinc.h"
1478# undef def 1433# undef def
1479# undef reserve 1434# undef reserve
1480 }; 1435 };
1481 1436
1482 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1437 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1483 1438
1484 do { 1439 do {
1485 if (rs-- == rslist) 1440 if (rs-- == rslist)
1486 croak ("no such resource '%s', requested", name); 1441 croak ("no such resource '%s', requested", name);
1487 } while (strcmp (name, rs->name)); 1442 } while (strcmp (name, rs->name));
… …
1509 1464
1510const char * 1465const char *
1511rxvt_term::x_resource (const char *name) 1466rxvt_term::x_resource (const char *name)
1512 1467
1513bool 1468bool
1514rxvt_term::option (U32 optval, int set = -1) 1469rxvt_term::option (U8 optval, int set = -1)
1515 CODE: 1470 CODE:
1516{ 1471{
1517 RETVAL = THIS->options & optval; 1472 RETVAL = THIS->option (optval);
1518 1473
1519 if (set >= 0) 1474 if (set >= 0)
1520 { 1475 {
1521 if (set)
1522 THIS->options |= optval; 1476 THIS->set_option (optval, set);
1523 else
1524 THIS->options &= ~optval;
1525 1477
1526 if (THIS->check_ev.is_active ()) // avoid doing this before START 1478 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1527 switch (optval) 1479 switch (optval)
1528 { 1480 {
1529 case Opt_skipBuiltinGlyphs: 1481 case Opt_skipBuiltinGlyphs:
1530 THIS->set_fonts (); 1482 THIS->set_fonts ();
1531 THIS->scr_remap_chars (); 1483 THIS->scr_remap_chars ();
1532 THIS->scr_touch (true); 1484 THIS->scr_touch (true);
1533 THIS->want_refresh = 1; 1485 THIS->want_refresh = 1;
1486 THIS->refresh_check ();
1534 break; 1487 break;
1535 1488
1536 case Opt_cursorUnderline: 1489 case Opt_cursorUnderline:
1537 THIS->want_refresh = 1; 1490 THIS->want_refresh = 1;
1491 THIS->refresh_check ();
1538 break; 1492 break;
1539 1493
1540# case Opt_scrollBar_floating: 1494# case Opt_scrollBar_floating:
1541# case Opt_scrollBar_right: 1495# case Opt_scrollBar_right:
1542# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1496# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1600 1554
1601 clamp_it (rc.col, 0, THIS->ncol); 1555 clamp_it (rc.col, 0, THIS->ncol);
1602 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1556 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1603 1557
1604 if (ix) 1558 if (ix)
1559 {
1605 THIS->want_refresh = 1; 1560 THIS->want_refresh = 1;
1561 THIS->refresh_check ();
1562 }
1606 } 1563 }
1607} 1564}
1608 1565
1609char 1566char
1610rxvt_term::cur_charset () 1567rxvt_term::cur_charset ()
… …
1712void 1669void
1713rxvt_term::XListProperties (Window window) 1670rxvt_term::XListProperties (Window window)
1714 PPCODE: 1671 PPCODE:
1715{ 1672{
1716 int count; 1673 int count;
1717 Atom *props = XListProperties (THIS->display->display, window, &count); 1674 Atom *props = XListProperties (THIS->dpy, window, &count);
1718 1675
1719 EXTEND (SP, count); 1676 EXTEND (SP, count);
1720 while (count--) 1677 while (count--)
1721 PUSHs (newSVuv ((U32)props [count])); 1678 PUSHs (newSVuv ((U32)props [count]));
1722 1679
1723 XFree (props); 1680 XFree (props);
1724} 1681}
1725 1682
1726void 1683void
1727rxvt_term::XGetWindowProperty (Window window, Atom property) 1684rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1731 int format; 1688 int format;
1732 unsigned long nitems; 1689 unsigned long nitems;
1733 unsigned long bytes_after; 1690 unsigned long bytes_after;
1734 unsigned char *prop; 1691 unsigned char *prop;
1735 1692
1736 XGetWindowProperty (THIS->display->display, window, property, 1693 XGetWindowProperty (THIS->dpy, window, property,
1737 0, 1<<24, 0, AnyPropertyType, 1694 0, 1<<24, 0, AnyPropertyType,
1738 &type, &format, &nitems, &bytes_after, &prop); 1695 &type, &format, &nitems, &bytes_after, &prop);
1739 1696
1740 if (type != None) 1697 if (type != None)
1741 { 1698 {
… …
1760 1717
1761 int elemsize = format == 16 ? sizeof (short) 1718 int elemsize = format == 16 ? sizeof (short)
1762 : format == 32 ? sizeof (long) 1719 : format == 32 ? sizeof (long)
1763 : 1; 1720 : 1;
1764 1721
1765 XChangeProperty (THIS->display->display, window, property, 1722 XChangeProperty (THIS->dpy, window, property,
1766 type, format, PropModeReplace, 1723 type, format, PropModeReplace,
1767 (unsigned char *)data_, len / elemsize); 1724 (unsigned char *)data_, len / elemsize);
1768 XSync (THIS->display->display, 0);
1769} 1725}
1770 1726
1771Atom 1727Atom
1772XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1728XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1773 C_ARGS: term->display->display, atom_name, only_if_exists 1729 C_ARGS: term->dpy, atom_name, only_if_exists
1774 1730
1775char * 1731char *
1776XGetAtomName (rxvt_term *term, Atom atom) 1732XGetAtomName (rxvt_term *term, Atom atom)
1777 C_ARGS: term->display->display, atom 1733 C_ARGS: term->dpy, atom
1778 CLEANUP: 1734 CLEANUP:
1779 XFree (RETVAL); 1735 XFree (RETVAL);
1780 1736
1781void 1737void
1782XDeleteProperty (rxvt_term *term, Window window, Atom property) 1738XDeleteProperty (rxvt_term *term, Window window, Atom property)
1783 C_ARGS: term->display->display, window, property 1739 C_ARGS: term->dpy, window, property
1784 1740
1785Window 1741Window
1786rxvt_term::DefaultRootWindow () 1742rxvt_term::DefaultRootWindow ()
1787 CODE: 1743 CODE:
1788 RETVAL = THIS->display->root; 1744 RETVAL = THIS->display->root;
… …
1791 1747
1792#if 0 1748#if 0
1793 1749
1794Window 1750Window
1795XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1751XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1796 C_ARGS: term->display->display, (Window)parent, 1752 C_ARGS: term->dpy, (Window)parent,
1797 x, y, width, height, 0, 1753 x, y, width, height, 0,
1798 term->pix_colors_focused[Color_border], 1754 term->pix_colors_focused[Color_border],
1799 term->pix_colors_focused[Color_border] 1755 term->pix_colors_focused[Color_border]
1800 1756
1801#endif 1757#endif
1802 1758
1803void 1759void
1804XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1760XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1805 C_ARGS: term->display->display, window, parent, x, y 1761 C_ARGS: term->dpy, window, parent, x, y
1806 1762
1807void 1763void
1808XMapWindow (rxvt_term *term, Window window) 1764XMapWindow (rxvt_term *term, Window window)
1809 C_ARGS: term->display->display, window 1765 C_ARGS: term->dpy, window
1810 1766
1811void 1767void
1812XUnmapWindow (rxvt_term *term, Window window) 1768XUnmapWindow (rxvt_term *term, Window window)
1813 C_ARGS: term->display->display, window 1769 C_ARGS: term->dpy, window
1814 1770
1815void 1771void
1816XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1772XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1817 C_ARGS: term->display->display, window, x, y, width, height 1773 C_ARGS: term->dpy, window, x, y, width, height
1818 1774
1819void 1775void
1820rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1776rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1821 CODE: 1777 CODE:
1822{ 1778{
1823 XWindowAttributes attr; 1779 XWindowAttributes attr;
1824 XGetWindowAttributes (THIS->display->display, window, &attr); 1780 XGetWindowAttributes (THIS->dpy, window, &attr);
1825 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1781 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1826} 1782}
1827 1783
1828void 1784void
1829rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1785rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1830 PPCODE: 1786 PPCODE:
1831{ 1787{
1832 int dx, dy; 1788 int dx, dy;
1833 Window child; 1789 Window child;
1834 1790
1835 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1791 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1836 { 1792 {
1837 EXTEND (SP, 3); 1793 EXTEND (SP, 3);
1838 PUSHs (newSViv (dx)); 1794 PUSHs (newSViv (dx));
1839 PUSHs (newSViv (dy)); 1795 PUSHs (newSViv (dy));
1840 PUSHs (newSVuv (child)); 1796 PUSHs (newSVuv (child));
… …
1857overlay::hide () 1813overlay::hide ()
1858 1814
1859void 1815void
1860overlay::DESTROY () 1816overlay::DESTROY ()
1861 1817
1862############################################################################# 1818INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1863# urxvt::watcher
1864#############################################################################
1865 1819
1866MODULE = urxvt PACKAGE = urxvt::watcher
1867
1868CHAINED
1869perl_watcher::cb (SV *cb)
1870 CODE:
1871 THIS->cb (cb);
1872 OUTPUT:
1873 RETVAL
1874
1875#############################################################################
1876# urxvt::timer
1877#############################################################################
1878
1879MODULE = urxvt PACKAGE = urxvt::timer
1880
1881SV *
1882timer::new ()
1883 CODE:
1884 timer *w = new timer;
1885 w->start (NOW);
1886 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1887 w->self = (HV *)SvRV (RETVAL);
1888 OUTPUT:
1889 RETVAL
1890
1891NV
1892timer::at ()
1893 CODE:
1894 RETVAL = THIS->at;
1895 OUTPUT:
1896 RETVAL
1897
1898CHAINED
1899timer::interval (NV interval)
1900 CODE:
1901 THIS->interval = interval;
1902 OUTPUT:
1903 RETVAL
1904
1905CHAINED
1906timer::set (NV tstamp)
1907 CODE:
1908 THIS->set (tstamp);
1909 OUTPUT:
1910 RETVAL
1911
1912CHAINED
1913timer::start (NV tstamp = THIS->at)
1914 CODE:
1915 THIS->start (tstamp);
1916 OUTPUT:
1917 RETVAL
1918
1919CHAINED
1920timer::after (NV delay)
1921 CODE:
1922 THIS->start (NOW + delay);
1923 OUTPUT:
1924 RETVAL
1925
1926CHAINED
1927timer::stop ()
1928 CODE:
1929 THIS->stop ();
1930 OUTPUT:
1931 RETVAL
1932
1933void
1934timer::DESTROY ()
1935
1936#############################################################################
1937# urxvt::iow
1938#############################################################################
1939
1940MODULE = urxvt PACKAGE = urxvt::iow
1941
1942SV *
1943iow::new ()
1944 CODE:
1945 iow *w = new iow;
1946 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1947 w->self = (HV *)SvRV (RETVAL);
1948 OUTPUT:
1949 RETVAL
1950
1951CHAINED
1952iow::fd (int fd)
1953 CODE:
1954 THIS->fd = fd;
1955 OUTPUT:
1956 RETVAL
1957
1958CHAINED
1959iow::events (short events)
1960 CODE:
1961 THIS->events = events;
1962 OUTPUT:
1963 RETVAL
1964
1965CHAINED
1966iow::start ()
1967 CODE:
1968 THIS->start ();
1969 OUTPUT:
1970 RETVAL
1971
1972CHAINED
1973iow::stop ()
1974 CODE:
1975 THIS->stop ();
1976 OUTPUT:
1977 RETVAL
1978
1979void
1980iow::DESTROY ()
1981
1982#############################################################################
1983# urxvt::iw
1984#############################################################################
1985
1986MODULE = urxvt PACKAGE = urxvt::iw
1987
1988SV *
1989iw::new ()
1990 CODE:
1991 iw *w = new iw;
1992 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1993 w->self = (HV *)SvRV (RETVAL);
1994 OUTPUT:
1995 RETVAL
1996
1997CHAINED
1998iw::start ()
1999 CODE:
2000 THIS->start ();
2001 OUTPUT:
2002 RETVAL
2003
2004CHAINED
2005iw::stop ()
2006 CODE:
2007 THIS->stop ();
2008 OUTPUT:
2009 RETVAL
2010
2011void
2012iw::DESTROY ()
2013
2014#############################################################################
2015# urxvt::pw
2016#############################################################################
2017
2018MODULE = urxvt PACKAGE = urxvt::pw
2019
2020SV *
2021pw::new ()
2022 CODE:
2023 pw *w = new pw;
2024 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2025 w->self = (HV *)SvRV (RETVAL);
2026 OUTPUT:
2027 RETVAL
2028
2029CHAINED
2030pw::start (int pid)
2031 CODE:
2032 THIS->start (pid);
2033 OUTPUT:
2034 RETVAL
2035
2036CHAINED
2037pw::stop ()
2038 CODE:
2039 THIS->stop ();
2040 OUTPUT:
2041 RETVAL
2042
2043void
2044pw::DESTROY ()
2045
2046

Diff Legend

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