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.97 by root, Sat Feb 4 16:12:48 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{
272 if (border == 2) 273 if (border == 2)
273 { 274 {
274 w += 2; 275 w += 2;
275 h += 2; 276 h += 2;
… …
314 *rp++ = r; 315 *rp++ = r;
315 } 316 }
316 } 317 }
317 318
318 show (); 319 show ();
319 THIS->want_refresh = 1;
320} 320}
321 321
322overlay::~overlay () 322overlay::~overlay ()
323{ 323{
324 hide (); 324 hide ();
… …
329 delete [] rend[y]; 329 delete [] rend[y];
330 } 330 }
331 331
332 delete [] text; 332 delete [] text;
333 delete [] rend; 333 delete [] rend;
334}
335
336void
337overlay::show ()
338{
339 if (overlay_av)
340 return;
341
342 overlay_av = (AV *)SvREFCNT_inc (SvRV (
343 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
344 ));
345 av_push (overlay_av, newSViv ((long)this));
334 346
335 THIS->want_refresh = 1; 347 THIS->want_refresh = 1;
336} 348}
337 349
338void 350void
339overlay::show () 351overlay::hide ()
340{ 352{
341 if (visible) 353 if (!overlay_av)
342 return; 354 return;
343 355
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; 356 int i;
361 357
362 for (i = AvFILL (av); i >= 0; i--) 358 for (i = AvFILL (overlay_av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this) 359 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364 { 360 {
365 av_delete (av, i, G_DISCARD); 361 av_delete (overlay_av, i, G_DISCARD);
366 break; 362 break;
367 } 363 }
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),
… …
882 const_iv (XIMDontChange), 882 const_iv (XIMDontChange),
883# endif 883# endif
884# endif 884# endif
885 }; 885 };
886 886
887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 887 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)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
890} 889}
891 890
892void 891void
893warn (const char *msg) 892warn (const char *msg)
… …
955 | ((new_value << RS_customShift) & RS_customMask); 954 | ((new_value << RS_customShift) & RS_customMask);
956} 955}
957 OUTPUT: 956 OUTPUT:
958 RETVAL 957 RETVAL
959 958
959void
960termlist ()
961 PPCODE:
962{
963 EXTEND (SP, rxvt_term::termlist.size ());
964
965 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
966 if ((*t)->perl.self)
967 PUSHs (sv_2mortal (newSVterm (*t)));
968}
969
960MODULE = urxvt PACKAGE = urxvt::term 970MODULE = urxvt PACKAGE = urxvt::term
961 971
962SV * 972SV *
963_new (...) 973_new (AV *env, AV *arg)
964 CODE: 974 CODE:
965{ 975{
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; 976 rxvt_term *term = new rxvt_term;
970 977
971 stringvec *argv = new stringvec; 978 stringvec *argv = new stringvec;
972 stringvec *envv = new stringvec; 979 stringvec *envv = new stringvec;
973 980
974 for (int i = 1; i < items; i++) 981 for (int i = 0; i <= AvFILL (arg); i++)
975 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 982 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
976 983
977 AV *env = (AV *)SvRV (ST (0));
978 for (int i = AvFILL (env) + 1; i--; ) 984 for (int i = AvFILL (env) + 1; i--; )
979 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 985 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
980 986
981 envv->push_back (0); 987 envv->push_back (0);
982 988
… …
1010rxvt_term::set_should_invoke (int htype, int inc) 1016rxvt_term::set_should_invoke (int htype, int inc)
1011 CODE: 1017 CODE:
1012 THIS->perl.should_invoke [htype] += inc; 1018 THIS->perl.should_invoke [htype] += inc;
1013 1019
1014void 1020void
1015rxvt_term::grab_button (int button, U32 modifiers) 1021rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1016 CODE: 1022 CODE:
1017 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1023 XGrabButton (THIS->dpy, button, modifiers, window, 1,
1018 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1024 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1019 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1025 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1020 1026
1027void
1028rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029 CODE:
1030 XUngrabButton (THIS->dpy, button, modifiers, window);
1031
1032#if 0
1033
1034void
1035XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1036 C_ARGS:
1037 THIS->dpy, keycode, modifiers, window, 1,
1038 GrabModeSync, GrabModeSync
1039
1040void
1041XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1042 C_ARGS: THIS->dpy, keycode, modifiers, window
1043
1044#endif
1045
1021bool 1046bool
1022rxvt_term::grab (Time eventtime, int sync = 0) 1047rxvt_term::grab (Time eventtime, int sync = 0)
1023 CODE: 1048 CODE:
1024{ 1049{
1025 int mode = sync ? GrabModeSync : GrabModeAsync; 1050 int mode = sync ? GrabModeSync : GrabModeAsync;
1026 1051
1027 THIS->perl.grabtime = 0; 1052 THIS->perl.grabtime = 0;
1028 1053
1029 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1054 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1030 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1055 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1031 mode, mode, None, GRAB_CURSOR, eventtime)) 1056 mode, mode, None, GRAB_CURSOR, eventtime))
1032 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1057 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1033 THIS->perl.grabtime = eventtime; 1058 THIS->perl.grabtime = eventtime;
1034 else 1059 else
1035 XUngrabPointer (THIS->display->display, eventtime); 1060 XUngrabPointer (THIS->dpy, eventtime);
1036 1061
1037 RETVAL = !!THIS->perl.grabtime; 1062 RETVAL = !!THIS->perl.grabtime;
1038} 1063}
1039 OUTPUT: 1064 OUTPUT:
1040 RETVAL 1065 RETVAL
1041 1066
1042void 1067void
1043rxvt_term::allow_events_async () 1068rxvt_term::allow_events_async ()
1044 CODE: 1069 CODE:
1045 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1070 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1046 1071
1047void 1072void
1048rxvt_term::allow_events_sync () 1073rxvt_term::allow_events_sync ()
1049 CODE: 1074 CODE:
1050 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1075 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1051 1076
1052void 1077void
1053rxvt_term::allow_events_replay () 1078rxvt_term::allow_events_replay ()
1054 CODE: 1079 CODE:
1055 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1080 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1056 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1081 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1057 1082
1058void 1083void
1059rxvt_term::ungrab () 1084rxvt_term::ungrab ()
1060 CODE: 1085 CODE:
1061 ungrab (THIS); 1086 ungrab (THIS);
… …
1467 1492
1468void 1493void
1469rxvt_term::_resource (char *name, int index, SV *newval = 0) 1494rxvt_term::_resource (char *name, int index, SV *newval = 0)
1470 PPCODE: 1495 PPCODE:
1471{ 1496{
1472 struct resval { const char *name; int value; } rslist [] = { 1497 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1473# define def(name) { # name, Rs_ ## name }, 1498# define def(name) { # name, Rs_ ## name },
1474# define reserve(name,count) 1499# define reserve(name,count)
1475# include "rsinc.h" 1500# include "rsinc.h"
1476# undef def 1501# undef def
1477# undef reserve 1502# undef reserve
1478 }; 1503 };
1479 1504
1480 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1505 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1481 1506
1482 do { 1507 do {
1483 if (rs-- == rslist) 1508 if (rs-- == rslist)
1484 croak ("no such resource '%s', requested", name); 1509 croak ("no such resource '%s', requested", name);
1485 } while (strcmp (name, rs->name)); 1510 } while (strcmp (name, rs->name));
… …
1609 CODE: 1634 CODE:
1610 RETVAL = THIS->charsets [THIS->screen.charset]; 1635 RETVAL = THIS->charsets [THIS->screen.charset];
1611 OUTPUT: 1636 OUTPUT:
1612 RETVAL 1637 RETVAL
1613 1638
1614#void 1639void
1615#rxvt_term::selection_clear () 1640rxvt_term::selection_clear ()
1616 1641
1617void 1642void
1618rxvt_term::selection_make (Time eventtime, bool rect = false) 1643rxvt_term::selection_make (Time eventtime, bool rect = false)
1619 CODE: 1644 CODE:
1620 THIS->selection.op = SELECTION_CONT; 1645 THIS->selection.op = SELECTION_CONT;
… …
1710void 1735void
1711rxvt_term::XListProperties (Window window) 1736rxvt_term::XListProperties (Window window)
1712 PPCODE: 1737 PPCODE:
1713{ 1738{
1714 int count; 1739 int count;
1715 Atom *props = XListProperties (THIS->display->display, window, &count); 1740 Atom *props = XListProperties (THIS->dpy, window, &count);
1716 1741
1717 EXTEND (SP, count); 1742 EXTEND (SP, count);
1718 while (count--) 1743 while (count--)
1719 PUSHs (newSVuv ((U32)props [count])); 1744 PUSHs (newSVuv ((U32)props [count]));
1720 1745
… …
1729 int format; 1754 int format;
1730 unsigned long nitems; 1755 unsigned long nitems;
1731 unsigned long bytes_after; 1756 unsigned long bytes_after;
1732 unsigned char *prop; 1757 unsigned char *prop;
1733 1758
1734 XGetWindowProperty (THIS->display->display, window, property, 1759 XGetWindowProperty (THIS->dpy, window, property,
1735 0, 1<<24, 0, AnyPropertyType, 1760 0, 1<<24, 0, AnyPropertyType,
1736 &type, &format, &nitems, &bytes_after, &prop); 1761 &type, &format, &nitems, &bytes_after, &prop);
1737 1762
1738 if (type != None) 1763 if (type != None)
1739 { 1764 {
… …
1758 1783
1759 int elemsize = format == 16 ? sizeof (short) 1784 int elemsize = format == 16 ? sizeof (short)
1760 : format == 32 ? sizeof (long) 1785 : format == 32 ? sizeof (long)
1761 : 1; 1786 : 1;
1762 1787
1763 XChangeProperty (THIS->display->display, window, property, 1788 XChangeProperty (THIS->dpy, window, property,
1764 type, format, PropModeReplace, 1789 type, format, PropModeReplace,
1765 (unsigned char *)data_, len / elemsize); 1790 (unsigned char *)data_, len / elemsize);
1766 XSync (THIS->display->display, 0); 1791 XSync (THIS->dpy, 0);
1767} 1792}
1768 1793
1769Atom 1794Atom
1770XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1795XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1771 C_ARGS: term->display->display, atom_name, only_if_exists 1796 C_ARGS: term->dpy, atom_name, only_if_exists
1772 1797
1773char * 1798char *
1774XGetAtomName (rxvt_term *term, Atom atom) 1799XGetAtomName (rxvt_term *term, Atom atom)
1775 C_ARGS: term->display->display, atom 1800 C_ARGS: term->dpy, atom
1776 CLEANUP: 1801 CLEANUP:
1777 XFree (RETVAL); 1802 XFree (RETVAL);
1778 1803
1779void 1804void
1780XDeleteProperty (rxvt_term *term, Window window, Atom property) 1805XDeleteProperty (rxvt_term *term, Window window, Atom property)
1781 C_ARGS: term->display->display, window, property 1806 C_ARGS: term->dpy, window, property
1782 1807
1783Window 1808Window
1784rxvt_term::DefaultRootWindow () 1809rxvt_term::DefaultRootWindow ()
1785 CODE: 1810 CODE:
1786 RETVAL = THIS->display->root; 1811 RETVAL = THIS->display->root;
… …
1789 1814
1790#if 0 1815#if 0
1791 1816
1792Window 1817Window
1793XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1818XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1794 C_ARGS: term->display->display, (Window)parent, 1819 C_ARGS: term->dpy, (Window)parent,
1795 x, y, width, height, 0, 1820 x, y, width, height, 0,
1796 term->pix_colors_focused[Color_border], 1821 term->pix_colors_focused[Color_border],
1797 term->pix_colors_focused[Color_border] 1822 term->pix_colors_focused[Color_border]
1798 1823
1799#endif 1824#endif
1800 1825
1801void 1826void
1802XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1827XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1803 C_ARGS: term->display->display, window, parent, x, y 1828 C_ARGS: term->dpy, window, parent, x, y
1804 1829
1805void 1830void
1806XMapWindow (rxvt_term *term, Window window) 1831XMapWindow (rxvt_term *term, Window window)
1807 C_ARGS: term->display->display, window 1832 C_ARGS: term->dpy, window
1808 1833
1809void 1834void
1810XUnmapWindow (rxvt_term *term, Window window) 1835XUnmapWindow (rxvt_term *term, Window window)
1811 C_ARGS: term->display->display, window 1836 C_ARGS: term->dpy, window
1812 1837
1813void 1838void
1814XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1839XMoveResizeWindow (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 1840 C_ARGS: term->dpy, window, x, y, width, height
1816 1841
1817void 1842void
1818rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1843rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1819 CODE: 1844 CODE:
1820{ 1845{
1821 XWindowAttributes attr; 1846 XWindowAttributes attr;
1822 XGetWindowAttributes (THIS->display->display, window, &attr); 1847 XGetWindowAttributes (THIS->dpy, window, &attr);
1823 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1848 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1824} 1849}
1825 1850
1826void 1851void
1827rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1852rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1828 PPCODE: 1853 PPCODE:
1829{ 1854{
1830 int dx, dy; 1855 int dx, dy;
1831 Window child; 1856 Window child;
1832 1857
1833 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1858 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1834 { 1859 {
1835 EXTEND (SP, 3); 1860 EXTEND (SP, 3);
1836 PUSHs (newSViv (dx)); 1861 PUSHs (newSViv (dx));
1837 PUSHs (newSViv (dy)); 1862 PUSHs (newSViv (dy));
1838 PUSHs (newSVuv (child)); 1863 PUSHs (newSVuv (child));

Diff Legend

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