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.109 by root, Thu Dec 14 15:19:31 2006 UTC

… …
80new_ref (HV *hv, const char *klass) 80new_ref (HV *hv, const char *klass)
81{ 81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83} 83}
84 84
85//TODO: use magic
86static SV * 85static SV *
87newSVptr (void *ptr, const char *klass) 86newSVptr (void *ptr, const char *klass)
88{ 87{
89 HV *hv = newHV (); 88 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 89 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); 112 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 113
115 return (long)mg->mg_ptr; 114 return (long)mg->mg_ptr;
116} 115}
117 116
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 117#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 118#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 119
245///////////////////////////////////////////////////////////////////////////// 120/////////////////////////////////////////////////////////////////////////////
246 121
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 122#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 123
… …
269}; 144};
270 145
271overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 146overlay::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) 147: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
273{ 148{
149 if (w < 0) w = 0;
150 if (h < 0) h = 0;
151
274 if (border == 2) 152 if (border == 2)
275 { 153 {
276 w += 2; 154 w += 2;
277 h += 2; 155 h += 2;
278 } 156 }
… …
356 234
357 int i; 235 int i;
358 236
359 for (i = AvFILL (overlay_av); i >= 0; i--) 237 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) 238 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361 {
362 av_delete (overlay_av, i, G_DISCARD);
363 break; 239 break;
364 }
365 240
366 for (; i < AvFILL (overlay_av); i++) 241 for (; i < AvFILL (overlay_av); i++)
367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 242 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368 243
369 av_pop (overlay_av); 244 av_pop (overlay_av);
… …
426 } 301 }
427 302
428 THIS->want_refresh = 1; 303 THIS->want_refresh = 1;
429} 304}
430 305
306/////////////////////////////////////////////////////////////////////////////
307
308#define IOM_CLASS "urxvt"
309#include <iom_perl.h>
431 310
432///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
433 312
434struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
435 314
… …
494static void 373static void
495ungrab (rxvt_term *THIS) 374ungrab (rxvt_term *THIS)
496{ 375{
497 if (THIS->perl.grabtime) 376 if (THIS->perl.grabtime)
498 { 377 {
499 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 378 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
500 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 379 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
501 THIS->perl.grabtime = 0; 380 THIS->perl.grabtime = 0;
502 } 381 }
503} 382}
504 383
505bool 384bool
… …
763# include "optinc.h" 642# include "optinc.h"
764# undef nodef 643# undef nodef
765# undef def 644# undef def
766 645
767 HV *stash = gv_stashpv ("urxvt", 1); 646 HV *stash = gv_stashpv ("urxvt", 1);
768 struct { 647 static const struct {
769 const char *name; 648 const char *name;
770 IV iv; 649 IV iv;
771 } *civ, const_iv[] = { 650 } *civ, const_iv[] = {
772# define const_iv(name) { # name, (IV)name } 651# define const_iv(name) { # name, (IV)name }
773 const_iv (DEFAULT_RSTYLE), 652 const_iv (DEFAULT_RSTYLE),
… …
791 const_iv (Button2Mask), 670 const_iv (Button2Mask),
792 const_iv (Button3Mask), 671 const_iv (Button3Mask),
793 const_iv (Button4Mask), 672 const_iv (Button4Mask),
794 const_iv (Button5Mask), 673 const_iv (Button5Mask),
795 const_iv (AnyModifier), 674 const_iv (AnyModifier),
675
676 const_iv (NoSymbol),
677 const_iv (GrabModeSync),
678 const_iv (GrabModeAsync),
796 679
797 const_iv (EVENT_NONE), 680 const_iv (EVENT_NONE),
798 const_iv (EVENT_READ), 681 const_iv (EVENT_READ),
799 const_iv (EVENT_WRITE), 682 const_iv (EVENT_WRITE),
800 683
… …
883 const_iv (XIMDontChange), 766 const_iv (XIMDontChange),
884# endif 767# endif
885# endif 768# endif
886 }; 769 };
887 770
888 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 771 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)); 772 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
891} 773}
892 774
893void 775void
894warn (const char *msg) 776warn (const char *msg)
… …
925 RETVAL 807 RETVAL
926 808
927int 809int
928SET_FGCOLOR (int rend, int new_color) 810SET_FGCOLOR (int rend, int new_color)
929 CODE: 811 CODE:
930 RETVAL = SET_FGCOLOR (rend, new_color); 812 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
931 OUTPUT: 813 OUTPUT:
932 RETVAL 814 RETVAL
933 815
934int 816int
935SET_BGCOLOR (int rend, int new_color) 817SET_BGCOLOR (int rend, int new_color)
936 CODE: 818 CODE:
937 RETVAL = SET_BGCOLOR (rend, new_color); 819 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
938 OUTPUT: 820 OUTPUT:
939 RETVAL 821 RETVAL
940 822
941int 823int
942GET_CUSTOM (int rend) 824GET_CUSTOM (int rend)
943 CODE: 825 CODE:
944 RETVAL = (rend && RS_customMask) >> RS_customShift; 826 RETVAL = (rend & RS_customMask) >> RS_customShift;
945 OUTPUT: 827 OUTPUT:
946 RETVAL 828 RETVAL
947 829
948int 830int
949SET_CUSTOM (int rend, int new_value) 831SET_CUSTOM (int rend, int new_value)
… …
956 | ((new_value << RS_customShift) & RS_customMask); 838 | ((new_value << RS_customShift) & RS_customMask);
957} 839}
958 OUTPUT: 840 OUTPUT:
959 RETVAL 841 RETVAL
960 842
843void
844termlist ()
845 PPCODE:
846{
847 EXTEND (SP, rxvt_term::termlist.size ());
848
849 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
850 if ((*t)->perl.self)
851 PUSHs (sv_2mortal (newSVterm (*t)));
852}
853
961MODULE = urxvt PACKAGE = urxvt::term 854MODULE = urxvt PACKAGE = urxvt::term
962 855
963SV * 856SV *
964_new (...) 857_new (AV *env, AV *arg)
965 CODE: 858 CODE:
966{ 859{
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; 860 rxvt_term *term = new rxvt_term;
971 861
972 stringvec *argv = new stringvec; 862 stringvec *argv = new stringvec;
973 stringvec *envv = new stringvec; 863 stringvec *envv = new stringvec;
974 864
975 for (int i = 1; i < items; i++) 865 for (int i = 0; i <= AvFILL (arg); i++)
976 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 866 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
977 867
978 AV *env = (AV *)SvRV (ST (0));
979 for (int i = AvFILL (env) + 1; i--; ) 868 for (int i = AvFILL (env) + 1; i--; )
980 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 869 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
981 870
982 envv->push_back (0); 871 envv->push_back (0);
983 872
… …
1010void 899void
1011rxvt_term::set_should_invoke (int htype, int inc) 900rxvt_term::set_should_invoke (int htype, int inc)
1012 CODE: 901 CODE:
1013 THIS->perl.should_invoke [htype] += inc; 902 THIS->perl.should_invoke [htype] += inc;
1014 903
1015void 904int
1016rxvt_term::grab_button (int button, U32 modifiers) 905rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1017 CODE: 906 CODE:
1018 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 907 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1019 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 908 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1020 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 909 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
910 OUTPUT: RETVAL
911
912int
913rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
914 CODE:
915 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
916 OUTPUT: RETVAL
917
918void
919rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
920 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
921 CODE:
922 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
923
924void
925rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
926 CODE:
927 XUngrabKey (THIS->dpy, keycode, modifiers, window);
928
929void
930rxvt_term::XUngrabKeyboard (Time eventtime)
931 CODE:
932 XUngrabKeyboard (THIS->dpy, eventtime);
1021 933
1022bool 934bool
1023rxvt_term::grab (Time eventtime, int sync = 0) 935rxvt_term::grab (Time eventtime, int sync = 0)
1024 CODE: 936 CODE:
1025{ 937{
1026 int mode = sync ? GrabModeSync : GrabModeAsync; 938 int mode = sync ? GrabModeSync : GrabModeAsync;
1027 939
1028 THIS->perl.grabtime = 0; 940 THIS->perl.grabtime = 0;
1029 941
1030 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 942 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1031 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 943 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1032 mode, mode, None, GRAB_CURSOR, eventtime)) 944 mode, mode, None, GRAB_CURSOR, eventtime))
1033 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 945 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1034 THIS->perl.grabtime = eventtime; 946 THIS->perl.grabtime = eventtime;
1035 else 947 else
1036 XUngrabPointer (THIS->display->display, eventtime); 948 XUngrabPointer (THIS->dpy, eventtime);
1037 949
1038 RETVAL = !!THIS->perl.grabtime; 950 RETVAL = !!THIS->perl.grabtime;
1039} 951}
1040 OUTPUT: 952 OUTPUT:
1041 RETVAL 953 RETVAL
1042 954
1043void 955void
1044rxvt_term::allow_events_async () 956rxvt_term::allow_events_async ()
1045 CODE: 957 CODE:
1046 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 958 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1047 959
1048void 960void
1049rxvt_term::allow_events_sync () 961rxvt_term::allow_events_sync ()
1050 CODE: 962 CODE:
1051 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1052 964
1053void 965void
1054rxvt_term::allow_events_replay () 966rxvt_term::allow_events_replay ()
1055 CODE: 967 CODE:
1056 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 968 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1057 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 969 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1058 970
1059void 971void
1060rxvt_term::ungrab () 972rxvt_term::ungrab ()
1061 CODE: 973 CODE:
1062 ungrab (THIS); 974 ungrab (THIS);
975
976int
977rxvt_term::XStringToKeysym (char *string)
978 CODE:
979 RETVAL = XStringToKeysym (string);
980 OUTPUT: RETVAL
981
982char *
983rxvt_term::XKeysymToString (int sym)
984 CODE:
985 RETVAL = XKeysymToString (sym);
986 OUTPUT: RETVAL
987
988int
989rxvt_term::XKeysymToKeycode (int sym)
990 CODE:
991 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
992 OUTPUT: RETVAL
993
994int
995rxvt_term::XKeycodeToKeysym (int code, int index)
996 CODE:
997 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
998 OUTPUT: RETVAL
1063 999
1064int 1000int
1065rxvt_term::strwidth (SV *str) 1001rxvt_term::strwidth (SV *str)
1066 CODE: 1002 CODE:
1067{ 1003{
1068 wchar_t *wstr = sv2wcs (str); 1004 wchar_t *wstr = sv2wcs (str);
1069 1005
1070 rxvt_push_locale (THIS->locale); 1006 rxvt_push_locale (THIS->locale);
1071 RETVAL = wcswidth (wstr, wcslen (wstr)); 1007 RETVAL = 0;
1008 for (wchar_t *wc = wstr; *wc; wc++)
1009 {
1010 int w = WCWIDTH (*wc);
1011
1012 if (w)
1013 RETVAL += max (w, 1);
1014 }
1072 rxvt_pop_locale (); 1015 rxvt_pop_locale ();
1073 1016
1074 free (wstr); 1017 free (wstr);
1075} 1018}
1076 OUTPUT: 1019 OUTPUT:
… …
1106 rxvt_pop_locale (); 1049 rxvt_pop_locale ();
1107 1050
1108 RETVAL = wcs2sv (wstr); 1051 RETVAL = wcs2sv (wstr);
1109 free (wstr); 1052 free (wstr);
1110} 1053}
1054 OUTPUT:
1055 RETVAL
1056
1057char *
1058rxvt_term::locale ()
1059 CODE:
1060 RETVAL = THIS->locale;
1111 OUTPUT: 1061 OUTPUT:
1112 RETVAL 1062 RETVAL
1113 1063
1114#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1064#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1115 1065
… …
1185 } 1135 }
1186 OUTPUT: 1136 OUTPUT:
1187 RETVAL 1137 RETVAL
1188 1138
1189SV * 1139SV *
1190rxvt_term::_env () 1140rxvt_term::envv ()
1141 ALIAS:
1142 argv = 1
1191 CODE: 1143 PPCODE:
1192{ 1144{
1193 if (THIS->envv) 1145 stringvec *vec = ix ? THIS->argv : THIS->envv;
1194 {
1195 AV *av = newAV ();
1196 1146
1147 EXTEND (SP, vec->size ());
1148
1197 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1149 for (char **i = vec->begin (); i != vec->end (); ++i)
1198 if (*i) 1150 if (*i)
1199 av_push (av, newSVpv (*i, 0)); 1151 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1200
1201 RETVAL = newRV_noinc ((SV *)av);
1202 }
1203 else
1204 RETVAL = &PL_sv_undef;
1205} 1152}
1206 OUTPUT:
1207 RETVAL
1208 1153
1209int 1154int
1210rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1155rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1211 CODE: 1156 CODE:
1212 RETVAL = THIS->pty_ev.events; 1157 RETVAL = THIS->pty_ev.events;
… …
1266void 1211void
1267rxvt_term::focus_in () 1212rxvt_term::focus_in ()
1268 1213
1269void 1214void
1270rxvt_term::focus_out () 1215rxvt_term::focus_out ()
1216
1217void
1218rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1219 ALIAS:
1220 key_release = 1
1221 CODE:
1222{
1223 XKeyEvent xkey;
1224
1225 memset (&xkey, 0, sizeof (xkey));
1226
1227 xkey.time = time;
1228 xkey.state = state;
1229 xkey.keycode = keycode;
1230
1231 xkey.type = ix ? KeyRelease : KeyPress;
1232 xkey.display = THIS->dpy;
1233 xkey.window = THIS->vt;
1234 xkey.root = THIS->display->root;
1235 xkey.subwindow = THIS->vt;
1236
1237 if (ix)
1238 THIS->key_release (xkey);
1239 else
1240 THIS->key_press (xkey);
1241}
1271 1242
1272void 1243void
1273rxvt_term::want_refresh () 1244rxvt_term::want_refresh ()
1274 CODE: 1245 CODE:
1275 THIS->want_refresh = 1; 1246 THIS->want_refresh = 1;
… …
1468 1439
1469void 1440void
1470rxvt_term::_resource (char *name, int index, SV *newval = 0) 1441rxvt_term::_resource (char *name, int index, SV *newval = 0)
1471 PPCODE: 1442 PPCODE:
1472{ 1443{
1473 struct resval { const char *name; int value; } rslist [] = { 1444 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1474# define def(name) { # name, Rs_ ## name }, 1445# define def(name) { # name, Rs_ ## name },
1475# define reserve(name,count) 1446# define reserve(name,count)
1476# include "rsinc.h" 1447# include "rsinc.h"
1477# undef def 1448# undef def
1478# undef reserve 1449# undef reserve
1479 }; 1450 };
1480 1451
1481 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1452 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1482 1453
1483 do { 1454 do {
1484 if (rs-- == rslist) 1455 if (rs-- == rslist)
1485 croak ("no such resource '%s', requested", name); 1456 croak ("no such resource '%s', requested", name);
1486 } while (strcmp (name, rs->name)); 1457 } while (strcmp (name, rs->name));
… …
1711void 1682void
1712rxvt_term::XListProperties (Window window) 1683rxvt_term::XListProperties (Window window)
1713 PPCODE: 1684 PPCODE:
1714{ 1685{
1715 int count; 1686 int count;
1716 Atom *props = XListProperties (THIS->display->display, window, &count); 1687 Atom *props = XListProperties (THIS->dpy, window, &count);
1717 1688
1718 EXTEND (SP, count); 1689 EXTEND (SP, count);
1719 while (count--) 1690 while (count--)
1720 PUSHs (newSVuv ((U32)props [count])); 1691 PUSHs (newSVuv ((U32)props [count]));
1721 1692
… …
1730 int format; 1701 int format;
1731 unsigned long nitems; 1702 unsigned long nitems;
1732 unsigned long bytes_after; 1703 unsigned long bytes_after;
1733 unsigned char *prop; 1704 unsigned char *prop;
1734 1705
1735 XGetWindowProperty (THIS->display->display, window, property, 1706 XGetWindowProperty (THIS->dpy, window, property,
1736 0, 1<<24, 0, AnyPropertyType, 1707 0, 1<<24, 0, AnyPropertyType,
1737 &type, &format, &nitems, &bytes_after, &prop); 1708 &type, &format, &nitems, &bytes_after, &prop);
1738 1709
1739 if (type != None) 1710 if (type != None)
1740 { 1711 {
… …
1759 1730
1760 int elemsize = format == 16 ? sizeof (short) 1731 int elemsize = format == 16 ? sizeof (short)
1761 : format == 32 ? sizeof (long) 1732 : format == 32 ? sizeof (long)
1762 : 1; 1733 : 1;
1763 1734
1764 XChangeProperty (THIS->display->display, window, property, 1735 XChangeProperty (THIS->dpy, window, property,
1765 type, format, PropModeReplace, 1736 type, format, PropModeReplace,
1766 (unsigned char *)data_, len / elemsize); 1737 (unsigned char *)data_, len / elemsize);
1767 XSync (THIS->display->display, 0);
1768} 1738}
1769 1739
1770Atom 1740Atom
1771XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1741XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1772 C_ARGS: term->display->display, atom_name, only_if_exists 1742 C_ARGS: term->dpy, atom_name, only_if_exists
1773 1743
1774char * 1744char *
1775XGetAtomName (rxvt_term *term, Atom atom) 1745XGetAtomName (rxvt_term *term, Atom atom)
1776 C_ARGS: term->display->display, atom 1746 C_ARGS: term->dpy, atom
1777 CLEANUP: 1747 CLEANUP:
1778 XFree (RETVAL); 1748 XFree (RETVAL);
1779 1749
1780void 1750void
1781XDeleteProperty (rxvt_term *term, Window window, Atom property) 1751XDeleteProperty (rxvt_term *term, Window window, Atom property)
1782 C_ARGS: term->display->display, window, property 1752 C_ARGS: term->dpy, window, property
1783 1753
1784Window 1754Window
1785rxvt_term::DefaultRootWindow () 1755rxvt_term::DefaultRootWindow ()
1786 CODE: 1756 CODE:
1787 RETVAL = THIS->display->root; 1757 RETVAL = THIS->display->root;
… …
1790 1760
1791#if 0 1761#if 0
1792 1762
1793Window 1763Window
1794XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1764XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1795 C_ARGS: term->display->display, (Window)parent, 1765 C_ARGS: term->dpy, (Window)parent,
1796 x, y, width, height, 0, 1766 x, y, width, height, 0,
1797 term->pix_colors_focused[Color_border], 1767 term->pix_colors_focused[Color_border],
1798 term->pix_colors_focused[Color_border] 1768 term->pix_colors_focused[Color_border]
1799 1769
1800#endif 1770#endif
1801 1771
1802void 1772void
1803XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1773XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1804 C_ARGS: term->display->display, window, parent, x, y 1774 C_ARGS: term->dpy, window, parent, x, y
1805 1775
1806void 1776void
1807XMapWindow (rxvt_term *term, Window window) 1777XMapWindow (rxvt_term *term, Window window)
1808 C_ARGS: term->display->display, window 1778 C_ARGS: term->dpy, window
1809 1779
1810void 1780void
1811XUnmapWindow (rxvt_term *term, Window window) 1781XUnmapWindow (rxvt_term *term, Window window)
1812 C_ARGS: term->display->display, window 1782 C_ARGS: term->dpy, window
1813 1783
1814void 1784void
1815XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1785XMoveResizeWindow (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 1786 C_ARGS: term->dpy, window, x, y, width, height
1817 1787
1818void 1788void
1819rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1789rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1820 CODE: 1790 CODE:
1821{ 1791{
1822 XWindowAttributes attr; 1792 XWindowAttributes attr;
1823 XGetWindowAttributes (THIS->display->display, window, &attr); 1793 XGetWindowAttributes (THIS->dpy, window, &attr);
1824 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1794 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1825} 1795}
1826 1796
1827void 1797void
1828rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1798rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1829 PPCODE: 1799 PPCODE:
1830{ 1800{
1831 int dx, dy; 1801 int dx, dy;
1832 Window child; 1802 Window child;
1833 1803
1834 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1804 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1835 { 1805 {
1836 EXTEND (SP, 3); 1806 EXTEND (SP, 3);
1837 PUSHs (newSViv (dx)); 1807 PUSHs (newSViv (dx));
1838 PUSHs (newSViv (dy)); 1808 PUSHs (newSViv (dy));
1839 PUSHs (newSVuv (child)); 1809 PUSHs (newSVuv (child));
… …
1856overlay::hide () 1826overlay::hide ()
1857 1827
1858void 1828void
1859overlay::DESTROY () 1829overlay::DESTROY ()
1860 1830
1861############################################################################# 1831INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1862# urxvt::watcher
1863#############################################################################
1864 1832
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