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.92 by root, Wed Jan 25 00:57:57 2006 UTC vs.
Revision 1.104 by root, Mon Aug 7 22:28:18 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 119
121///////////////////////////////////////////////////////////////////////////// 120/////////////////////////////////////////////////////////////////////////////
122 121
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher") 122#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124 123
… …
171 170
172 if (SvTRUE (ERRSV)) 171 if (SvTRUE (ERRSV))
173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 172 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
174} 173}
175 174
176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 175#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer") 176#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR ((sv), "urxvt::timer")
178 177
179struct timer : perl_watcher, time_watcher 178struct timer : perl_watcher, time_watcher
180{ 179{
181 tstamp interval; 180 tstamp interval;
182 181
… …
192 191
193 invoke ("urxvt::timer", newSVtimer (this)); 192 invoke ("urxvt::timer", newSVtimer (this));
194 } 193 }
195}; 194};
196 195
197#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 196#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow") 197#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR ((sv), "urxvt::iow")
199 198
200struct iow : perl_watcher, io_watcher 199struct iow : perl_watcher, io_watcher
201{ 200{
202 iow () 201 iow ()
203 : io_watcher (this, &iow::execute) 202 : io_watcher (this, &iow::execute)
… …
208 { 207 {
209 invoke ("urxvt::iow", newSViow (this), revents); 208 invoke ("urxvt::iow", newSViow (this), revents);
210 } 209 }
211}; 210};
212 211
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw") 212#define newSViw(iw) new_ref ((iw)->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw") 213#define SvIW(sv) (iw *)(perl_watcher *)SvPTR ((sv), "urxvt::iw")
215 214
216struct iw : perl_watcher, idle_watcher 215struct iw : perl_watcher, idle_watcher
217{ 216{
218 iw () 217 iw ()
219 : idle_watcher (this, &iw::execute) 218 : idle_watcher (this, &iw::execute)
… …
224 { 223 {
225 invoke ("urxvt::iw", newSViw (this)); 224 invoke ("urxvt::iw", newSViw (this));
226 } 225 }
227}; 226};
228 227
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw") 228#define newSVpw(pw) new_ref ((pw)->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw") 229#define SvPW(sv) (pw *)(perl_watcher *)SvPTR ((sv), "urxvt::pw")
231 230
232struct pw : perl_watcher, child_watcher 231struct pw : perl_watcher, child_watcher
233{ 232{
234 pw () 233 pw ()
235 : child_watcher (this, &pw::execute) 234 : child_watcher (this, &pw::execute)
… …
244 243
245///////////////////////////////////////////////////////////////////////////// 244/////////////////////////////////////////////////////////////////////////////
246 245
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 246#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 247
249struct overlay { 248class overlay {
250 HV *self;
251 bool visible;
252 rxvt_term *THIS; 249 rxvt_term *THIS;
250 AV *overlay_av;
253 int x, y, w, h; 251 int x, y, w, h;
254 int border; 252 int border;
255 text_t **text; 253 text_t **text;
256 rend_t **rend; 254 rend_t **rend;
257 255
256public:
257 HV *self;
258
258 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 259 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
259 ~overlay (); 260 ~overlay ();
260 261
261 void show (); 262 void show ();
262 void hide (); 263 void hide ();
… …
265 266
266 void set (int x, int y, SV *str, SV *rend); 267 void set (int x, int y, SV *str, SV *rend);
267}; 268};
268 269
269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 270overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
270: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false) 271: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
271{ 272{
273 if (w < 0) w = 0;
274 if (h < 0) h = 0;
275
272 if (border == 2) 276 if (border == 2)
273 { 277 {
274 w += 2; 278 w += 2;
275 h += 2; 279 h += 2;
276 } 280 }
… …
314 *rp++ = r; 318 *rp++ = r;
315 } 319 }
316 } 320 }
317 321
318 show (); 322 show ();
319 THIS->want_refresh = 1;
320} 323}
321 324
322overlay::~overlay () 325overlay::~overlay ()
323{ 326{
324 hide (); 327 hide ();
… …
329 delete [] rend[y]; 332 delete [] rend[y];
330 } 333 }
331 334
332 delete [] text; 335 delete [] text;
333 delete [] rend; 336 delete [] rend;
337}
338
339void
340overlay::show ()
341{
342 if (overlay_av)
343 return;
344
345 overlay_av = (AV *)SvREFCNT_inc (SvRV (
346 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
347 ));
348 av_push (overlay_av, newSViv ((long)this));
334 349
335 THIS->want_refresh = 1; 350 THIS->want_refresh = 1;
336} 351}
337 352
338void 353void
339overlay::show () 354overlay::hide ()
340{ 355{
341 if (visible) 356 if (!overlay_av)
342 return; 357 return;
343 358
344 visible = true;
345
346 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
347 av_push (av, newSViv ((long)this));
348}
349
350void
351overlay::hide ()
352{
353 if (!visible)
354 return;
355
356 visible = false;
357
358 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
359
360 int i; 359 int i;
361 360
362 for (i = AvFILL (av); i >= 0; i--) 361 for (i = AvFILL (overlay_av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this) 362 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364 {
365 av_delete (av, i, G_DISCARD);
366 break; 363 break;
367 }
368 364
369 for (; i < AvFILL (av); i++) 365 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 366 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 367
372 av_pop (av); 368 av_pop (overlay_av);
369
370 SvREFCNT_dec (overlay_av);
371 overlay_av = 0;
372
373 THIS->want_refresh = 1;
373} 374}
374 375
375void overlay::swap () 376void overlay::swap ()
376{ 377{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 378 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
492static void 493static void
493ungrab (rxvt_term *THIS) 494ungrab (rxvt_term *THIS)
494{ 495{
495 if (THIS->perl.grabtime) 496 if (THIS->perl.grabtime)
496 { 497 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 498 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 499 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 500 THIS->perl.grabtime = 0;
500 } 501 }
501} 502}
502 503
503bool 504bool
… …
556 case DT_STR_LEN: 557 case DT_STR_LEN:
557 { 558 {
558 char *str = va_arg (ap, char *); 559 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 560 int len = va_arg (ap, int);
560 561
561 printf ("pushing str %p:%d\n", str,len);//D
562 XPUSHs (sv_2mortal (newSVpvn (str, len))); 562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
563 } 563 }
564 break; 564 break;
565 565
566 case DT_WCS_LEN: 566 case DT_WCS_LEN:
… …
762# include "optinc.h" 762# include "optinc.h"
763# undef nodef 763# undef nodef
764# undef def 764# undef def
765 765
766 HV *stash = gv_stashpv ("urxvt", 1); 766 HV *stash = gv_stashpv ("urxvt", 1);
767 struct { 767 static const struct {
768 const char *name; 768 const char *name;
769 IV iv; 769 IV iv;
770 } *civ, const_iv[] = { 770 } *civ, const_iv[] = {
771# define const_iv(name) { # name, (IV)name } 771# define const_iv(name) { # name, (IV)name }
772 const_iv (DEFAULT_RSTYLE), 772 const_iv (DEFAULT_RSTYLE),
… …
790 const_iv (Button2Mask), 790 const_iv (Button2Mask),
791 const_iv (Button3Mask), 791 const_iv (Button3Mask),
792 const_iv (Button4Mask), 792 const_iv (Button4Mask),
793 const_iv (Button5Mask), 793 const_iv (Button5Mask),
794 const_iv (AnyModifier), 794 const_iv (AnyModifier),
795
796 const_iv (NoSymbol),
797 const_iv (GrabModeSync),
798 const_iv (GrabModeAsync),
795 799
796 const_iv (EVENT_NONE), 800 const_iv (EVENT_NONE),
797 const_iv (EVENT_READ), 801 const_iv (EVENT_READ),
798 const_iv (EVENT_WRITE), 802 const_iv (EVENT_WRITE),
799 803
… …
882 const_iv (XIMDontChange), 886 const_iv (XIMDontChange),
883# endif 887# endif
884# endif 888# endif
885 }; 889 };
886 890
887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 891 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
888 civ-- > const_iv; )
889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 892 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
890} 893}
891 894
892void 895void
893warn (const char *msg) 896warn (const char *msg)
… …
924 RETVAL 927 RETVAL
925 928
926int 929int
927SET_FGCOLOR (int rend, int new_color) 930SET_FGCOLOR (int rend, int new_color)
928 CODE: 931 CODE:
929 RETVAL = SET_FGCOLOR (rend, new_color); 932 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
930 OUTPUT: 933 OUTPUT:
931 RETVAL 934 RETVAL
932 935
933int 936int
934SET_BGCOLOR (int rend, int new_color) 937SET_BGCOLOR (int rend, int new_color)
935 CODE: 938 CODE:
936 RETVAL = SET_BGCOLOR (rend, new_color); 939 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
937 OUTPUT: 940 OUTPUT:
938 RETVAL 941 RETVAL
939 942
940int 943int
941GET_CUSTOM (int rend) 944GET_CUSTOM (int rend)
… …
955 | ((new_value << RS_customShift) & RS_customMask); 958 | ((new_value << RS_customShift) & RS_customMask);
956} 959}
957 OUTPUT: 960 OUTPUT:
958 RETVAL 961 RETVAL
959 962
963void
964termlist ()
965 PPCODE:
966{
967 EXTEND (SP, rxvt_term::termlist.size ());
968
969 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
970 if ((*t)->perl.self)
971 PUSHs (sv_2mortal (newSVterm (*t)));
972}
973
960MODULE = urxvt PACKAGE = urxvt::term 974MODULE = urxvt PACKAGE = urxvt::term
961 975
962SV * 976SV *
963_new (...) 977_new (AV *env, AV *arg)
964 CODE: 978 CODE:
965{ 979{
966 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
967 croak ("first argument to urxvt::term->_new must be arrayref");
968
969 rxvt_term *term = new rxvt_term; 980 rxvt_term *term = new rxvt_term;
970 981
971 stringvec *argv = new stringvec; 982 stringvec *argv = new stringvec;
972 stringvec *envv = new stringvec; 983 stringvec *envv = new stringvec;
973 984
974 for (int i = 1; i < items; i++) 985 for (int i = 0; i <= AvFILL (arg); i++)
975 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 986 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
976 987
977 AV *env = (AV *)SvRV (ST (0));
978 for (int i = AvFILL (env) + 1; i--; ) 988 for (int i = AvFILL (env) + 1; i--; )
979 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 989 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
980 990
981 envv->push_back (0); 991 envv->push_back (0);
982 992
… …
1009void 1019void
1010rxvt_term::set_should_invoke (int htype, int inc) 1020rxvt_term::set_should_invoke (int htype, int inc)
1011 CODE: 1021 CODE:
1012 THIS->perl.should_invoke [htype] += inc; 1022 THIS->perl.should_invoke [htype] += inc;
1013 1023
1014void 1024int
1015rxvt_term::grab_button (int button, U32 modifiers) 1025rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1016 CODE: 1026 CODE:
1017 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1027 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1018 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1028 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1019 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1029 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1030 OUTPUT: RETVAL
1031
1032int
1033rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1034 CODE:
1035 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
1036 OUTPUT: RETVAL
1037
1038void
1039rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1040 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1041 CODE:
1042 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1043
1044void
1045rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
1046 CODE:
1047 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1048
1049void
1050rxvt_term::XUngrabKeyboard (Time eventtime)
1051 CODE:
1052 XUngrabKeyboard (THIS->dpy, eventtime);
1020 1053
1021bool 1054bool
1022rxvt_term::grab (Time eventtime, int sync = 0) 1055rxvt_term::grab (Time eventtime, int sync = 0)
1023 CODE: 1056 CODE:
1024{ 1057{
1025 int mode = sync ? GrabModeSync : GrabModeAsync; 1058 int mode = sync ? GrabModeSync : GrabModeAsync;
1026 1059
1027 THIS->perl.grabtime = 0; 1060 THIS->perl.grabtime = 0;
1028 1061
1029 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1062 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1030 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1063 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1031 mode, mode, None, GRAB_CURSOR, eventtime)) 1064 mode, mode, None, GRAB_CURSOR, eventtime))
1032 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1065 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1033 THIS->perl.grabtime = eventtime; 1066 THIS->perl.grabtime = eventtime;
1034 else 1067 else
1035 XUngrabPointer (THIS->display->display, eventtime); 1068 XUngrabPointer (THIS->dpy, eventtime);
1036 1069
1037 RETVAL = !!THIS->perl.grabtime; 1070 RETVAL = !!THIS->perl.grabtime;
1038} 1071}
1039 OUTPUT: 1072 OUTPUT:
1040 RETVAL 1073 RETVAL
1041 1074
1042void 1075void
1043rxvt_term::allow_events_async () 1076rxvt_term::allow_events_async ()
1044 CODE: 1077 CODE:
1045 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1078 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1046 1079
1047void 1080void
1048rxvt_term::allow_events_sync () 1081rxvt_term::allow_events_sync ()
1049 CODE: 1082 CODE:
1050 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1083 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1051 1084
1052void 1085void
1053rxvt_term::allow_events_replay () 1086rxvt_term::allow_events_replay ()
1054 CODE: 1087 CODE:
1055 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1088 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1056 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1089 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1057 1090
1058void 1091void
1059rxvt_term::ungrab () 1092rxvt_term::ungrab ()
1060 CODE: 1093 CODE:
1061 ungrab (THIS); 1094 ungrab (THIS);
1095
1096int
1097rxvt_term::XStringToKeysym (char *string)
1098 CODE:
1099 RETVAL = XStringToKeysym (string);
1100 OUTPUT: RETVAL
1101
1102char *
1103rxvt_term::XKeysymToString (int sym)
1104 CODE:
1105 RETVAL = XKeysymToString (sym);
1106 OUTPUT: RETVAL
1107
1108int
1109rxvt_term::XKeysymToKeycode (int sym)
1110 CODE:
1111 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
1112 OUTPUT: RETVAL
1113
1114int
1115rxvt_term::XKeycodeToKeysym (int code, int index)
1116 CODE:
1117 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
1118 OUTPUT: RETVAL
1062 1119
1063int 1120int
1064rxvt_term::strwidth (SV *str) 1121rxvt_term::strwidth (SV *str)
1065 CODE: 1122 CODE:
1066{ 1123{
1067 wchar_t *wstr = sv2wcs (str); 1124 wchar_t *wstr = sv2wcs (str);
1068 1125
1069 rxvt_push_locale (THIS->locale); 1126 rxvt_push_locale (THIS->locale);
1127 //TODO: use same algorithm as screen.C
1070 RETVAL = wcswidth (wstr, wcslen (wstr)); 1128 RETVAL = wcswidth (wstr, wcslen (wstr));
1071 rxvt_pop_locale (); 1129 rxvt_pop_locale ();
1072 1130
1073 free (wstr); 1131 free (wstr);
1074} 1132}
… …
1184 } 1242 }
1185 OUTPUT: 1243 OUTPUT:
1186 RETVAL 1244 RETVAL
1187 1245
1188SV * 1246SV *
1189rxvt_term::_env () 1247rxvt_term::envv ()
1248 ALIAS:
1249 argv = 1
1190 CODE: 1250 PPCODE:
1191{ 1251{
1192 if (THIS->envv) 1252 stringvec *vec = ix ? THIS->argv : THIS->envv;
1193 {
1194 AV *av = newAV ();
1195 1253
1254 EXTEND (SP, vec->size ());
1255
1196 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1256 for (char **i = vec->begin (); i != vec->end (); ++i)
1197 if (*i) 1257 if (*i)
1198 av_push (av, newSVpv (*i, 0)); 1258 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1199
1200 RETVAL = newRV_noinc ((SV *)av);
1201 }
1202 else
1203 RETVAL = &PL_sv_undef;
1204} 1259}
1205 OUTPUT:
1206 RETVAL
1207 1260
1208int 1261int
1209rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1262rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1210 CODE: 1263 CODE:
1211 RETVAL = THIS->pty_ev.events; 1264 RETVAL = THIS->pty_ev.events;
… …
1265void 1318void
1266rxvt_term::focus_in () 1319rxvt_term::focus_in ()
1267 1320
1268void 1321void
1269rxvt_term::focus_out () 1322rxvt_term::focus_out ()
1323
1324void
1325rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1326 ALIAS:
1327 key_release = 1
1328 CODE:
1329{
1330 XKeyEvent xkey;
1331
1332 memset (&xkey, 0, sizeof (xkey));
1333
1334 xkey.time = time;
1335 xkey.state = state;
1336 xkey.keycode = keycode;
1337
1338 xkey.type = ix ? KeyRelease : KeyPress;
1339 xkey.display = THIS->dpy;
1340 xkey.window = THIS->vt;
1341 xkey.root = THIS->display->root;
1342 xkey.subwindow = THIS->vt;
1343
1344 if (ix)
1345 THIS->key_release (xkey);
1346 else
1347 THIS->key_press (xkey);
1348}
1270 1349
1271void 1350void
1272rxvt_term::want_refresh () 1351rxvt_term::want_refresh ()
1273 CODE: 1352 CODE:
1274 THIS->want_refresh = 1; 1353 THIS->want_refresh = 1;
… …
1467 1546
1468void 1547void
1469rxvt_term::_resource (char *name, int index, SV *newval = 0) 1548rxvt_term::_resource (char *name, int index, SV *newval = 0)
1470 PPCODE: 1549 PPCODE:
1471{ 1550{
1472 struct resval { const char *name; int value; } rslist [] = { 1551 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1473# define def(name) { # name, Rs_ ## name }, 1552# define def(name) { # name, Rs_ ## name },
1474# define reserve(name,count) 1553# define reserve(name,count)
1475# include "rsinc.h" 1554# include "rsinc.h"
1476# undef def 1555# undef def
1477# undef reserve 1556# undef reserve
1478 }; 1557 };
1479 1558
1480 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1559 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1481 1560
1482 do { 1561 do {
1483 if (rs-- == rslist) 1562 if (rs-- == rslist)
1484 croak ("no such resource '%s', requested", name); 1563 croak ("no such resource '%s', requested", name);
1485 } while (strcmp (name, rs->name)); 1564 } while (strcmp (name, rs->name));
… …
1609 CODE: 1688 CODE:
1610 RETVAL = THIS->charsets [THIS->screen.charset]; 1689 RETVAL = THIS->charsets [THIS->screen.charset];
1611 OUTPUT: 1690 OUTPUT:
1612 RETVAL 1691 RETVAL
1613 1692
1614#void 1693void
1615#rxvt_term::selection_clear () 1694rxvt_term::selection_clear ()
1616 1695
1617void 1696void
1618rxvt_term::selection_make (Time eventtime, bool rect = false) 1697rxvt_term::selection_make (Time eventtime, bool rect = false)
1619 CODE: 1698 CODE:
1620 THIS->selection.op = SELECTION_CONT; 1699 THIS->selection.op = SELECTION_CONT;
… …
1710void 1789void
1711rxvt_term::XListProperties (Window window) 1790rxvt_term::XListProperties (Window window)
1712 PPCODE: 1791 PPCODE:
1713{ 1792{
1714 int count; 1793 int count;
1715 Atom *props = XListProperties (THIS->display->display, window, &count); 1794 Atom *props = XListProperties (THIS->dpy, window, &count);
1716 1795
1717 EXTEND (SP, count); 1796 EXTEND (SP, count);
1718 while (count--) 1797 while (count--)
1719 PUSHs (newSVuv ((U32)props [count])); 1798 PUSHs (newSVuv ((U32)props [count]));
1720 1799
… …
1729 int format; 1808 int format;
1730 unsigned long nitems; 1809 unsigned long nitems;
1731 unsigned long bytes_after; 1810 unsigned long bytes_after;
1732 unsigned char *prop; 1811 unsigned char *prop;
1733 1812
1734 XGetWindowProperty (THIS->display->display, window, property, 1813 XGetWindowProperty (THIS->dpy, window, property,
1735 0, 1<<24, 0, AnyPropertyType, 1814 0, 1<<24, 0, AnyPropertyType,
1736 &type, &format, &nitems, &bytes_after, &prop); 1815 &type, &format, &nitems, &bytes_after, &prop);
1737 1816
1738 if (type != None) 1817 if (type != None)
1739 { 1818 {
… …
1758 1837
1759 int elemsize = format == 16 ? sizeof (short) 1838 int elemsize = format == 16 ? sizeof (short)
1760 : format == 32 ? sizeof (long) 1839 : format == 32 ? sizeof (long)
1761 : 1; 1840 : 1;
1762 1841
1763 XChangeProperty (THIS->display->display, window, property, 1842 XChangeProperty (THIS->dpy, window, property,
1764 type, format, PropModeReplace, 1843 type, format, PropModeReplace,
1765 (unsigned char *)data_, len / elemsize); 1844 (unsigned char *)data_, len / elemsize);
1766 XSync (THIS->display->display, 0);
1767} 1845}
1768 1846
1769Atom 1847Atom
1770XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1848XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1771 C_ARGS: term->display->display, atom_name, only_if_exists 1849 C_ARGS: term->dpy, atom_name, only_if_exists
1772 1850
1773char * 1851char *
1774XGetAtomName (rxvt_term *term, Atom atom) 1852XGetAtomName (rxvt_term *term, Atom atom)
1775 C_ARGS: term->display->display, atom 1853 C_ARGS: term->dpy, atom
1776 CLEANUP: 1854 CLEANUP:
1777 XFree (RETVAL); 1855 XFree (RETVAL);
1778 1856
1779void 1857void
1780XDeleteProperty (rxvt_term *term, Window window, Atom property) 1858XDeleteProperty (rxvt_term *term, Window window, Atom property)
1781 C_ARGS: term->display->display, window, property 1859 C_ARGS: term->dpy, window, property
1782 1860
1783Window 1861Window
1784rxvt_term::DefaultRootWindow () 1862rxvt_term::DefaultRootWindow ()
1785 CODE: 1863 CODE:
1786 RETVAL = THIS->display->root; 1864 RETVAL = THIS->display->root;
… …
1789 1867
1790#if 0 1868#if 0
1791 1869
1792Window 1870Window
1793XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1871XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1794 C_ARGS: term->display->display, (Window)parent, 1872 C_ARGS: term->dpy, (Window)parent,
1795 x, y, width, height, 0, 1873 x, y, width, height, 0,
1796 term->pix_colors_focused[Color_border], 1874 term->pix_colors_focused[Color_border],
1797 term->pix_colors_focused[Color_border] 1875 term->pix_colors_focused[Color_border]
1798 1876
1799#endif 1877#endif
1800 1878
1801void 1879void
1802XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1880XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1803 C_ARGS: term->display->display, window, parent, x, y 1881 C_ARGS: term->dpy, window, parent, x, y
1804 1882
1805void 1883void
1806XMapWindow (rxvt_term *term, Window window) 1884XMapWindow (rxvt_term *term, Window window)
1807 C_ARGS: term->display->display, window 1885 C_ARGS: term->dpy, window
1808 1886
1809void 1887void
1810XUnmapWindow (rxvt_term *term, Window window) 1888XUnmapWindow (rxvt_term *term, Window window)
1811 C_ARGS: term->display->display, window 1889 C_ARGS: term->dpy, window
1812 1890
1813void 1891void
1814XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1892XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1815 C_ARGS: term->display->display, window, x, y, width, height 1893 C_ARGS: term->dpy, window, x, y, width, height
1816 1894
1817void 1895void
1818rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1896rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1819 CODE: 1897 CODE:
1820{ 1898{
1821 XWindowAttributes attr; 1899 XWindowAttributes attr;
1822 XGetWindowAttributes (THIS->display->display, window, &attr); 1900 XGetWindowAttributes (THIS->dpy, window, &attr);
1823 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1901 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1824} 1902}
1825 1903
1826void 1904void
1827rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1905rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1828 PPCODE: 1906 PPCODE:
1829{ 1907{
1830 int dx, dy; 1908 int dx, dy;
1831 Window child; 1909 Window child;
1832 1910
1833 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1911 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1834 { 1912 {
1835 EXTEND (SP, 3); 1913 EXTEND (SP, 3);
1836 PUSHs (newSViv (dx)); 1914 PUSHs (newSViv (dx));
1837 PUSHs (newSViv (dy)); 1915 PUSHs (newSViv (dy));
1838 PUSHs (newSVuv (child)); 1916 PUSHs (newSVuv (child));

Diff Legend

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