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.94 by root, Thu Jan 26 00:09:47 2006 UTC vs.
Revision 1.113 by ayin, Tue May 1 21:10:04 2007 UTC

… …
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
58 56
59static wchar_t * 57static wchar_t *
60sv2wcs (SV *sv) 58sv2wcs (SV *sv)
61{ 59{
… …
80new_ref (HV *hv, const char *klass) 78new_ref (HV *hv, const char *klass)
81{ 79{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 80 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83} 81}
84 82
85//TODO: use magic
86static SV * 83static SV *
87newSVptr (void *ptr, const char *klass) 84newSVptr (void *ptr, const char *klass)
88{ 85{
89 HV *hv = newHV (); 86 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 87 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
… …
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 110 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 111
115 return (long)mg->mg_ptr; 112 return (long)mg->mg_ptr;
116} 113}
117 114
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 115#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 116#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120
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 117
245///////////////////////////////////////////////////////////////////////////// 118/////////////////////////////////////////////////////////////////////////////
246 119
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 120#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 121
… …
269}; 142};
270 143
271overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 144overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
272: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 145: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
273{ 146{
147 if (w < 0) w = 0;
148 if (h < 0) h = 0;
149
274 if (border == 2) 150 if (border == 2)
275 { 151 {
276 w += 2; 152 w += 2;
277 h += 2; 153 h += 2;
278 } 154 }
… …
356 232
357 int i; 233 int i;
358 234
359 for (i = AvFILL (overlay_av); i >= 0; i--) 235 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) 236 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361 {
362 av_delete (overlay_av, i, G_DISCARD);
363 break; 237 break;
364 }
365 238
366 for (; i < AvFILL (overlay_av); i++) 239 for (; i < AvFILL (overlay_av); i++)
367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 240 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368 241
369 av_pop (overlay_av); 242 av_pop (overlay_av);
… …
426 } 299 }
427 300
428 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
429} 302}
430 303
304/////////////////////////////////////////////////////////////////////////////
305
306#define IOM_CLASS "urxvt"
307#define IOM_WARN rxvt_warn
308#include <iom_perl.h>
431 309
432///////////////////////////////////////////////////////////////////////////// 310/////////////////////////////////////////////////////////////////////////////
433 311
434struct rxvt_perl_interp rxvt_perl; 312struct rxvt_perl_interp rxvt_perl;
435 313
… …
494static void 372static void
495ungrab (rxvt_term *THIS) 373ungrab (rxvt_term *THIS)
496{ 374{
497 if (THIS->perl.grabtime) 375 if (THIS->perl.grabtime)
498 { 376 {
499 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 377 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
500 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 378 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
501 THIS->perl.grabtime = 0; 379 THIS->perl.grabtime = 0;
502 } 380 }
503} 381}
504 382
505bool 383bool
… …
763# include "optinc.h" 641# include "optinc.h"
764# undef nodef 642# undef nodef
765# undef def 643# undef def
766 644
767 HV *stash = gv_stashpv ("urxvt", 1); 645 HV *stash = gv_stashpv ("urxvt", 1);
768 struct { 646 static const struct {
769 const char *name; 647 const char *name;
770 IV iv; 648 IV iv;
771 } *civ, const_iv[] = { 649 } *civ, const_iv[] = {
772# define const_iv(name) { # name, (IV)name } 650# define const_iv(name) { # name, (IV)name }
773 const_iv (DEFAULT_RSTYLE), 651 const_iv (DEFAULT_RSTYLE),
… …
792 const_iv (Button3Mask), 670 const_iv (Button3Mask),
793 const_iv (Button4Mask), 671 const_iv (Button4Mask),
794 const_iv (Button5Mask), 672 const_iv (Button5Mask),
795 const_iv (AnyModifier), 673 const_iv (AnyModifier),
796 674
797 const_iv (EVENT_NONE), 675 const_iv (NoSymbol),
798 const_iv (EVENT_READ), 676 const_iv (GrabModeSync),
799 const_iv (EVENT_WRITE), 677 const_iv (GrabModeAsync),
800 678
801 const_iv (NoEventMask), 679 const_iv (NoEventMask),
802 const_iv (KeyPressMask), 680 const_iv (KeyPressMask),
803 const_iv (KeyReleaseMask), 681 const_iv (KeyReleaseMask),
804 const_iv (ButtonPressMask), 682 const_iv (ButtonPressMask),
… …
883 const_iv (XIMDontChange), 761 const_iv (XIMDontChange),
884# endif 762# endif
885# endif 763# endif
886 }; 764 };
887 765
888 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 766 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
889 civ-- > const_iv; )
890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 767 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
891} 768}
892 769
893void 770void
894warn (const char *msg) 771warn (const char *msg)
… …
925 RETVAL 802 RETVAL
926 803
927int 804int
928SET_FGCOLOR (int rend, int new_color) 805SET_FGCOLOR (int rend, int new_color)
929 CODE: 806 CODE:
930 RETVAL = SET_FGCOLOR (rend, new_color); 807 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
931 OUTPUT: 808 OUTPUT:
932 RETVAL 809 RETVAL
933 810
934int 811int
935SET_BGCOLOR (int rend, int new_color) 812SET_BGCOLOR (int rend, int new_color)
936 CODE: 813 CODE:
937 RETVAL = SET_BGCOLOR (rend, new_color); 814 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
938 OUTPUT: 815 OUTPUT:
939 RETVAL 816 RETVAL
940 817
941int 818int
942GET_CUSTOM (int rend) 819GET_CUSTOM (int rend)
943 CODE: 820 CODE:
944 RETVAL = (rend && RS_customMask) >> RS_customShift; 821 RETVAL = (rend & RS_customMask) >> RS_customShift;
945 OUTPUT: 822 OUTPUT:
946 RETVAL 823 RETVAL
947 824
948int 825int
949SET_CUSTOM (int rend, int new_value) 826SET_CUSTOM (int rend, int new_value)
… …
956 | ((new_value << RS_customShift) & RS_customMask); 833 | ((new_value << RS_customShift) & RS_customMask);
957} 834}
958 OUTPUT: 835 OUTPUT:
959 RETVAL 836 RETVAL
960 837
838void
839termlist ()
840 PPCODE:
841{
842 EXTEND (SP, rxvt_term::termlist.size ());
843
844 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
845 if ((*t)->perl.self)
846 PUSHs (sv_2mortal (newSVterm (*t)));
847}
848
961MODULE = urxvt PACKAGE = urxvt::term 849MODULE = urxvt PACKAGE = urxvt::term
962 850
963SV * 851SV *
964_new (...) 852_new (AV *env, AV *arg)
965 CODE: 853 CODE:
966{ 854{
967 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
968 croak ("first argument to urxvt::term->_new must be arrayref");
969
970 rxvt_term *term = new rxvt_term; 855 rxvt_term *term = new rxvt_term;
971 856
972 stringvec *argv = new stringvec; 857 stringvec *argv = new stringvec;
973 stringvec *envv = new stringvec; 858 stringvec *envv = new stringvec;
974 859
975 for (int i = 1; i < items; i++) 860 for (int i = 0; i <= AvFILL (arg); i++)
976 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 861 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
977 862
978 AV *env = (AV *)SvRV (ST (0));
979 for (int i = AvFILL (env) + 1; i--; ) 863 for (int i = AvFILL (env) + 1; i--; )
980 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 864 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
981 865
982 envv->push_back (0); 866 envv->push_back (0);
983 867
… …
1010void 894void
1011rxvt_term::set_should_invoke (int htype, int inc) 895rxvt_term::set_should_invoke (int htype, int inc)
1012 CODE: 896 CODE:
1013 THIS->perl.should_invoke [htype] += inc; 897 THIS->perl.should_invoke [htype] += inc;
1014 898
1015void 899int
1016rxvt_term::grab_button (int button, U32 modifiers) 900rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1017 CODE: 901 CODE:
1018 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 902 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1019 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 903 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1020 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 904 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
905 OUTPUT: RETVAL
906
907int
908rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
909 CODE:
910 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
911 OUTPUT: RETVAL
912
913void
914rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
915 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
916 CODE:
917 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
918
919void
920rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
921 CODE:
922 XUngrabKey (THIS->dpy, keycode, modifiers, window);
923
924void
925rxvt_term::XUngrabKeyboard (Time eventtime)
926 CODE:
927 XUngrabKeyboard (THIS->dpy, eventtime);
1021 928
1022bool 929bool
1023rxvt_term::grab (Time eventtime, int sync = 0) 930rxvt_term::grab (Time eventtime, int sync = 0)
1024 CODE: 931 CODE:
1025{ 932{
1026 int mode = sync ? GrabModeSync : GrabModeAsync; 933 int mode = sync ? GrabModeSync : GrabModeAsync;
1027 934
1028 THIS->perl.grabtime = 0; 935 THIS->perl.grabtime = 0;
1029 936
1030 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 937 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1031 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 938 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1032 mode, mode, None, GRAB_CURSOR, eventtime)) 939 mode, mode, None, GRAB_CURSOR, eventtime))
1033 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 940 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1034 THIS->perl.grabtime = eventtime; 941 THIS->perl.grabtime = eventtime;
1035 else 942 else
1036 XUngrabPointer (THIS->display->display, eventtime); 943 XUngrabPointer (THIS->dpy, eventtime);
1037 944
1038 RETVAL = !!THIS->perl.grabtime; 945 RETVAL = !!THIS->perl.grabtime;
1039} 946}
1040 OUTPUT: 947 OUTPUT:
1041 RETVAL 948 RETVAL
1042 949
1043void 950void
1044rxvt_term::allow_events_async () 951rxvt_term::allow_events_async ()
1045 CODE: 952 CODE:
1046 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 953 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1047 954
1048void 955void
1049rxvt_term::allow_events_sync () 956rxvt_term::allow_events_sync ()
1050 CODE: 957 CODE:
1051 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 958 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1052 959
1053void 960void
1054rxvt_term::allow_events_replay () 961rxvt_term::allow_events_replay ()
1055 CODE: 962 CODE:
1056 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1057 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 964 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1058 965
1059void 966void
1060rxvt_term::ungrab () 967rxvt_term::ungrab ()
1061 CODE: 968 CODE:
1062 ungrab (THIS); 969 ungrab (THIS);
970
971int
972rxvt_term::XStringToKeysym (char *string)
973 CODE:
974 RETVAL = XStringToKeysym (string);
975 OUTPUT: RETVAL
976
977char *
978rxvt_term::XKeysymToString (int sym)
979 CODE:
980 RETVAL = XKeysymToString (sym);
981 OUTPUT: RETVAL
982
983int
984rxvt_term::XKeysymToKeycode (int sym)
985 CODE:
986 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
987 OUTPUT: RETVAL
988
989int
990rxvt_term::XKeycodeToKeysym (int code, int index)
991 CODE:
992 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
993 OUTPUT: RETVAL
1063 994
1064int 995int
1065rxvt_term::strwidth (SV *str) 996rxvt_term::strwidth (SV *str)
1066 CODE: 997 CODE:
1067{ 998{
1068 wchar_t *wstr = sv2wcs (str); 999 wchar_t *wstr = sv2wcs (str);
1069 1000
1070 rxvt_push_locale (THIS->locale); 1001 rxvt_push_locale (THIS->locale);
1071 RETVAL = wcswidth (wstr, wcslen (wstr)); 1002 RETVAL = 0;
1003 for (wchar_t *wc = wstr; *wc; wc++)
1004 {
1005 int w = WCWIDTH (*wc);
1006
1007 if (w)
1008 RETVAL += max (w, 1);
1009 }
1072 rxvt_pop_locale (); 1010 rxvt_pop_locale ();
1073 1011
1074 free (wstr); 1012 free (wstr);
1075} 1013}
1076 OUTPUT: 1014 OUTPUT:
… …
1106 rxvt_pop_locale (); 1044 rxvt_pop_locale ();
1107 1045
1108 RETVAL = wcs2sv (wstr); 1046 RETVAL = wcs2sv (wstr);
1109 free (wstr); 1047 free (wstr);
1110} 1048}
1049 OUTPUT:
1050 RETVAL
1051
1052char *
1053rxvt_term::locale ()
1054 CODE:
1055 RETVAL = THIS->locale;
1111 OUTPUT: 1056 OUTPUT:
1112 RETVAL 1057 RETVAL
1113 1058
1114#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1115 1060
… …
1185 } 1130 }
1186 OUTPUT: 1131 OUTPUT:
1187 RETVAL 1132 RETVAL
1188 1133
1189SV * 1134SV *
1190rxvt_term::_env () 1135rxvt_term::envv ()
1136 ALIAS:
1137 argv = 1
1191 CODE: 1138 PPCODE:
1192{ 1139{
1193 if (THIS->envv) 1140 stringvec *vec = ix ? THIS->argv : THIS->envv;
1194 {
1195 AV *av = newAV ();
1196 1141
1142 EXTEND (SP, vec->size ());
1143
1197 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1144 for (char **i = vec->begin (); i != vec->end (); ++i)
1198 if (*i) 1145 if (*i)
1199 av_push (av, newSVpv (*i, 0)); 1146 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1200
1201 RETVAL = newRV_noinc ((SV *)av);
1202 }
1203 else
1204 RETVAL = &PL_sv_undef;
1205} 1147}
1206 OUTPUT:
1207 RETVAL
1208 1148
1209int 1149int
1210rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1150rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1211 CODE: 1151 CODE:
1212 RETVAL = THIS->pty_ev.events; 1152 RETVAL = THIS->pty_ev.events;
… …
1266void 1206void
1267rxvt_term::focus_in () 1207rxvt_term::focus_in ()
1268 1208
1269void 1209void
1270rxvt_term::focus_out () 1210rxvt_term::focus_out ()
1211
1212void
1213rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1214 ALIAS:
1215 key_release = 1
1216 CODE:
1217{
1218 XKeyEvent xkey;
1219
1220 memset (&xkey, 0, sizeof (xkey));
1221
1222 xkey.time = time;
1223 xkey.state = state;
1224 xkey.keycode = keycode;
1225
1226 xkey.type = ix ? KeyRelease : KeyPress;
1227 xkey.display = THIS->dpy;
1228 xkey.window = THIS->vt;
1229 xkey.root = THIS->display->root;
1230 xkey.subwindow = THIS->vt;
1231
1232 if (ix)
1233 THIS->key_release (xkey);
1234 else
1235 THIS->key_press (xkey);
1236}
1271 1237
1272void 1238void
1273rxvt_term::want_refresh () 1239rxvt_term::want_refresh ()
1274 CODE: 1240 CODE:
1275 THIS->want_refresh = 1; 1241 THIS->want_refresh = 1;
… …
1468 1434
1469void 1435void
1470rxvt_term::_resource (char *name, int index, SV *newval = 0) 1436rxvt_term::_resource (char *name, int index, SV *newval = 0)
1471 PPCODE: 1437 PPCODE:
1472{ 1438{
1473 struct resval { const char *name; int value; } rslist [] = { 1439 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1474# define def(name) { # name, Rs_ ## name }, 1440# define def(name) { # name, Rs_ ## name },
1475# define reserve(name,count) 1441# define reserve(name,count)
1476# include "rsinc.h" 1442# include "rsinc.h"
1477# undef def 1443# undef def
1478# undef reserve 1444# undef reserve
1479 }; 1445 };
1480 1446
1481 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1447 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1482 1448
1483 do { 1449 do {
1484 if (rs-- == rslist) 1450 if (rs-- == rslist)
1485 croak ("no such resource '%s', requested", name); 1451 croak ("no such resource '%s', requested", name);
1486 } while (strcmp (name, rs->name)); 1452 } while (strcmp (name, rs->name));
… …
1508 1474
1509const char * 1475const char *
1510rxvt_term::x_resource (const char *name) 1476rxvt_term::x_resource (const char *name)
1511 1477
1512bool 1478bool
1513rxvt_term::option (U32 optval, int set = -1) 1479rxvt_term::option (U8 optval, int set = -1)
1514 CODE: 1480 CODE:
1515{ 1481{
1516 RETVAL = THIS->options & optval; 1482 RETVAL = THIS->option (optval);
1517 1483
1518 if (set >= 0) 1484 if (set >= 0)
1519 { 1485 {
1520 if (set)
1521 THIS->options |= optval; 1486 THIS->set_option (optval, set);
1522 else
1523 THIS->options &= ~optval;
1524 1487
1525 if (THIS->check_ev.is_active ()) // avoid doing this before START 1488 if (THIS->check_ev.is_active ()) // avoid doing this before START
1526 switch (optval) 1489 switch (optval)
1527 { 1490 {
1528 case Opt_skipBuiltinGlyphs: 1491 case Opt_skipBuiltinGlyphs:
… …
1711void 1674void
1712rxvt_term::XListProperties (Window window) 1675rxvt_term::XListProperties (Window window)
1713 PPCODE: 1676 PPCODE:
1714{ 1677{
1715 int count; 1678 int count;
1716 Atom *props = XListProperties (THIS->display->display, window, &count); 1679 Atom *props = XListProperties (THIS->dpy, window, &count);
1717 1680
1718 EXTEND (SP, count); 1681 EXTEND (SP, count);
1719 while (count--) 1682 while (count--)
1720 PUSHs (newSVuv ((U32)props [count])); 1683 PUSHs (newSVuv ((U32)props [count]));
1721 1684
… …
1730 int format; 1693 int format;
1731 unsigned long nitems; 1694 unsigned long nitems;
1732 unsigned long bytes_after; 1695 unsigned long bytes_after;
1733 unsigned char *prop; 1696 unsigned char *prop;
1734 1697
1735 XGetWindowProperty (THIS->display->display, window, property, 1698 XGetWindowProperty (THIS->dpy, window, property,
1736 0, 1<<24, 0, AnyPropertyType, 1699 0, 1<<24, 0, AnyPropertyType,
1737 &type, &format, &nitems, &bytes_after, &prop); 1700 &type, &format, &nitems, &bytes_after, &prop);
1738 1701
1739 if (type != None) 1702 if (type != None)
1740 { 1703 {
… …
1759 1722
1760 int elemsize = format == 16 ? sizeof (short) 1723 int elemsize = format == 16 ? sizeof (short)
1761 : format == 32 ? sizeof (long) 1724 : format == 32 ? sizeof (long)
1762 : 1; 1725 : 1;
1763 1726
1764 XChangeProperty (THIS->display->display, window, property, 1727 XChangeProperty (THIS->dpy, window, property,
1765 type, format, PropModeReplace, 1728 type, format, PropModeReplace,
1766 (unsigned char *)data_, len / elemsize); 1729 (unsigned char *)data_, len / elemsize);
1767 XSync (THIS->display->display, 0);
1768} 1730}
1769 1731
1770Atom 1732Atom
1771XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1733XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1772 C_ARGS: term->display->display, atom_name, only_if_exists 1734 C_ARGS: term->dpy, atom_name, only_if_exists
1773 1735
1774char * 1736char *
1775XGetAtomName (rxvt_term *term, Atom atom) 1737XGetAtomName (rxvt_term *term, Atom atom)
1776 C_ARGS: term->display->display, atom 1738 C_ARGS: term->dpy, atom
1777 CLEANUP: 1739 CLEANUP:
1778 XFree (RETVAL); 1740 XFree (RETVAL);
1779 1741
1780void 1742void
1781XDeleteProperty (rxvt_term *term, Window window, Atom property) 1743XDeleteProperty (rxvt_term *term, Window window, Atom property)
1782 C_ARGS: term->display->display, window, property 1744 C_ARGS: term->dpy, window, property
1783 1745
1784Window 1746Window
1785rxvt_term::DefaultRootWindow () 1747rxvt_term::DefaultRootWindow ()
1786 CODE: 1748 CODE:
1787 RETVAL = THIS->display->root; 1749 RETVAL = THIS->display->root;
… …
1790 1752
1791#if 0 1753#if 0
1792 1754
1793Window 1755Window
1794XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1756XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1795 C_ARGS: term->display->display, (Window)parent, 1757 C_ARGS: term->dpy, (Window)parent,
1796 x, y, width, height, 0, 1758 x, y, width, height, 0,
1797 term->pix_colors_focused[Color_border], 1759 term->pix_colors_focused[Color_border],
1798 term->pix_colors_focused[Color_border] 1760 term->pix_colors_focused[Color_border]
1799 1761
1800#endif 1762#endif
1801 1763
1802void 1764void
1803XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1765XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1804 C_ARGS: term->display->display, window, parent, x, y 1766 C_ARGS: term->dpy, window, parent, x, y
1805 1767
1806void 1768void
1807XMapWindow (rxvt_term *term, Window window) 1769XMapWindow (rxvt_term *term, Window window)
1808 C_ARGS: term->display->display, window 1770 C_ARGS: term->dpy, window
1809 1771
1810void 1772void
1811XUnmapWindow (rxvt_term *term, Window window) 1773XUnmapWindow (rxvt_term *term, Window window)
1812 C_ARGS: term->display->display, window 1774 C_ARGS: term->dpy, window
1813 1775
1814void 1776void
1815XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1777XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1816 C_ARGS: term->display->display, window, x, y, width, height 1778 C_ARGS: term->dpy, window, x, y, width, height
1817 1779
1818void 1780void
1819rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1781rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1820 CODE: 1782 CODE:
1821{ 1783{
1822 XWindowAttributes attr; 1784 XWindowAttributes attr;
1823 XGetWindowAttributes (THIS->display->display, window, &attr); 1785 XGetWindowAttributes (THIS->dpy, window, &attr);
1824 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1786 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1825} 1787}
1826 1788
1827void 1789void
1828rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1790rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1829 PPCODE: 1791 PPCODE:
1830{ 1792{
1831 int dx, dy; 1793 int dx, dy;
1832 Window child; 1794 Window child;
1833 1795
1834 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1796 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1835 { 1797 {
1836 EXTEND (SP, 3); 1798 EXTEND (SP, 3);
1837 PUSHs (newSViv (dx)); 1799 PUSHs (newSViv (dx));
1838 PUSHs (newSViv (dy)); 1800 PUSHs (newSViv (dy));
1839 PUSHs (newSVuv (child)); 1801 PUSHs (newSVuv (child));
… …
1856overlay::hide () 1818overlay::hide ()
1857 1819
1858void 1820void
1859overlay::DESTROY () 1821overlay::DESTROY ()
1860 1822
1861############################################################################# 1823INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1862# urxvt::watcher
1863#############################################################################
1864 1824
1865MODULE = urxvt PACKAGE = urxvt::watcher
1866
1867CHAINED
1868perl_watcher::cb (SV *cb)
1869 CODE:
1870 THIS->cb (cb);
1871 OUTPUT:
1872 RETVAL
1873
1874#############################################################################
1875# urxvt::timer
1876#############################################################################
1877
1878MODULE = urxvt PACKAGE = urxvt::timer
1879
1880SV *
1881timer::new ()
1882 CODE:
1883 timer *w = new timer;
1884 w->start (NOW);
1885 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1886 w->self = (HV *)SvRV (RETVAL);
1887 OUTPUT:
1888 RETVAL
1889
1890NV
1891timer::at ()
1892 CODE:
1893 RETVAL = THIS->at;
1894 OUTPUT:
1895 RETVAL
1896
1897CHAINED
1898timer::interval (NV interval)
1899 CODE:
1900 THIS->interval = interval;
1901 OUTPUT:
1902 RETVAL
1903
1904CHAINED
1905timer::set (NV tstamp)
1906 CODE:
1907 THIS->set (tstamp);
1908 OUTPUT:
1909 RETVAL
1910
1911CHAINED
1912timer::start (NV tstamp = THIS->at)
1913 CODE:
1914 THIS->start (tstamp);
1915 OUTPUT:
1916 RETVAL
1917
1918CHAINED
1919timer::after (NV delay)
1920 CODE:
1921 THIS->start (NOW + delay);
1922 OUTPUT:
1923 RETVAL
1924
1925CHAINED
1926timer::stop ()
1927 CODE:
1928 THIS->stop ();
1929 OUTPUT:
1930 RETVAL
1931
1932void
1933timer::DESTROY ()
1934
1935#############################################################################
1936# urxvt::iow
1937#############################################################################
1938
1939MODULE = urxvt PACKAGE = urxvt::iow
1940
1941SV *
1942iow::new ()
1943 CODE:
1944 iow *w = new iow;
1945 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1946 w->self = (HV *)SvRV (RETVAL);
1947 OUTPUT:
1948 RETVAL
1949
1950CHAINED
1951iow::fd (int fd)
1952 CODE:
1953 THIS->fd = fd;
1954 OUTPUT:
1955 RETVAL
1956
1957CHAINED
1958iow::events (short events)
1959 CODE:
1960 THIS->events = events;
1961 OUTPUT:
1962 RETVAL
1963
1964CHAINED
1965iow::start ()
1966 CODE:
1967 THIS->start ();
1968 OUTPUT:
1969 RETVAL
1970
1971CHAINED
1972iow::stop ()
1973 CODE:
1974 THIS->stop ();
1975 OUTPUT:
1976 RETVAL
1977
1978void
1979iow::DESTROY ()
1980
1981#############################################################################
1982# urxvt::iw
1983#############################################################################
1984
1985MODULE = urxvt PACKAGE = urxvt::iw
1986
1987SV *
1988iw::new ()
1989 CODE:
1990 iw *w = new iw;
1991 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1992 w->self = (HV *)SvRV (RETVAL);
1993 OUTPUT:
1994 RETVAL
1995
1996CHAINED
1997iw::start ()
1998 CODE:
1999 THIS->start ();
2000 OUTPUT:
2001 RETVAL
2002
2003CHAINED
2004iw::stop ()
2005 CODE:
2006 THIS->stop ();
2007 OUTPUT:
2008 RETVAL
2009
2010void
2011iw::DESTROY ()
2012
2013#############################################################################
2014# urxvt::pw
2015#############################################################################
2016
2017MODULE = urxvt PACKAGE = urxvt::pw
2018
2019SV *
2020pw::new ()
2021 CODE:
2022 pw *w = new pw;
2023 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2024 w->self = (HV *)SvRV (RETVAL);
2025 OUTPUT:
2026 RETVAL
2027
2028CHAINED
2029pw::start (int pid)
2030 CODE:
2031 THIS->start (pid);
2032 OUTPUT:
2033 RETVAL
2034
2035CHAINED
2036pw::stop ()
2037 CODE:
2038 THIS->stop ();
2039 OUTPUT:
2040 RETVAL
2041
2042void
2043pw::DESTROY ()
2044
2045

Diff Legend

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