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.95 by root, Sun Jan 29 20:51:28 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));
… …
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 }
… …
356 226
357 int i; 227 int i;
358 228
359 for (i = AvFILL (overlay_av); i >= 0; i--) 229 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) 230 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361 {
362 av_delete (overlay_av, i, G_DISCARD);
363 break; 231 break;
364 }
365 232
366 for (; i < AvFILL (overlay_av); i++) 233 for (; i < AvFILL (overlay_av); i++)
367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 234 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368 235
369 av_pop (overlay_av); 236 av_pop (overlay_av);
… …
426 } 293 }
427 294
428 THIS->want_refresh = 1; 295 THIS->want_refresh = 1;
429} 296}
430 297
298/////////////////////////////////////////////////////////////////////////////
299
300#define IOM_CLASS "urxvt"
301#define IOM_WARN rxvt_warn
302#include <iom_perl.h>
431 303
432///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
433 305
434struct rxvt_perl_interp rxvt_perl; 306struct rxvt_perl_interp rxvt_perl;
435 307
… …
494static void 366static void
495ungrab (rxvt_term *THIS) 367ungrab (rxvt_term *THIS)
496{ 368{
497 if (THIS->perl.grabtime) 369 if (THIS->perl.grabtime)
498 { 370 {
499 XUngrabKeyboard (THIS->xdisp, THIS->perl.grabtime); 371 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
500 XUngrabPointer (THIS->xdisp, THIS->perl.grabtime); 372 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
501 THIS->perl.grabtime = 0; 373 THIS->perl.grabtime = 0;
502 } 374 }
503} 375}
504 376
505bool 377bool
… …
510 382
511 // pre-handling of some events 383 // pre-handling of some events
512 if (htype == HOOK_REFRESH_END) 384 if (htype == HOOK_REFRESH_END)
513 { 385 {
514 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));
515 387
516 for (int i = 0; i <= AvFILL (av); i++) 388 for (int i = 0; i <= AvFILL (av); i++)
517 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 389 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
518 } 390 }
519 391
520 swap (perl_environ, environ); 392 swap (perl_environ, environ);
… …
719 591
720 // post-handling of some events 592 // post-handling of some events
721 if (htype == HOOK_REFRESH_BEGIN) 593 if (htype == HOOK_REFRESH_BEGIN)
722 { 594 {
723 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));
724 596
725 for (int i = AvFILL (av); i >= 0; i--) 597 for (int i = AvFILL (av); i >= 0; i--)
726 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 598 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
727 } 599 }
728 else if (htype == HOOK_DESTROY) 600 else if (htype == HOOK_DESTROY)
729 { 601 {
730 clearSVptr ((SV *)term->perl.self); 602 clearSVptr ((SV *)term->perl.self);
731 SvREFCNT_dec ((SV *)term->perl.self); 603 SvREFCNT_dec ((SV *)term->perl.self);
732 604
733 // don't allow further calls 605 // don't allow further calls
734 term->perl.self = 0; 606 term->perl.self = 0;
735 } 607 }
736 608
737 swap (perl_environ, environ); 609 swap (perl_environ, environ);
… …
763# include "optinc.h" 635# include "optinc.h"
764# undef nodef 636# undef nodef
765# undef def 637# undef def
766 638
767 HV *stash = gv_stashpv ("urxvt", 1); 639 HV *stash = gv_stashpv ("urxvt", 1);
768 struct { 640 static const struct {
769 const char *name; 641 const char *name;
770 IV iv; 642 IV iv;
771 } *civ, const_iv[] = { 643 } *civ, const_iv[] = {
772# define const_iv(name) { # name, (IV)name } 644# define const_iv(name) { # name, (IV)name }
773 const_iv (DEFAULT_RSTYLE), 645 const_iv (DEFAULT_RSTYLE),
… …
792 const_iv (Button3Mask), 664 const_iv (Button3Mask),
793 const_iv (Button4Mask), 665 const_iv (Button4Mask),
794 const_iv (Button5Mask), 666 const_iv (Button5Mask),
795 const_iv (AnyModifier), 667 const_iv (AnyModifier),
796 668
797 const_iv (EVENT_NONE), 669 const_iv (NoSymbol),
798 const_iv (EVENT_READ), 670 const_iv (GrabModeSync),
799 const_iv (EVENT_WRITE), 671 const_iv (GrabModeAsync),
800 672
801 const_iv (NoEventMask), 673 const_iv (NoEventMask),
802 const_iv (KeyPressMask), 674 const_iv (KeyPressMask),
803 const_iv (KeyReleaseMask), 675 const_iv (KeyReleaseMask),
804 const_iv (ButtonPressMask), 676 const_iv (ButtonPressMask),
… …
883 const_iv (XIMDontChange), 755 const_iv (XIMDontChange),
884# endif 756# endif
885# endif 757# endif
886 }; 758 };
887 759
888 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; )
889 civ-- > const_iv; )
890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
891} 762}
892 763
893void 764void
894warn (const char *msg) 765warn (const char *msg)
… …
904_exit (int status) 775_exit (int status)
905 776
906NV 777NV
907NOW () 778NOW ()
908 CODE: 779 CODE:
909 RETVAL = NOW; 780 RETVAL = ev::now ();
910 OUTPUT: 781 OUTPUT:
911 RETVAL 782 RETVAL
912 783
913int 784int
914GET_BASEFG (int rend) 785GET_BASEFG (int rend)
… …
925 RETVAL 796 RETVAL
926 797
927int 798int
928SET_FGCOLOR (int rend, int new_color) 799SET_FGCOLOR (int rend, int new_color)
929 CODE: 800 CODE:
930 RETVAL = SET_FGCOLOR (rend, new_color); 801 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
931 OUTPUT: 802 OUTPUT:
932 RETVAL 803 RETVAL
933 804
934int 805int
935SET_BGCOLOR (int rend, int new_color) 806SET_BGCOLOR (int rend, int new_color)
936 CODE: 807 CODE:
937 RETVAL = SET_BGCOLOR (rend, new_color); 808 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
938 OUTPUT: 809 OUTPUT:
939 RETVAL 810 RETVAL
940 811
941int 812int
942GET_CUSTOM (int rend) 813GET_CUSTOM (int rend)
943 CODE: 814 CODE:
944 RETVAL = (rend && RS_customMask) >> RS_customShift; 815 RETVAL = (rend & RS_customMask) >> RS_customShift;
945 OUTPUT: 816 OUTPUT:
946 RETVAL 817 RETVAL
947 818
948int 819int
949SET_CUSTOM (int rend, int new_value) 820SET_CUSTOM (int rend, int new_value)
… …
986 for (int i = AvFILL (env) + 1; i--; ) 857 for (int i = AvFILL (env) + 1; i--; )
987 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
988 859
989 envv->push_back (0); 860 envv->push_back (0);
990 861
991 bool success;
992
993 try 862 try
994 { 863 {
995 success = term->init (argv, envv); 864 term->init (argv, envv);
996 } 865 }
997 catch (const class rxvt_failure_exception &e) 866 catch (const class rxvt_failure_exception &e)
998 {
999 success = false;
1000 }
1001
1002 if (!success)
1003 { 867 {
1004 term->destroy (); 868 term->destroy ();
1005 croak ("error while initializing new terminal instance"); 869 croak ("error while initializing new terminal instance");
1006 } 870 }
1007 871
… …
1017void 881void
1018rxvt_term::set_should_invoke (int htype, int inc) 882rxvt_term::set_should_invoke (int htype, int inc)
1019 CODE: 883 CODE:
1020 THIS->perl.should_invoke [htype] += inc; 884 THIS->perl.should_invoke [htype] += inc;
1021 885
1022void 886int
1023rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 887rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1024 CODE: 888 CODE:
1025 XGrabButton (THIS->xdisp, button, modifiers, window, 1, 889 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1026 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 890 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1027 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 891 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
892 OUTPUT: RETVAL
1028 893
1029void 894int
1030rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt) 895rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1031 CODE: 896 CODE:
1032 XUngrabButton (THIS->xdisp, button, modifiers, window); 897 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
898 OUTPUT: RETVAL
1033 899
1034#if 0
1035
1036void 900void
1037XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 901rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1038 C_ARGS: 902 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1039 THIS->xdisp, keycode, modifiers, window, 1, 903 CODE:
1040 GrabModeSync, GrabModeSync 904 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1041 905
1042void 906void
1043XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 907rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
1044 C_ARGS: THIS->xdisp, keycode, modifiers, window 908 CODE:
909 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1045 910
1046#endif 911void
912rxvt_term::XUngrabKeyboard (Time eventtime)
913 CODE:
914 XUngrabKeyboard (THIS->dpy, eventtime);
1047 915
1048bool 916bool
1049rxvt_term::grab (Time eventtime, int sync = 0) 917rxvt_term::grab (Time eventtime, int sync = 0)
1050 CODE: 918 CODE:
1051{ 919{
1052 int mode = sync ? GrabModeSync : GrabModeAsync; 920 int mode = sync ? GrabModeSync : GrabModeAsync;
1053 921
1054 THIS->perl.grabtime = 0; 922 THIS->perl.grabtime = 0;
1055 923
1056 if (!XGrabPointer (THIS->xdisp, THIS->vt, 0, 924 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1057 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 925 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1058 mode, mode, None, GRAB_CURSOR, eventtime)) 926 mode, mode, None, GRAB_CURSOR, eventtime))
1059 if (!XGrabKeyboard (THIS->xdisp, THIS->vt, 0, mode, mode, eventtime)) 927 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1060 THIS->perl.grabtime = eventtime; 928 THIS->perl.grabtime = eventtime;
1061 else 929 else
1062 XUngrabPointer (THIS->xdisp, eventtime); 930 XUngrabPointer (THIS->dpy, eventtime);
1063 931
1064 RETVAL = !!THIS->perl.grabtime; 932 RETVAL = !!THIS->perl.grabtime;
1065} 933}
1066 OUTPUT: 934 OUTPUT:
1067 RETVAL 935 RETVAL
1068 936
1069void 937void
1070rxvt_term::allow_events_async () 938rxvt_term::allow_events_async ()
1071 CODE: 939 CODE:
1072 XAllowEvents (THIS->xdisp, AsyncBoth, THIS->perl.grabtime); 940 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1073 941
1074void 942void
1075rxvt_term::allow_events_sync () 943rxvt_term::allow_events_sync ()
1076 CODE: 944 CODE:
1077 XAllowEvents (THIS->xdisp, SyncBoth, THIS->perl.grabtime); 945 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1078 946
1079void 947void
1080rxvt_term::allow_events_replay () 948rxvt_term::allow_events_replay ()
1081 CODE: 949 CODE:
1082 XAllowEvents (THIS->xdisp, ReplayPointer, THIS->perl.grabtime); 950 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1083 XAllowEvents (THIS->xdisp, ReplayKeyboard, THIS->perl.grabtime); 951 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1084 952
1085void 953void
1086rxvt_term::ungrab () 954rxvt_term::ungrab ()
1087 CODE: 955 CODE:
1088 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
1089 981
1090int 982int
1091rxvt_term::strwidth (SV *str) 983rxvt_term::strwidth (SV *str)
1092 CODE: 984 CODE:
1093{ 985{
1094 wchar_t *wstr = sv2wcs (str); 986 wchar_t *wstr = sv2wcs (str);
1095 987
1096 rxvt_push_locale (THIS->locale); 988 rxvt_push_locale (THIS->locale);
1097 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 }
1098 rxvt_pop_locale (); 997 rxvt_pop_locale ();
1099 998
1100 free (wstr); 999 free (wstr);
1101} 1000}
1102 OUTPUT: 1001 OUTPUT:
… …
1132 rxvt_pop_locale (); 1031 rxvt_pop_locale ();
1133 1032
1134 RETVAL = wcs2sv (wstr); 1033 RETVAL = wcs2sv (wstr);
1135 free (wstr); 1034 free (wstr);
1136} 1035}
1036 OUTPUT:
1037 RETVAL
1038
1039char *
1040rxvt_term::locale ()
1041 CODE:
1042 RETVAL = THIS->locale;
1137 OUTPUT: 1043 OUTPUT:
1138 RETVAL 1044 RETVAL
1139 1045
1140#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1046#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1141 1047
… …
1211 } 1117 }
1212 OUTPUT: 1118 OUTPUT:
1213 RETVAL 1119 RETVAL
1214 1120
1215SV * 1121SV *
1216rxvt_term::_env () 1122rxvt_term::envv ()
1123 ALIAS:
1124 argv = 1
1217 CODE: 1125 PPCODE:
1218{ 1126{
1219 if (THIS->envv) 1127 stringvec *vec = ix ? THIS->argv : THIS->envv;
1220 {
1221 AV *av = newAV ();
1222 1128
1129 EXTEND (SP, vec->size ());
1130
1223 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1131 for (char **i = vec->begin (); i != vec->end (); ++i)
1224 if (*i) 1132 if (*i)
1225 av_push (av, newSVpv (*i, 0)); 1133 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1226
1227 RETVAL = newRV_noinc ((SV *)av);
1228 }
1229 else
1230 RETVAL = &PL_sv_undef;
1231} 1134}
1232 OUTPUT:
1233 RETVAL
1234 1135
1235int 1136int
1236rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1137rxvt_term::pty_ev_events (int events = ev::UNDEF)
1237 CODE: 1138 CODE:
1238 RETVAL = THIS->pty_ev.events; 1139 RETVAL = THIS->pty_ev.events;
1239 if (events != EVENT_UNDEF) 1140 if (events != ev::UNDEF)
1240 THIS->pty_ev.set (events); 1141 THIS->pty_ev.set (events);
1241 OUTPUT: 1142 OUTPUT:
1242 RETVAL 1143 RETVAL
1243 1144
1244int 1145int
… …
1292void 1193void
1293rxvt_term::focus_in () 1194rxvt_term::focus_in ()
1294 1195
1295void 1196void
1296rxvt_term::focus_out () 1197rxvt_term::focus_out ()
1198
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}
1297 1224
1298void 1225void
1299rxvt_term::want_refresh () 1226rxvt_term::want_refresh ()
1300 CODE: 1227 CODE:
1301 THIS->want_refresh = 1; 1228 THIS->want_refresh = 1;
… …
1461SV * 1388SV *
1462rxvt_term::special_decode (SV *text) 1389rxvt_term::special_decode (SV *text)
1463 CODE: 1390 CODE:
1464{ 1391{
1465 wchar_t *wstr = sv2wcs (text); 1392 wchar_t *wstr = sv2wcs (text);
1466 int wlen = wcslen (wstr);
1467 int dlen = 0; 1393 int dlen = 0;
1468 1394
1469 // find length 1395 // find length
1470 for (wchar_t *s = wstr; *s; s++) 1396 for (wchar_t *s = wstr; *s; s++)
1471 if (*s == NOCHAR) 1397 if (*s == NOCHAR)
… …
1494 1420
1495void 1421void
1496rxvt_term::_resource (char *name, int index, SV *newval = 0) 1422rxvt_term::_resource (char *name, int index, SV *newval = 0)
1497 PPCODE: 1423 PPCODE:
1498{ 1424{
1499 struct resval { const char *name; int value; } rslist [] = { 1425 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1500# define def(name) { # name, Rs_ ## name }, 1426# define def(name) { # name, Rs_ ## name },
1501# define reserve(name,count) 1427# define reserve(name,count)
1502# include "rsinc.h" 1428# include "rsinc.h"
1503# undef def 1429# undef def
1504# undef reserve 1430# undef reserve
1505 }; 1431 };
1506 1432
1507 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1433 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1508 1434
1509 do { 1435 do {
1510 if (rs-- == rslist) 1436 if (rs-- == rslist)
1511 croak ("no such resource '%s', requested", name); 1437 croak ("no such resource '%s', requested", name);
1512 } while (strcmp (name, rs->name)); 1438 } while (strcmp (name, rs->name));
… …
1534 1460
1535const char * 1461const char *
1536rxvt_term::x_resource (const char *name) 1462rxvt_term::x_resource (const char *name)
1537 1463
1538bool 1464bool
1539rxvt_term::option (U32 optval, int set = -1) 1465rxvt_term::option (U8 optval, int set = -1)
1540 CODE: 1466 CODE:
1541{ 1467{
1542 RETVAL = THIS->options & optval; 1468 RETVAL = THIS->option (optval);
1543 1469
1544 if (set >= 0) 1470 if (set >= 0)
1545 { 1471 {
1546 if (set)
1547 THIS->options |= optval; 1472 THIS->set_option (optval, set);
1548 else
1549 THIS->options &= ~optval;
1550 1473
1551 if (THIS->check_ev.is_active ()) // avoid doing this before START 1474 if (THIS->prepare_ev.is_active ()) // avoid doing this before START
1552 switch (optval) 1475 switch (optval)
1553 { 1476 {
1554 case Opt_skipBuiltinGlyphs: 1477 case Opt_skipBuiltinGlyphs:
1555 THIS->set_fonts (); 1478 THIS->set_fonts ();
1556 THIS->scr_remap_chars (); 1479 THIS->scr_remap_chars ();
… …
1737void 1660void
1738rxvt_term::XListProperties (Window window) 1661rxvt_term::XListProperties (Window window)
1739 PPCODE: 1662 PPCODE:
1740{ 1663{
1741 int count; 1664 int count;
1742 Atom *props = XListProperties (THIS->xdisp, window, &count); 1665 Atom *props = XListProperties (THIS->dpy, window, &count);
1743 1666
1744 EXTEND (SP, count); 1667 EXTEND (SP, count);
1745 while (count--) 1668 while (count--)
1746 PUSHs (newSVuv ((U32)props [count])); 1669 PUSHs (newSVuv ((U32)props [count]));
1747 1670
1748 XFree (props); 1671 XFree (props);
1749} 1672}
1750 1673
1751void 1674void
1752rxvt_term::XGetWindowProperty (Window window, Atom property) 1675rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1756 int format; 1679 int format;
1757 unsigned long nitems; 1680 unsigned long nitems;
1758 unsigned long bytes_after; 1681 unsigned long bytes_after;
1759 unsigned char *prop; 1682 unsigned char *prop;
1760 1683
1761 XGetWindowProperty (THIS->xdisp, window, property, 1684 XGetWindowProperty (THIS->dpy, window, property,
1762 0, 1<<24, 0, AnyPropertyType, 1685 0, 1<<24, 0, AnyPropertyType,
1763 &type, &format, &nitems, &bytes_after, &prop); 1686 &type, &format, &nitems, &bytes_after, &prop);
1764 1687
1765 if (type != None) 1688 if (type != None)
1766 { 1689 {
… …
1785 1708
1786 int elemsize = format == 16 ? sizeof (short) 1709 int elemsize = format == 16 ? sizeof (short)
1787 : format == 32 ? sizeof (long) 1710 : format == 32 ? sizeof (long)
1788 : 1; 1711 : 1;
1789 1712
1790 XChangeProperty (THIS->xdisp, window, property, 1713 XChangeProperty (THIS->dpy, window, property,
1791 type, format, PropModeReplace, 1714 type, format, PropModeReplace,
1792 (unsigned char *)data_, len / elemsize); 1715 (unsigned char *)data_, len / elemsize);
1793 XSync (THIS->xdisp, 0);
1794} 1716}
1795 1717
1796Atom 1718Atom
1797XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1719XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1798 C_ARGS: term->xdisp, atom_name, only_if_exists 1720 C_ARGS: term->dpy, atom_name, only_if_exists
1799 1721
1800char * 1722char *
1801XGetAtomName (rxvt_term *term, Atom atom) 1723XGetAtomName (rxvt_term *term, Atom atom)
1802 C_ARGS: term->xdisp, atom 1724 C_ARGS: term->dpy, atom
1803 CLEANUP: 1725 CLEANUP:
1804 XFree (RETVAL); 1726 XFree (RETVAL);
1805 1727
1806void 1728void
1807XDeleteProperty (rxvt_term *term, Window window, Atom property) 1729XDeleteProperty (rxvt_term *term, Window window, Atom property)
1808 C_ARGS: term->xdisp, window, property 1730 C_ARGS: term->dpy, window, property
1809 1731
1810Window 1732Window
1811rxvt_term::DefaultRootWindow () 1733rxvt_term::DefaultRootWindow ()
1812 CODE: 1734 CODE:
1813 RETVAL = THIS->display->root; 1735 RETVAL = THIS->display->root;
… …
1816 1738
1817#if 0 1739#if 0
1818 1740
1819Window 1741Window
1820XCreateSimpleWindow (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)
1821 C_ARGS: term->xdisp, (Window)parent, 1743 C_ARGS: term->dpy, (Window)parent,
1822 x, y, width, height, 0, 1744 x, y, width, height, 0,
1823 term->pix_colors_focused[Color_border], 1745 term->pix_colors_focused[Color_border],
1824 term->pix_colors_focused[Color_border] 1746 term->pix_colors_focused[Color_border]
1825 1747
1826#endif 1748#endif
1827 1749
1828void 1750void
1829XReparentWindow (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)
1830 C_ARGS: term->xdisp, window, parent, x, y 1752 C_ARGS: term->dpy, window, parent, x, y
1831 1753
1832void 1754void
1833XMapWindow (rxvt_term *term, Window window) 1755XMapWindow (rxvt_term *term, Window window)
1834 C_ARGS: term->xdisp, window 1756 C_ARGS: term->dpy, window
1835 1757
1836void 1758void
1837XUnmapWindow (rxvt_term *term, Window window) 1759XUnmapWindow (rxvt_term *term, Window window)
1838 C_ARGS: term->xdisp, window 1760 C_ARGS: term->dpy, window
1839 1761
1840void 1762void
1841XMoveResizeWindow (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)
1842 C_ARGS: term->xdisp, window, x, y, width, height 1764 C_ARGS: term->dpy, window, x, y, width, height
1843 1765
1844void 1766void
1845rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1767rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1846 CODE: 1768 CODE:
1847{ 1769{
1848 XWindowAttributes attr; 1770 XWindowAttributes attr;
1849 XGetWindowAttributes (THIS->xdisp, window, &attr); 1771 XGetWindowAttributes (THIS->dpy, window, &attr);
1850 XSelectInput (THIS->xdisp, window, attr.your_event_mask | add_events & ~del_events); 1772 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1851} 1773}
1852 1774
1853void 1775void
1854rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1776rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1855 PPCODE: 1777 PPCODE:
1856{ 1778{
1857 int dx, dy; 1779 int dx, dy;
1858 Window child; 1780 Window child;
1859 1781
1860 if (XTranslateCoordinates (THIS->xdisp, src, dst, x, y, &dx, &dy, &child)) 1782 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1861 { 1783 {
1862 EXTEND (SP, 3); 1784 EXTEND (SP, 3);
1863 PUSHs (newSViv (dx)); 1785 PUSHs (newSViv (dx));
1864 PUSHs (newSViv (dy)); 1786 PUSHs (newSViv (dy));
1865 PUSHs (newSVuv (child)); 1787 PUSHs (newSVuv (child));
… …
1882overlay::hide () 1804overlay::hide ()
1883 1805
1884void 1806void
1885overlay::DESTROY () 1807overlay::DESTROY ()
1886 1808
1887############################################################################# 1809INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1888# urxvt::watcher
1889#############################################################################
1890 1810
1891MODULE = urxvt PACKAGE = urxvt::watcher
1892
1893CHAINED
1894perl_watcher::cb (SV *cb)
1895 CODE:
1896 THIS->cb (cb);
1897 OUTPUT:
1898 RETVAL
1899
1900#############################################################################
1901# urxvt::timer
1902#############################################################################
1903
1904MODULE = urxvt PACKAGE = urxvt::timer
1905
1906SV *
1907timer::new ()
1908 CODE:
1909 timer *w = new timer;
1910 w->start (NOW);
1911 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1912 w->self = (HV *)SvRV (RETVAL);
1913 OUTPUT:
1914 RETVAL
1915
1916NV
1917timer::at ()
1918 CODE:
1919 RETVAL = THIS->at;
1920 OUTPUT:
1921 RETVAL
1922
1923CHAINED
1924timer::interval (NV interval)
1925 CODE:
1926 THIS->interval = interval;
1927 OUTPUT:
1928 RETVAL
1929
1930CHAINED
1931timer::set (NV tstamp)
1932 CODE:
1933 THIS->set (tstamp);
1934 OUTPUT:
1935 RETVAL
1936
1937CHAINED
1938timer::start (NV tstamp = THIS->at)
1939 CODE:
1940 THIS->start (tstamp);
1941 OUTPUT:
1942 RETVAL
1943
1944CHAINED
1945timer::after (NV delay)
1946 CODE:
1947 THIS->start (NOW + delay);
1948 OUTPUT:
1949 RETVAL
1950
1951CHAINED
1952timer::stop ()
1953 CODE:
1954 THIS->stop ();
1955 OUTPUT:
1956 RETVAL
1957
1958void
1959timer::DESTROY ()
1960
1961#############################################################################
1962# urxvt::iow
1963#############################################################################
1964
1965MODULE = urxvt PACKAGE = urxvt::iow
1966
1967SV *
1968iow::new ()
1969 CODE:
1970 iow *w = new iow;
1971 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1972 w->self = (HV *)SvRV (RETVAL);
1973 OUTPUT:
1974 RETVAL
1975
1976CHAINED
1977iow::fd (int fd)
1978 CODE:
1979 THIS->fd = fd;
1980 OUTPUT:
1981 RETVAL
1982
1983CHAINED
1984iow::events (short events)
1985 CODE:
1986 THIS->events = events;
1987 OUTPUT:
1988 RETVAL
1989
1990CHAINED
1991iow::start ()
1992 CODE:
1993 THIS->start ();
1994 OUTPUT:
1995 RETVAL
1996
1997CHAINED
1998iow::stop ()
1999 CODE:
2000 THIS->stop ();
2001 OUTPUT:
2002 RETVAL
2003
2004void
2005iow::DESTROY ()
2006
2007#############################################################################
2008# urxvt::iw
2009#############################################################################
2010
2011MODULE = urxvt PACKAGE = urxvt::iw
2012
2013SV *
2014iw::new ()
2015 CODE:
2016 iw *w = new iw;
2017 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2018 w->self = (HV *)SvRV (RETVAL);
2019 OUTPUT:
2020 RETVAL
2021
2022CHAINED
2023iw::start ()
2024 CODE:
2025 THIS->start ();
2026 OUTPUT:
2027 RETVAL
2028
2029CHAINED
2030iw::stop ()
2031 CODE:
2032 THIS->stop ();
2033 OUTPUT:
2034 RETVAL
2035
2036void
2037iw::DESTROY ()
2038
2039#############################################################################
2040# urxvt::pw
2041#############################################################################
2042
2043MODULE = urxvt PACKAGE = urxvt::pw
2044
2045SV *
2046pw::new ()
2047 CODE:
2048 pw *w = new pw;
2049 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2050 w->self = (HV *)SvRV (RETVAL);
2051 OUTPUT:
2052 RETVAL
2053
2054CHAINED
2055pw::start (int pid)
2056 CODE:
2057 THIS->start (pid);
2058 OUTPUT:
2059 RETVAL
2060
2061CHAINED
2062pw::stop ()
2063 CODE:
2064 THIS->stop ();
2065 OUTPUT:
2066 RETVAL
2067
2068void
2069pw::DESTROY ()
2070
2071

Diff Legend

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