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.106 by root, Tue Oct 3 12:13:57 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)
… …
269}; 268};
270 269
271overlay::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)
272: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 271: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
273{ 272{
273 if (w < 0) w = 0;
274 if (h < 0) h = 0;
275
274 if (border == 2) 276 if (border == 2)
275 { 277 {
276 w += 2; 278 w += 2;
277 h += 2; 279 h += 2;
278 } 280 }
… …
356 358
357 int i; 359 int i;
358 360
359 for (i = AvFILL (overlay_av); i >= 0; i--) 361 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) 362 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361 {
362 av_delete (overlay_av, i, G_DISCARD);
363 break; 363 break;
364 }
365 364
366 for (; i < AvFILL (overlay_av); i++) 365 for (; i < AvFILL (overlay_av); i++)
367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 366 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368 367
369 av_pop (overlay_av); 368 av_pop (overlay_av);
… …
494static void 493static void
495ungrab (rxvt_term *THIS) 494ungrab (rxvt_term *THIS)
496{ 495{
497 if (THIS->perl.grabtime) 496 if (THIS->perl.grabtime)
498 { 497 {
499 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 498 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
500 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 499 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
501 THIS->perl.grabtime = 0; 500 THIS->perl.grabtime = 0;
502 } 501 }
503} 502}
504 503
505bool 504bool
… …
763# include "optinc.h" 762# include "optinc.h"
764# undef nodef 763# undef nodef
765# undef def 764# undef def
766 765
767 HV *stash = gv_stashpv ("urxvt", 1); 766 HV *stash = gv_stashpv ("urxvt", 1);
768 struct { 767 static const struct {
769 const char *name; 768 const char *name;
770 IV iv; 769 IV iv;
771 } *civ, const_iv[] = { 770 } *civ, const_iv[] = {
772# define const_iv(name) { # name, (IV)name } 771# define const_iv(name) { # name, (IV)name }
773 const_iv (DEFAULT_RSTYLE), 772 const_iv (DEFAULT_RSTYLE),
… …
791 const_iv (Button2Mask), 790 const_iv (Button2Mask),
792 const_iv (Button3Mask), 791 const_iv (Button3Mask),
793 const_iv (Button4Mask), 792 const_iv (Button4Mask),
794 const_iv (Button5Mask), 793 const_iv (Button5Mask),
795 const_iv (AnyModifier), 794 const_iv (AnyModifier),
795
796 const_iv (NoSymbol),
797 const_iv (GrabModeSync),
798 const_iv (GrabModeAsync),
796 799
797 const_iv (EVENT_NONE), 800 const_iv (EVENT_NONE),
798 const_iv (EVENT_READ), 801 const_iv (EVENT_READ),
799 const_iv (EVENT_WRITE), 802 const_iv (EVENT_WRITE),
800 803
… …
883 const_iv (XIMDontChange), 886 const_iv (XIMDontChange),
884# endif 887# endif
885# endif 888# endif
886 }; 889 };
887 890
888 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; )
889 civ-- > const_iv; )
890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 892 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
891} 893}
892 894
893void 895void
894warn (const char *msg) 896warn (const char *msg)
… …
925 RETVAL 927 RETVAL
926 928
927int 929int
928SET_FGCOLOR (int rend, int new_color) 930SET_FGCOLOR (int rend, int new_color)
929 CODE: 931 CODE:
930 RETVAL = SET_FGCOLOR (rend, new_color); 932 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
931 OUTPUT: 933 OUTPUT:
932 RETVAL 934 RETVAL
933 935
934int 936int
935SET_BGCOLOR (int rend, int new_color) 937SET_BGCOLOR (int rend, int new_color)
936 CODE: 938 CODE:
937 RETVAL = SET_BGCOLOR (rend, new_color); 939 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
938 OUTPUT: 940 OUTPUT:
939 RETVAL 941 RETVAL
940 942
941int 943int
942GET_CUSTOM (int rend) 944GET_CUSTOM (int rend)
… …
956 | ((new_value << RS_customShift) & RS_customMask); 958 | ((new_value << RS_customShift) & RS_customMask);
957} 959}
958 OUTPUT: 960 OUTPUT:
959 RETVAL 961 RETVAL
960 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
961MODULE = urxvt PACKAGE = urxvt::term 974MODULE = urxvt PACKAGE = urxvt::term
962 975
963SV * 976SV *
964_new (...) 977_new (AV *env, AV *arg)
965 CODE: 978 CODE:
966{ 979{
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; 980 rxvt_term *term = new rxvt_term;
971 981
972 stringvec *argv = new stringvec; 982 stringvec *argv = new stringvec;
973 stringvec *envv = new stringvec; 983 stringvec *envv = new stringvec;
974 984
975 for (int i = 1; i < items; i++) 985 for (int i = 0; i <= AvFILL (arg); i++)
976 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 986 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
977 987
978 AV *env = (AV *)SvRV (ST (0));
979 for (int i = AvFILL (env) + 1; i--; ) 988 for (int i = AvFILL (env) + 1; i--; )
980 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 989 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
981 990
982 envv->push_back (0); 991 envv->push_back (0);
983 992
… …
1010void 1019void
1011rxvt_term::set_should_invoke (int htype, int inc) 1020rxvt_term::set_should_invoke (int htype, int inc)
1012 CODE: 1021 CODE:
1013 THIS->perl.should_invoke [htype] += inc; 1022 THIS->perl.should_invoke [htype] += inc;
1014 1023
1015void 1024int
1016rxvt_term::grab_button (int button, U32 modifiers) 1025rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1017 CODE: 1026 CODE:
1018 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1027 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1019 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1028 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1020 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);
1021 1053
1022bool 1054bool
1023rxvt_term::grab (Time eventtime, int sync = 0) 1055rxvt_term::grab (Time eventtime, int sync = 0)
1024 CODE: 1056 CODE:
1025{ 1057{
1026 int mode = sync ? GrabModeSync : GrabModeAsync; 1058 int mode = sync ? GrabModeSync : GrabModeAsync;
1027 1059
1028 THIS->perl.grabtime = 0; 1060 THIS->perl.grabtime = 0;
1029 1061
1030 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1062 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1031 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1063 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1032 mode, mode, None, GRAB_CURSOR, eventtime)) 1064 mode, mode, None, GRAB_CURSOR, eventtime))
1033 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1065 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1034 THIS->perl.grabtime = eventtime; 1066 THIS->perl.grabtime = eventtime;
1035 else 1067 else
1036 XUngrabPointer (THIS->display->display, eventtime); 1068 XUngrabPointer (THIS->dpy, eventtime);
1037 1069
1038 RETVAL = !!THIS->perl.grabtime; 1070 RETVAL = !!THIS->perl.grabtime;
1039} 1071}
1040 OUTPUT: 1072 OUTPUT:
1041 RETVAL 1073 RETVAL
1042 1074
1043void 1075void
1044rxvt_term::allow_events_async () 1076rxvt_term::allow_events_async ()
1045 CODE: 1077 CODE:
1046 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1078 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1047 1079
1048void 1080void
1049rxvt_term::allow_events_sync () 1081rxvt_term::allow_events_sync ()
1050 CODE: 1082 CODE:
1051 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1083 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1052 1084
1053void 1085void
1054rxvt_term::allow_events_replay () 1086rxvt_term::allow_events_replay ()
1055 CODE: 1087 CODE:
1056 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1088 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1057 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1089 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1058 1090
1059void 1091void
1060rxvt_term::ungrab () 1092rxvt_term::ungrab ()
1061 CODE: 1093 CODE:
1062 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
1063 1119
1064int 1120int
1065rxvt_term::strwidth (SV *str) 1121rxvt_term::strwidth (SV *str)
1066 CODE: 1122 CODE:
1067{ 1123{
1068 wchar_t *wstr = sv2wcs (str); 1124 wchar_t *wstr = sv2wcs (str);
1069 1125
1070 rxvt_push_locale (THIS->locale); 1126 rxvt_push_locale (THIS->locale);
1071 RETVAL = wcswidth (wstr, wcslen (wstr)); 1127 RETVAL = 0;
1128 for (wchar_t *wc = wstr; *wc; wc++)
1129 {
1130 int w = WCWIDTH (*wc);
1131
1132 if (w)
1133 RETVAL += min (w, 1);
1134 }
1072 rxvt_pop_locale (); 1135 rxvt_pop_locale ();
1073 1136
1074 free (wstr); 1137 free (wstr);
1075} 1138}
1076 OUTPUT: 1139 OUTPUT:
… …
1106 rxvt_pop_locale (); 1169 rxvt_pop_locale ();
1107 1170
1108 RETVAL = wcs2sv (wstr); 1171 RETVAL = wcs2sv (wstr);
1109 free (wstr); 1172 free (wstr);
1110} 1173}
1174 OUTPUT:
1175 RETVAL
1176
1177char *
1178rxvt_term::locale ()
1179 CODE:
1180 RETVAL = THIS->locale;
1111 OUTPUT: 1181 OUTPUT:
1112 RETVAL 1182 RETVAL
1113 1183
1114#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1184#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1115 1185
… …
1185 } 1255 }
1186 OUTPUT: 1256 OUTPUT:
1187 RETVAL 1257 RETVAL
1188 1258
1189SV * 1259SV *
1190rxvt_term::_env () 1260rxvt_term::envv ()
1261 ALIAS:
1262 argv = 1
1191 CODE: 1263 PPCODE:
1192{ 1264{
1193 if (THIS->envv) 1265 stringvec *vec = ix ? THIS->argv : THIS->envv;
1194 {
1195 AV *av = newAV ();
1196 1266
1267 EXTEND (SP, vec->size ());
1268
1197 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1269 for (char **i = vec->begin (); i != vec->end (); ++i)
1198 if (*i) 1270 if (*i)
1199 av_push (av, newSVpv (*i, 0)); 1271 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1200
1201 RETVAL = newRV_noinc ((SV *)av);
1202 }
1203 else
1204 RETVAL = &PL_sv_undef;
1205} 1272}
1206 OUTPUT:
1207 RETVAL
1208 1273
1209int 1274int
1210rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1275rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1211 CODE: 1276 CODE:
1212 RETVAL = THIS->pty_ev.events; 1277 RETVAL = THIS->pty_ev.events;
… …
1266void 1331void
1267rxvt_term::focus_in () 1332rxvt_term::focus_in ()
1268 1333
1269void 1334void
1270rxvt_term::focus_out () 1335rxvt_term::focus_out ()
1336
1337void
1338rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1339 ALIAS:
1340 key_release = 1
1341 CODE:
1342{
1343 XKeyEvent xkey;
1344
1345 memset (&xkey, 0, sizeof (xkey));
1346
1347 xkey.time = time;
1348 xkey.state = state;
1349 xkey.keycode = keycode;
1350
1351 xkey.type = ix ? KeyRelease : KeyPress;
1352 xkey.display = THIS->dpy;
1353 xkey.window = THIS->vt;
1354 xkey.root = THIS->display->root;
1355 xkey.subwindow = THIS->vt;
1356
1357 if (ix)
1358 THIS->key_release (xkey);
1359 else
1360 THIS->key_press (xkey);
1361}
1271 1362
1272void 1363void
1273rxvt_term::want_refresh () 1364rxvt_term::want_refresh ()
1274 CODE: 1365 CODE:
1275 THIS->want_refresh = 1; 1366 THIS->want_refresh = 1;
… …
1468 1559
1469void 1560void
1470rxvt_term::_resource (char *name, int index, SV *newval = 0) 1561rxvt_term::_resource (char *name, int index, SV *newval = 0)
1471 PPCODE: 1562 PPCODE:
1472{ 1563{
1473 struct resval { const char *name; int value; } rslist [] = { 1564 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1474# define def(name) { # name, Rs_ ## name }, 1565# define def(name) { # name, Rs_ ## name },
1475# define reserve(name,count) 1566# define reserve(name,count)
1476# include "rsinc.h" 1567# include "rsinc.h"
1477# undef def 1568# undef def
1478# undef reserve 1569# undef reserve
1479 }; 1570 };
1480 1571
1481 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1572 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1482 1573
1483 do { 1574 do {
1484 if (rs-- == rslist) 1575 if (rs-- == rslist)
1485 croak ("no such resource '%s', requested", name); 1576 croak ("no such resource '%s', requested", name);
1486 } while (strcmp (name, rs->name)); 1577 } while (strcmp (name, rs->name));
… …
1711void 1802void
1712rxvt_term::XListProperties (Window window) 1803rxvt_term::XListProperties (Window window)
1713 PPCODE: 1804 PPCODE:
1714{ 1805{
1715 int count; 1806 int count;
1716 Atom *props = XListProperties (THIS->display->display, window, &count); 1807 Atom *props = XListProperties (THIS->dpy, window, &count);
1717 1808
1718 EXTEND (SP, count); 1809 EXTEND (SP, count);
1719 while (count--) 1810 while (count--)
1720 PUSHs (newSVuv ((U32)props [count])); 1811 PUSHs (newSVuv ((U32)props [count]));
1721 1812
… …
1730 int format; 1821 int format;
1731 unsigned long nitems; 1822 unsigned long nitems;
1732 unsigned long bytes_after; 1823 unsigned long bytes_after;
1733 unsigned char *prop; 1824 unsigned char *prop;
1734 1825
1735 XGetWindowProperty (THIS->display->display, window, property, 1826 XGetWindowProperty (THIS->dpy, window, property,
1736 0, 1<<24, 0, AnyPropertyType, 1827 0, 1<<24, 0, AnyPropertyType,
1737 &type, &format, &nitems, &bytes_after, &prop); 1828 &type, &format, &nitems, &bytes_after, &prop);
1738 1829
1739 if (type != None) 1830 if (type != None)
1740 { 1831 {
… …
1759 1850
1760 int elemsize = format == 16 ? sizeof (short) 1851 int elemsize = format == 16 ? sizeof (short)
1761 : format == 32 ? sizeof (long) 1852 : format == 32 ? sizeof (long)
1762 : 1; 1853 : 1;
1763 1854
1764 XChangeProperty (THIS->display->display, window, property, 1855 XChangeProperty (THIS->dpy, window, property,
1765 type, format, PropModeReplace, 1856 type, format, PropModeReplace,
1766 (unsigned char *)data_, len / elemsize); 1857 (unsigned char *)data_, len / elemsize);
1767 XSync (THIS->display->display, 0);
1768} 1858}
1769 1859
1770Atom 1860Atom
1771XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1861XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1772 C_ARGS: term->display->display, atom_name, only_if_exists 1862 C_ARGS: term->dpy, atom_name, only_if_exists
1773 1863
1774char * 1864char *
1775XGetAtomName (rxvt_term *term, Atom atom) 1865XGetAtomName (rxvt_term *term, Atom atom)
1776 C_ARGS: term->display->display, atom 1866 C_ARGS: term->dpy, atom
1777 CLEANUP: 1867 CLEANUP:
1778 XFree (RETVAL); 1868 XFree (RETVAL);
1779 1869
1780void 1870void
1781XDeleteProperty (rxvt_term *term, Window window, Atom property) 1871XDeleteProperty (rxvt_term *term, Window window, Atom property)
1782 C_ARGS: term->display->display, window, property 1872 C_ARGS: term->dpy, window, property
1783 1873
1784Window 1874Window
1785rxvt_term::DefaultRootWindow () 1875rxvt_term::DefaultRootWindow ()
1786 CODE: 1876 CODE:
1787 RETVAL = THIS->display->root; 1877 RETVAL = THIS->display->root;
… …
1790 1880
1791#if 0 1881#if 0
1792 1882
1793Window 1883Window
1794XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1884XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1795 C_ARGS: term->display->display, (Window)parent, 1885 C_ARGS: term->dpy, (Window)parent,
1796 x, y, width, height, 0, 1886 x, y, width, height, 0,
1797 term->pix_colors_focused[Color_border], 1887 term->pix_colors_focused[Color_border],
1798 term->pix_colors_focused[Color_border] 1888 term->pix_colors_focused[Color_border]
1799 1889
1800#endif 1890#endif
1801 1891
1802void 1892void
1803XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1893XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1804 C_ARGS: term->display->display, window, parent, x, y 1894 C_ARGS: term->dpy, window, parent, x, y
1805 1895
1806void 1896void
1807XMapWindow (rxvt_term *term, Window window) 1897XMapWindow (rxvt_term *term, Window window)
1808 C_ARGS: term->display->display, window 1898 C_ARGS: term->dpy, window
1809 1899
1810void 1900void
1811XUnmapWindow (rxvt_term *term, Window window) 1901XUnmapWindow (rxvt_term *term, Window window)
1812 C_ARGS: term->display->display, window 1902 C_ARGS: term->dpy, window
1813 1903
1814void 1904void
1815XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1905XMoveResizeWindow (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 1906 C_ARGS: term->dpy, window, x, y, width, height
1817 1907
1818void 1908void
1819rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1909rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1820 CODE: 1910 CODE:
1821{ 1911{
1822 XWindowAttributes attr; 1912 XWindowAttributes attr;
1823 XGetWindowAttributes (THIS->display->display, window, &attr); 1913 XGetWindowAttributes (THIS->dpy, window, &attr);
1824 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1914 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1825} 1915}
1826 1916
1827void 1917void
1828rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1918rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1829 PPCODE: 1919 PPCODE:
1830{ 1920{
1831 int dx, dy; 1921 int dx, dy;
1832 Window child; 1922 Window child;
1833 1923
1834 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1924 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1835 { 1925 {
1836 EXTEND (SP, 3); 1926 EXTEND (SP, 3);
1837 PUSHs (newSViv (dx)); 1927 PUSHs (newSViv (dx));
1838 PUSHs (newSViv (dy)); 1928 PUSHs (newSViv (dy));
1839 PUSHs (newSVuv (child)); 1929 PUSHs (newSVuv (child));

Diff Legend

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