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.90 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.95 by root, Sun Jan 29 20:51:28 2006 UTC

… …
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 114
115 return (long)mg->mg_ptr; 115 return (long)mg->mg_ptr;
116} 116}
117 117
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 118#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 119#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 120
121///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
122 122
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher") 123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124 124
… …
171 171
172 if (SvTRUE (ERRSV)) 172 if (SvTRUE (ERRSV))
173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
174} 174}
175 175
176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 176#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer") 177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR ((sv), "urxvt::timer")
178 178
179struct timer : perl_watcher, time_watcher 179struct timer : perl_watcher, time_watcher
180{ 180{
181 tstamp interval; 181 tstamp interval;
182 182
… …
192 192
193 invoke ("urxvt::timer", newSVtimer (this)); 193 invoke ("urxvt::timer", newSVtimer (this));
194 } 194 }
195}; 195};
196 196
197#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 197#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow") 198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR ((sv), "urxvt::iow")
199 199
200struct iow : perl_watcher, io_watcher 200struct iow : perl_watcher, io_watcher
201{ 201{
202 iow () 202 iow ()
203 : io_watcher (this, &iow::execute) 203 : io_watcher (this, &iow::execute)
… …
208 { 208 {
209 invoke ("urxvt::iow", newSViow (this), revents); 209 invoke ("urxvt::iow", newSViow (this), revents);
210 } 210 }
211}; 211};
212 212
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw") 213#define newSViw(iw) new_ref ((iw)->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw") 214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR ((sv), "urxvt::iw")
215 215
216struct iw : perl_watcher, idle_watcher 216struct iw : perl_watcher, idle_watcher
217{ 217{
218 iw () 218 iw ()
219 : idle_watcher (this, &iw::execute) 219 : idle_watcher (this, &iw::execute)
… …
224 { 224 {
225 invoke ("urxvt::iw", newSViw (this)); 225 invoke ("urxvt::iw", newSViw (this));
226 } 226 }
227}; 227};
228 228
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw") 229#define newSVpw(pw) new_ref ((pw)->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw") 230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR ((sv), "urxvt::pw")
231 231
232struct pw : perl_watcher, child_watcher 232struct pw : perl_watcher, child_watcher
233{ 233{
234 pw () 234 pw ()
235 : child_watcher (this, &pw::execute) 235 : child_watcher (this, &pw::execute)
… …
244 244
245///////////////////////////////////////////////////////////////////////////// 245/////////////////////////////////////////////////////////////////////////////
246 246
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 248
249struct overlay { 249class overlay {
250 HV *self;
251 bool visible;
252 rxvt_term *THIS; 250 rxvt_term *THIS;
251 AV *overlay_av;
253 int x, y, w, h; 252 int x, y, w, h;
254 int border; 253 int border;
255 text_t **text; 254 text_t **text;
256 rend_t **rend; 255 rend_t **rend;
257 256
257public:
258 HV *self;
259
258 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 260 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
259 ~overlay (); 261 ~overlay ();
260 262
261 void show (); 263 void show ();
262 void hide (); 264 void hide ();
… …
265 267
266 void set (int x, int y, SV *str, SV *rend); 268 void set (int x, int y, SV *str, SV *rend);
267}; 269};
268 270
269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 271overlay::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) 272: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
271{ 273{
272 if (border == 2) 274 if (border == 2)
273 { 275 {
274 w += 2; 276 w += 2;
275 h += 2; 277 h += 2;
… …
314 *rp++ = r; 316 *rp++ = r;
315 } 317 }
316 } 318 }
317 319
318 show (); 320 show ();
319 THIS->want_refresh = 1;
320} 321}
321 322
322overlay::~overlay () 323overlay::~overlay ()
323{ 324{
324 hide (); 325 hide ();
… …
329 delete [] rend[y]; 330 delete [] rend[y];
330 } 331 }
331 332
332 delete [] text; 333 delete [] text;
333 delete [] rend; 334 delete [] rend;
335}
336
337void
338overlay::show ()
339{
340 if (overlay_av)
341 return;
342
343 overlay_av = (AV *)SvREFCNT_inc (SvRV (
344 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
345 ));
346 av_push (overlay_av, newSViv ((long)this));
334 347
335 THIS->want_refresh = 1; 348 THIS->want_refresh = 1;
336} 349}
337 350
338void 351void
339overlay::show () 352overlay::hide ()
340{ 353{
341 if (visible) 354 if (!overlay_av)
342 return; 355 return;
343 356
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; 357 int i;
361 358
362 for (i = AvFILL (av); i >= 0; i--) 359 for (i = AvFILL (overlay_av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this) 360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364 { 361 {
365 av_delete (av, i, G_DISCARD); 362 av_delete (overlay_av, i, G_DISCARD);
366 break; 363 break;
367 } 364 }
368 365
369 for (; i < AvFILL (av); i++) 366 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 368
372 av_pop (av); 369 av_pop (overlay_av);
370
371 SvREFCNT_dec (overlay_av);
372 overlay_av = 0;
373
374 THIS->want_refresh = 1;
373} 375}
374 376
375void overlay::swap () 377void overlay::swap ()
376{ 378{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 379 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
492static void 494static void
493ungrab (rxvt_term *THIS) 495ungrab (rxvt_term *THIS)
494{ 496{
495 if (THIS->perl.grabtime) 497 if (THIS->perl.grabtime)
496 { 498 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 499 XUngrabKeyboard (THIS->xdisp, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 500 XUngrabPointer (THIS->xdisp, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 501 THIS->perl.grabtime = 0;
500 } 502 }
501} 503}
502 504
503bool 505bool
… …
554 break; 556 break;
555 557
556 case DT_STR_LEN: 558 case DT_STR_LEN:
557 { 559 {
558 char *str = va_arg (ap, char *); 560 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 561 int len = va_arg (ap, int);
560 562
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 563 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 564 }
563 break; 565 break;
564 566
565 case DT_WCS_LEN: 567 case DT_WCS_LEN:
566 { 568 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 569 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 570 int wlen = va_arg (ap, int);
569 571
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 572 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
573 }
574 break;
575
576 case DT_LCS_LEN:
577 {
578 long *lstr = va_arg (ap, long *);
579 int llen = va_arg (ap, int);
580
581 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 582 }
572 break; 583 break;
573 584
574 case DT_XEVENT: 585 case DT_XEVENT:
575 { 586 {
576 XEvent *xe = va_arg (ap, XEvent *); 587 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 588 HV *hv = newHV ();
578 589
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 590# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
580# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 591# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
581# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 592# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 593# undef set
583 594
584 setiv (type, xe->type); 595 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 596 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 597 setiv (serial, xe->xany.serial);
587 598
… …
716 } 727 }
717 else if (htype == HOOK_DESTROY) 728 else if (htype == HOOK_DESTROY)
718 { 729 {
719 clearSVptr ((SV *)term->perl.self); 730 clearSVptr ((SV *)term->perl.self);
720 SvREFCNT_dec ((SV *)term->perl.self); 731 SvREFCNT_dec ((SV *)term->perl.self);
732
733 // don't allow further calls
734 term->perl.self = 0;
721 } 735 }
722 736
723 swap (perl_environ, environ); 737 swap (perl_environ, environ);
724 738
725 return event_consumed; 739 return event_consumed;
… …
842 const_iv (SelectionRequest), 856 const_iv (SelectionRequest),
843 const_iv (SelectionNotify), 857 const_iv (SelectionNotify),
844 const_iv (ColormapNotify), 858 const_iv (ColormapNotify),
845 const_iv (ClientMessage), 859 const_iv (ClientMessage),
846 const_iv (MappingNotify), 860 const_iv (MappingNotify),
861# if ENABLE_XIM_ONTHESPOT
862 const_iv (XIMReverse),
863 const_iv (XIMUnderline),
864 const_iv (XIMHighlight),
865 const_iv (XIMPrimary),
866 const_iv (XIMSecondary),
867 const_iv (XIMTertiary),
868 const_iv (XIMVisibleToForward),
869 const_iv (XIMVisibleToBackword),
870 const_iv (XIMVisibleToCenter),
871# if 0
872 const_iv (XIMForwardChar),
873 const_iv (XIMBackwardChar),
874 const_iv (XIMForwardWord),
875 const_iv (XIMBackwardWord),
876 const_iv (XIMCaretUp),
877 const_iv (XIMCaretDown),
878 const_iv (XIMNextLine),
879 const_iv (XIMPreviousLine),
880 const_iv (XIMLineStart),
881 const_iv (XIMLineEnd),
882 const_iv (XIMAbsolutePosition),
883 const_iv (XIMDontChange),
884# endif
885# endif
847 }; 886 };
848 887
849 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 888 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
850 civ-- > const_iv; ) 889 civ-- > const_iv; )
851 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
917 | ((new_value << RS_customShift) & RS_customMask); 956 | ((new_value << RS_customShift) & RS_customMask);
918} 957}
919 OUTPUT: 958 OUTPUT:
920 RETVAL 959 RETVAL
921 960
961void
962termlist ()
963 PPCODE:
964{
965 EXTEND (SP, rxvt_term::termlist.size ());
966
967 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
968 if ((*t)->perl.self)
969 PUSHs (sv_2mortal (newSVterm (*t)));
970}
971
922MODULE = urxvt PACKAGE = urxvt::term 972MODULE = urxvt PACKAGE = urxvt::term
923 973
924SV * 974SV *
925_new (...) 975_new (AV *env, AV *arg)
926 CODE: 976 CODE:
927{ 977{
928 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
929 croak ("first argument to urxvt::term->_new must be arrayref");
930
931 rxvt_term *term = new rxvt_term; 978 rxvt_term *term = new rxvt_term;
932 979
933 stringvec *argv = new stringvec; 980 stringvec *argv = new stringvec;
934 stringvec *envv = new stringvec; 981 stringvec *envv = new stringvec;
935 982
936 for (int i = 1; i < items; i++) 983 for (int i = 0; i <= AvFILL (arg); i++)
937 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 984 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
938 985
939 AV *env = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (env) + 1; i--; ) 986 for (int i = AvFILL (env) + 1; i--; )
941 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 987 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 988
943 envv->push_back (0); 989 envv->push_back (0);
944 990
… …
972rxvt_term::set_should_invoke (int htype, int inc) 1018rxvt_term::set_should_invoke (int htype, int inc)
973 CODE: 1019 CODE:
974 THIS->perl.should_invoke [htype] += inc; 1020 THIS->perl.should_invoke [htype] += inc;
975 1021
976void 1022void
977rxvt_term::grab_button (int button, U32 modifiers) 1023rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
978 CODE: 1024 CODE:
979 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1025 XGrabButton (THIS->xdisp, button, modifiers, window, 1,
980 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1026 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
981 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1027 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
982 1028
1029void
1030rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1031 CODE:
1032 XUngrabButton (THIS->xdisp, button, modifiers, window);
1033
1034#if 0
1035
1036void
1037XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1038 C_ARGS:
1039 THIS->xdisp, keycode, modifiers, window, 1,
1040 GrabModeSync, GrabModeSync
1041
1042void
1043XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1044 C_ARGS: THIS->xdisp, keycode, modifiers, window
1045
1046#endif
1047
983bool 1048bool
984rxvt_term::grab (Time eventtime, int sync = 0) 1049rxvt_term::grab (Time eventtime, int sync = 0)
985 CODE: 1050 CODE:
986{ 1051{
987 int mode = sync ? GrabModeSync : GrabModeAsync; 1052 int mode = sync ? GrabModeSync : GrabModeAsync;
988 1053
989 THIS->perl.grabtime = 0; 1054 THIS->perl.grabtime = 0;
990 1055
991 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1056 if (!XGrabPointer (THIS->xdisp, THIS->vt, 0,
992 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1057 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
993 mode, mode, None, GRAB_CURSOR, eventtime)) 1058 mode, mode, None, GRAB_CURSOR, eventtime))
994 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1059 if (!XGrabKeyboard (THIS->xdisp, THIS->vt, 0, mode, mode, eventtime))
995 THIS->perl.grabtime = eventtime; 1060 THIS->perl.grabtime = eventtime;
996 else 1061 else
997 XUngrabPointer (THIS->display->display, eventtime); 1062 XUngrabPointer (THIS->xdisp, eventtime);
998 1063
999 RETVAL = !!THIS->perl.grabtime; 1064 RETVAL = !!THIS->perl.grabtime;
1000} 1065}
1001 OUTPUT: 1066 OUTPUT:
1002 RETVAL 1067 RETVAL
1003 1068
1004void 1069void
1005rxvt_term::allow_events_async () 1070rxvt_term::allow_events_async ()
1006 CODE: 1071 CODE:
1007 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1072 XAllowEvents (THIS->xdisp, AsyncBoth, THIS->perl.grabtime);
1008 1073
1009void 1074void
1010rxvt_term::allow_events_sync () 1075rxvt_term::allow_events_sync ()
1011 CODE: 1076 CODE:
1012 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1077 XAllowEvents (THIS->xdisp, SyncBoth, THIS->perl.grabtime);
1013 1078
1014void 1079void
1015rxvt_term::allow_events_replay () 1080rxvt_term::allow_events_replay ()
1016 CODE: 1081 CODE:
1017 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1082 XAllowEvents (THIS->xdisp, ReplayPointer, THIS->perl.grabtime);
1018 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1083 XAllowEvents (THIS->xdisp, ReplayKeyboard, THIS->perl.grabtime);
1019 1084
1020void 1085void
1021rxvt_term::ungrab () 1086rxvt_term::ungrab ()
1022 CODE: 1087 CODE:
1023 ungrab (THIS); 1088 ungrab (THIS);
… …
1244 1309
1245 line_t &l = ROW(row_number); 1310 line_t &l = ROW(row_number);
1246 1311
1247 if (GIMME_V != G_VOID) 1312 if (GIMME_V != G_VOID)
1248 { 1313 {
1249 wchar_t *wstr = new wchar_t [THIS->ncol]; 1314 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1250 1315
1251 for (int col = 0; col < THIS->ncol; col++) 1316 for (int col = 0; col < THIS->ncol; col++)
1252 wstr [col] = l.t [col]; 1317 wstr [col] = l.t [col];
1253 1318
1254 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1319 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1255
1256 delete [] wstr;
1257 } 1320 }
1258 1321
1259 if (new_text) 1322 if (new_text)
1260 { 1323 {
1261 wchar_t *wstr = sv2wcs (new_text); 1324 wchar_t *wstr = sv2wcs (new_text);
… …
1354rxvt_term::special_encode (SV *string) 1417rxvt_term::special_encode (SV *string)
1355 CODE: 1418 CODE:
1356{ 1419{
1357 wchar_t *wstr = sv2wcs (string); 1420 wchar_t *wstr = sv2wcs (string);
1358 int wlen = wcslen (wstr); 1421 int wlen = wcslen (wstr);
1359 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1422 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1360 1423
1361 rxvt_push_locale (THIS->locale); 1424 rxvt_push_locale (THIS->locale);
1362 1425
1363 wchar_t *r = rstr; 1426 wchar_t *r = rstr;
1364 for (wchar_t *s = wstr; *s; s++) 1427 for (wchar_t *s = wstr; *s; s++)
1428 {
1429 int w = WCWIDTH (*s);
1430
1365 if (wcwidth (*s) == 0) 1431 if (w == 0)
1366 { 1432 {
1367 if (r == rstr) 1433 if (r == rstr)
1368 croak ("leading combining character unencodable"); 1434 croak ("leading combining character unencodable");
1369 1435
1370 unicode_t n = rxvt_compose (r[-1], *s); 1436 unicode_t n = rxvt_compose (r[-1], *s);
1371 if (n == NOCHAR) 1437 if (n == NOCHAR)
1372 n = rxvt_composite.compose (r[-1], *s); 1438 n = rxvt_composite.compose (r[-1], *s);
1373 1439
1374 r[-1] = n; 1440 r[-1] = n;
1375 } 1441 }
1376#if !UNICODE_3 1442#if !UNICODE_3
1377 else if (*s >= 0x10000) 1443 else if (*s >= 0x10000)
1378 *r++ = rxvt_composite.compose (*s); 1444 *r++ = rxvt_composite.compose (*s);
1379#endif 1445#endif
1380 else 1446 else
1381 *r++ = *s; 1447 *r++ = *s;
1448
1449 // the *2 above only allows wcwidth <= 2
1450 if (w > 1)
1451 *r++ = NOCHAR;
1452 }
1382 1453
1383 rxvt_pop_locale (); 1454 rxvt_pop_locale ();
1384 1455
1385 RETVAL = wcs2sv (rstr, r - rstr); 1456 RETVAL = wcs2sv (rstr, r - rstr);
1386
1387 delete [] rstr;
1388} 1457}
1389 OUTPUT: 1458 OUTPUT:
1390 RETVAL 1459 RETVAL
1391 1460
1392SV * 1461SV *
… …
1404 else if (IS_COMPOSE (*s)) 1473 else if (IS_COMPOSE (*s))
1405 dlen += rxvt_composite.expand (*s, 0); 1474 dlen += rxvt_composite.expand (*s, 0);
1406 else 1475 else
1407 dlen++; 1476 dlen++;
1408 1477
1409 wchar_t *rstr = new wchar_t [dlen]; 1478 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1410 1479
1411 // decode 1480 // decode
1412 wchar_t *r = rstr; 1481 wchar_t *r = rstr;
1413 for (wchar_t *s = wstr; *s; s++) 1482 for (wchar_t *s = wstr; *s; s++)
1414 if (*s == NOCHAR) 1483 if (*s == NOCHAR)
… …
1417 r += rxvt_composite.expand (*s, r); 1486 r += rxvt_composite.expand (*s, r);
1418 else 1487 else
1419 *r++ = *s; 1488 *r++ = *s;
1420 1489
1421 RETVAL = wcs2sv (rstr, r - rstr); 1490 RETVAL = wcs2sv (rstr, r - rstr);
1422
1423 delete [] rstr;
1424} 1491}
1425 OUTPUT: 1492 OUTPUT:
1426 RETVAL 1493 RETVAL
1427 1494
1428void 1495void
… …
1569 CODE: 1636 CODE:
1570 RETVAL = THIS->charsets [THIS->screen.charset]; 1637 RETVAL = THIS->charsets [THIS->screen.charset];
1571 OUTPUT: 1638 OUTPUT:
1572 RETVAL 1639 RETVAL
1573 1640
1574#void 1641void
1575#rxvt_term::selection_clear () 1642rxvt_term::selection_clear ()
1576 1643
1577void 1644void
1578rxvt_term::selection_make (Time eventtime, bool rect = false) 1645rxvt_term::selection_make (Time eventtime, bool rect = false)
1579 CODE: 1646 CODE:
1580 THIS->selection.op = SELECTION_CONT; 1647 THIS->selection.op = SELECTION_CONT;
… …
1670void 1737void
1671rxvt_term::XListProperties (Window window) 1738rxvt_term::XListProperties (Window window)
1672 PPCODE: 1739 PPCODE:
1673{ 1740{
1674 int count; 1741 int count;
1675 Atom *props = XListProperties (THIS->display->display, window, &count); 1742 Atom *props = XListProperties (THIS->xdisp, window, &count);
1676 1743
1677 EXTEND (SP, count); 1744 EXTEND (SP, count);
1678 while (count--) 1745 while (count--)
1679 PUSHs (newSVuv ((U32)props [count])); 1746 PUSHs (newSVuv ((U32)props [count]));
1680 1747
… …
1689 int format; 1756 int format;
1690 unsigned long nitems; 1757 unsigned long nitems;
1691 unsigned long bytes_after; 1758 unsigned long bytes_after;
1692 unsigned char *prop; 1759 unsigned char *prop;
1693 1760
1694 XGetWindowProperty (THIS->display->display, window, property, 1761 XGetWindowProperty (THIS->xdisp, window, property,
1695 0, 1<<24, 0, AnyPropertyType, 1762 0, 1<<24, 0, AnyPropertyType,
1696 &type, &format, &nitems, &bytes_after, &prop); 1763 &type, &format, &nitems, &bytes_after, &prop);
1697 1764
1698 if (type != None) 1765 if (type != None)
1699 { 1766 {
… …
1718 1785
1719 int elemsize = format == 16 ? sizeof (short) 1786 int elemsize = format == 16 ? sizeof (short)
1720 : format == 32 ? sizeof (long) 1787 : format == 32 ? sizeof (long)
1721 : 1; 1788 : 1;
1722 1789
1723 XChangeProperty (THIS->display->display, window, property, 1790 XChangeProperty (THIS->xdisp, window, property,
1724 type, format, PropModeReplace, 1791 type, format, PropModeReplace,
1725 (unsigned char *)data_, len / elemsize); 1792 (unsigned char *)data_, len / elemsize);
1726 XSync (THIS->display->display, 0); 1793 XSync (THIS->xdisp, 0);
1727} 1794}
1728 1795
1729Atom 1796Atom
1730XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1797XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1731 C_ARGS: term->display->display, atom_name, only_if_exists 1798 C_ARGS: term->xdisp, atom_name, only_if_exists
1732 1799
1733char * 1800char *
1734XGetAtomName (rxvt_term *term, Atom atom) 1801XGetAtomName (rxvt_term *term, Atom atom)
1735 C_ARGS: term->display->display, atom 1802 C_ARGS: term->xdisp, atom
1736 CLEANUP: 1803 CLEANUP:
1737 XFree (RETVAL); 1804 XFree (RETVAL);
1738 1805
1739void 1806void
1740XDeleteProperty (rxvt_term *term, Window window, Atom property) 1807XDeleteProperty (rxvt_term *term, Window window, Atom property)
1741 C_ARGS: term->display->display, window, property 1808 C_ARGS: term->xdisp, window, property
1742 1809
1743Window 1810Window
1744rxvt_term::DefaultRootWindow () 1811rxvt_term::DefaultRootWindow ()
1745 CODE: 1812 CODE:
1746 RETVAL = THIS->display->root; 1813 RETVAL = THIS->display->root;
… …
1749 1816
1750#if 0 1817#if 0
1751 1818
1752Window 1819Window
1753XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1820XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1754 C_ARGS: term->display->display, (Window)parent, 1821 C_ARGS: term->xdisp, (Window)parent,
1755 x, y, width, height, 0, 1822 x, y, width, height, 0,
1756 term->pix_colors_focused[Color_border], 1823 term->pix_colors_focused[Color_border],
1757 term->pix_colors_focused[Color_border] 1824 term->pix_colors_focused[Color_border]
1758 1825
1759#endif 1826#endif
1760 1827
1761void 1828void
1762XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1829XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1763 C_ARGS: term->display->display, window, parent, x, y 1830 C_ARGS: term->xdisp, window, parent, x, y
1764 1831
1765void 1832void
1766XMapWindow (rxvt_term *term, Window window) 1833XMapWindow (rxvt_term *term, Window window)
1767 C_ARGS: term->display->display, window 1834 C_ARGS: term->xdisp, window
1768 1835
1769void 1836void
1770XUnmapWindow (rxvt_term *term, Window window) 1837XUnmapWindow (rxvt_term *term, Window window)
1771 C_ARGS: term->display->display, window 1838 C_ARGS: term->xdisp, window
1772 1839
1773void 1840void
1774XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1841XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1775 C_ARGS: term->display->display, window, x, y, width, height 1842 C_ARGS: term->xdisp, window, x, y, width, height
1776 1843
1777void 1844void
1778rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1845rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1779 CODE: 1846 CODE:
1780{ 1847{
1781 XWindowAttributes attr; 1848 XWindowAttributes attr;
1782 XGetWindowAttributes (THIS->display->display, window, &attr); 1849 XGetWindowAttributes (THIS->xdisp, window, &attr);
1783 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1850 XSelectInput (THIS->xdisp, window, attr.your_event_mask | add_events & ~del_events);
1784} 1851}
1785 1852
1786void 1853void
1787rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1854rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1788 PPCODE: 1855 PPCODE:
1789{ 1856{
1790 int dx, dy; 1857 int dx, dy;
1791 Window child; 1858 Window child;
1792 1859
1793 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1860 if (XTranslateCoordinates (THIS->xdisp, src, dst, x, y, &dx, &dy, &child))
1794 { 1861 {
1795 EXTEND (SP, 3); 1862 EXTEND (SP, 3);
1796 PUSHs (newSViv (dx)); 1863 PUSHs (newSViv (dx));
1797 PUSHs (newSViv (dy)); 1864 PUSHs (newSViv (dy));
1798 PUSHs (newSVuv (child)); 1865 PUSHs (newSVuv (child));

Diff Legend

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