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.86 by root, Fri Jan 20 22:49:34 2006 UTC vs.
Revision 1.102 by root, Thu Jul 6 23:48:11 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 {
365 av_delete (av, i, G_DISCARD);
366 break; 360 break;
367 }
368 361
369 for (; i < AvFILL (av); i++) 362 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 363 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 364
372 av_pop (av); 365 av_pop (overlay_av);
366
367 SvREFCNT_dec (overlay_av);
368 overlay_av = 0;
369
370 THIS->want_refresh = 1;
373} 371}
374 372
375void overlay::swap () 373void overlay::swap ()
376{ 374{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 375 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
492static void 490static void
493ungrab (rxvt_term *THIS) 491ungrab (rxvt_term *THIS)
494{ 492{
495 if (THIS->perl.grabtime) 493 if (THIS->perl.grabtime)
496 { 494 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 495 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 496 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 497 THIS->perl.grabtime = 0;
500 } 498 }
501} 499}
502 500
503bool 501bool
… …
554 break; 552 break;
555 553
556 case DT_STR_LEN: 554 case DT_STR_LEN:
557 { 555 {
558 char *str = va_arg (ap, char *); 556 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 557 int len = va_arg (ap, int);
560 558
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 559 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 560 }
563 break; 561 break;
564 562
565 case DT_WCS_LEN: 563 case DT_WCS_LEN:
566 { 564 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 565 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 566 int wlen = va_arg (ap, int);
569 567
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 568 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
569 }
570 break;
571
572 case DT_LCS_LEN:
573 {
574 long *lstr = va_arg (ap, long *);
575 int llen = va_arg (ap, int);
576
577 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 578 }
572 break; 579 break;
573 580
574 case DT_XEVENT: 581 case DT_XEVENT:
575 { 582 {
576 XEvent *xe = va_arg (ap, XEvent *); 583 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 584 HV *hv = newHV ();
578 585
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 586# 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) 587# 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) 588# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 589# undef set
583 590
584 setiv (type, xe->type); 591 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 592 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 593 setiv (serial, xe->xany.serial);
587 594
… …
716 } 723 }
717 else if (htype == HOOK_DESTROY) 724 else if (htype == HOOK_DESTROY)
718 { 725 {
719 clearSVptr ((SV *)term->perl.self); 726 clearSVptr ((SV *)term->perl.self);
720 SvREFCNT_dec ((SV *)term->perl.self); 727 SvREFCNT_dec ((SV *)term->perl.self);
728
729 // don't allow further calls
730 term->perl.self = 0;
721 } 731 }
722 732
723 swap (perl_environ, environ); 733 swap (perl_environ, environ);
724 734
725 return event_consumed; 735 return event_consumed;
… …
749# include "optinc.h" 759# include "optinc.h"
750# undef nodef 760# undef nodef
751# undef def 761# undef def
752 762
753 HV *stash = gv_stashpv ("urxvt", 1); 763 HV *stash = gv_stashpv ("urxvt", 1);
754 struct { 764 static const struct {
755 const char *name; 765 const char *name;
756 IV iv; 766 IV iv;
757 } *civ, const_iv[] = { 767 } *civ, const_iv[] = {
758# define const_iv(name) { # name, (IV)name } 768# define const_iv(name) { # name, (IV)name }
759 const_iv (DEFAULT_RSTYLE), 769 const_iv (DEFAULT_RSTYLE),
… …
777 const_iv (Button2Mask), 787 const_iv (Button2Mask),
778 const_iv (Button3Mask), 788 const_iv (Button3Mask),
779 const_iv (Button4Mask), 789 const_iv (Button4Mask),
780 const_iv (Button5Mask), 790 const_iv (Button5Mask),
781 const_iv (AnyModifier), 791 const_iv (AnyModifier),
792
793 const_iv (NoSymbol),
794 const_iv (GrabModeSync),
795 const_iv (GrabModeAsync),
782 796
783 const_iv (EVENT_NONE), 797 const_iv (EVENT_NONE),
784 const_iv (EVENT_READ), 798 const_iv (EVENT_READ),
785 const_iv (EVENT_WRITE), 799 const_iv (EVENT_WRITE),
786 800
… …
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]); civ-- > const_iv; )
850 civ-- > const_iv; )
851 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
852} 890}
853 891
854void 892void
855warn (const char *msg) 893warn (const char *msg)
… …
886 RETVAL 924 RETVAL
887 925
888int 926int
889SET_FGCOLOR (int rend, int new_color) 927SET_FGCOLOR (int rend, int new_color)
890 CODE: 928 CODE:
891 RETVAL = SET_FGCOLOR (rend, new_color); 929 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
892 OUTPUT: 930 OUTPUT:
893 RETVAL 931 RETVAL
894 932
895int 933int
896SET_BGCOLOR (int rend, int new_color) 934SET_BGCOLOR (int rend, int new_color)
897 CODE: 935 CODE:
898 RETVAL = SET_BGCOLOR (rend, new_color); 936 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
899 OUTPUT: 937 OUTPUT:
900 RETVAL 938 RETVAL
901 939
902int 940int
903GET_CUSTOM (int rend) 941GET_CUSTOM (int rend)
… …
917 | ((new_value << RS_customShift) & RS_customMask); 955 | ((new_value << RS_customShift) & RS_customMask);
918} 956}
919 OUTPUT: 957 OUTPUT:
920 RETVAL 958 RETVAL
921 959
960void
961termlist ()
962 PPCODE:
963{
964 EXTEND (SP, rxvt_term::termlist.size ());
965
966 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
967 if ((*t)->perl.self)
968 PUSHs (sv_2mortal (newSVterm (*t)));
969}
970
922MODULE = urxvt PACKAGE = urxvt::term 971MODULE = urxvt PACKAGE = urxvt::term
923 972
924SV * 973SV *
925_new (...) 974_new (AV *env, AV *arg)
926 CODE: 975 CODE:
927{ 976{
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; 977 rxvt_term *term = new rxvt_term;
932 978
933 term->argv = new stringvec; 979 stringvec *argv = new stringvec;
934 term->envv = new stringvec; 980 stringvec *envv = new stringvec;
935 981
936 for (int i = 1; i < items; i++) 982 for (int i = 0; i <= AvFILL (arg); i++)
937 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 983 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
938 984
939 AV *envv = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (envv) + 1; i--; ) 985 for (int i = AvFILL (env) + 1; i--; )
941 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 986 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 987
943 term->envv->push_back (0); 988 envv->push_back (0);
944 989
945 bool success; 990 bool success;
946 991
947 try 992 try
948 { 993 {
949 success = term->init (term->argv->size (), term->argv->begin ()); 994 success = term->init (argv, envv);
950 } 995 }
951 catch (const class rxvt_failure_exception &e) 996 catch (const class rxvt_failure_exception &e)
952 { 997 {
953 success = false; 998 success = false;
954 } 999 }
… …
971void 1016void
972rxvt_term::set_should_invoke (int htype, int inc) 1017rxvt_term::set_should_invoke (int htype, int inc)
973 CODE: 1018 CODE:
974 THIS->perl.should_invoke [htype] += inc; 1019 THIS->perl.should_invoke [htype] += inc;
975 1020
976void 1021int
977rxvt_term::grab_button (int button, U32 modifiers) 1022rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
978 CODE: 1023 CODE:
979 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1024 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
980 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1025 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
981 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1026 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1027 OUTPUT: RETVAL
1028
1029int
1030rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1031 CODE:
1032 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
1033 OUTPUT: RETVAL
1034
1035void
1036rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1037 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1038 CODE:
1039 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1040
1041void
1042rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
1043 CODE:
1044 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1045
1046void
1047rxvt_term::XUngrabKeyboard (Time eventtime)
1048 CODE:
1049 XUngrabKeyboard (THIS->dpy, eventtime);
982 1050
983bool 1051bool
984rxvt_term::grab (Time eventtime, int sync = 0) 1052rxvt_term::grab (Time eventtime, int sync = 0)
985 CODE: 1053 CODE:
986{ 1054{
987 int mode = sync ? GrabModeSync : GrabModeAsync; 1055 int mode = sync ? GrabModeSync : GrabModeAsync;
988 1056
989 THIS->perl.grabtime = 0; 1057 THIS->perl.grabtime = 0;
990 1058
991 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1059 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
992 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1060 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
993 mode, mode, None, GRAB_CURSOR, eventtime)) 1061 mode, mode, None, GRAB_CURSOR, eventtime))
994 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1062 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
995 THIS->perl.grabtime = eventtime; 1063 THIS->perl.grabtime = eventtime;
996 else 1064 else
997 XUngrabPointer (THIS->display->display, eventtime); 1065 XUngrabPointer (THIS->dpy, eventtime);
998 1066
999 RETVAL = !!THIS->perl.grabtime; 1067 RETVAL = !!THIS->perl.grabtime;
1000} 1068}
1001 OUTPUT: 1069 OUTPUT:
1002 RETVAL 1070 RETVAL
1003 1071
1004void 1072void
1005rxvt_term::allow_events_async () 1073rxvt_term::allow_events_async ()
1006 CODE: 1074 CODE:
1007 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1075 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1008 1076
1009void 1077void
1010rxvt_term::allow_events_sync () 1078rxvt_term::allow_events_sync ()
1011 CODE: 1079 CODE:
1012 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1080 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1013 1081
1014void 1082void
1015rxvt_term::allow_events_replay () 1083rxvt_term::allow_events_replay ()
1016 CODE: 1084 CODE:
1017 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1085 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1018 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1086 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1019 1087
1020void 1088void
1021rxvt_term::ungrab () 1089rxvt_term::ungrab ()
1022 CODE: 1090 CODE:
1023 ungrab (THIS); 1091 ungrab (THIS);
1092
1093int
1094rxvt_term::XStringToKeysym (char *string)
1095 CODE:
1096 RETVAL = XStringToKeysym (string);
1097 OUTPUT: RETVAL
1098
1099char *
1100rxvt_term::XKeysymToString (int sym)
1101 CODE:
1102 RETVAL = XKeysymToString (sym);
1103 OUTPUT: RETVAL
1104
1105int
1106rxvt_term::XKeysymToKeycode (int sym)
1107 CODE:
1108 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
1109 OUTPUT: RETVAL
1110
1111int
1112rxvt_term::XKeycodeToKeysym (int code, int index)
1113 CODE:
1114 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
1115 OUTPUT: RETVAL
1024 1116
1025int 1117int
1026rxvt_term::strwidth (SV *str) 1118rxvt_term::strwidth (SV *str)
1027 CODE: 1119 CODE:
1028{ 1120{
… …
1118 ALIAS: 1210 ALIAS:
1119 ModLevel3Mask = 0 1211 ModLevel3Mask = 0
1120 ModMetaMask = 1 1212 ModMetaMask = 1
1121 ModNumLockMask = 2 1213 ModNumLockMask = 2
1122 current_screen = 3 1214 current_screen = 3
1215 hidden_cursor = 4
1123 CODE: 1216 CODE:
1124 switch (ix) 1217 switch (ix)
1125 { 1218 {
1126 case 0: RETVAL = THIS->ModLevel3Mask; break; 1219 case 0: RETVAL = THIS->ModLevel3Mask; break;
1127 case 1: RETVAL = THIS->ModMetaMask; break; 1220 case 1: RETVAL = THIS->ModMetaMask; break;
1128 case 2: RETVAL = THIS->ModNumLockMask; break; 1221 case 2: RETVAL = THIS->ModNumLockMask; break;
1129 case 3: RETVAL = THIS->current_screen; break; 1222 case 3: RETVAL = THIS->current_screen; break;
1223 case 4: RETVAL = THIS->hidden_cursor; break;
1130 } 1224 }
1131 OUTPUT: 1225 OUTPUT:
1132 RETVAL 1226 RETVAL
1133 1227
1134char * 1228char *
… …
1144 } 1238 }
1145 OUTPUT: 1239 OUTPUT:
1146 RETVAL 1240 RETVAL
1147 1241
1148SV * 1242SV *
1149rxvt_term::_env () 1243rxvt_term::envv ()
1244 ALIAS:
1245 argv = 1
1150 CODE: 1246 PPCODE:
1151{ 1247{
1152 if (THIS->envv) 1248 stringvec *vec = ix ? THIS->argv : THIS->envv;
1153 {
1154 AV *av = newAV ();
1155 1249
1250 EXTEND (SP, vec->size ());
1251
1156 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1252 for (char **i = vec->begin (); i != vec->end (); ++i)
1157 if (*i) 1253 if (*i)
1158 av_push (av, newSVpv (*i, 0)); 1254 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1159
1160 RETVAL = newRV_noinc ((SV *)av);
1161 }
1162 else
1163 RETVAL = &PL_sv_undef;
1164} 1255}
1165 OUTPUT:
1166 RETVAL
1167 1256
1168int 1257int
1169rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1258rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1170 CODE: 1259 CODE:
1171 RETVAL = THIS->pty_ev.events; 1260 RETVAL = THIS->pty_ev.events;
1172 if (events != EVENT_UNDEF) 1261 if (events != EVENT_UNDEF)
1173 THIS->pty_ev.set (events); 1262 THIS->pty_ev.set (events);
1174 OUTPUT: 1263 OUTPUT:
1175 RETVAL 1264 RETVAL
1176 1265
1266int
1267rxvt_term::pty_fd ()
1268 CODE:
1269 RETVAL = THIS->pty->pty;
1270 OUTPUT:
1271 RETVAL
1272
1177Window 1273Window
1178rxvt_term::parent () 1274rxvt_term::parent ()
1179 CODE: 1275 CODE:
1180 RETVAL = THIS->parent [0]; 1276 RETVAL = THIS->parent [0];
1181 OUTPUT: 1277 OUTPUT:
… …
1220 1316
1221void 1317void
1222rxvt_term::focus_out () 1318rxvt_term::focus_out ()
1223 1319
1224void 1320void
1321rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1322 ALIAS:
1323 key_release = 1
1324 CODE:
1325{
1326 XKeyEvent xkey;
1327
1328 memset (&xkey, 0, sizeof (xkey));
1329
1330 xkey.time = time;
1331 xkey.state = state;
1332 xkey.keycode = keycode;
1333
1334 xkey.type = ix ? KeyRelease : KeyPress;
1335 xkey.display = THIS->dpy;
1336 xkey.window = THIS->vt;
1337 xkey.root = THIS->display->root;
1338 xkey.subwindow = THIS->vt;
1339
1340 if (ix)
1341 THIS->key_release (xkey);
1342 else
1343 THIS->key_press (xkey);
1344}
1345
1346void
1225rxvt_term::want_refresh () 1347rxvt_term::want_refresh ()
1226 CODE: 1348 CODE:
1227 THIS->want_refresh = 1; 1349 THIS->want_refresh = 1;
1228 1350
1229void 1351void
… …
1235 1357
1236 line_t &l = ROW(row_number); 1358 line_t &l = ROW(row_number);
1237 1359
1238 if (GIMME_V != G_VOID) 1360 if (GIMME_V != G_VOID)
1239 { 1361 {
1240 wchar_t *wstr = new wchar_t [THIS->ncol]; 1362 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1241 1363
1242 for (int col = 0; col < THIS->ncol; col++) 1364 for (int col = 0; col < THIS->ncol; col++)
1243 wstr [col] = l.t [col]; 1365 wstr [col] = l.t [col];
1244 1366
1245 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1367 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1246
1247 delete [] wstr;
1248 } 1368 }
1249 1369
1250 if (new_text) 1370 if (new_text)
1251 { 1371 {
1252 wchar_t *wstr = sv2wcs (new_text); 1372 wchar_t *wstr = sv2wcs (new_text);
… …
1345rxvt_term::special_encode (SV *string) 1465rxvt_term::special_encode (SV *string)
1346 CODE: 1466 CODE:
1347{ 1467{
1348 wchar_t *wstr = sv2wcs (string); 1468 wchar_t *wstr = sv2wcs (string);
1349 int wlen = wcslen (wstr); 1469 int wlen = wcslen (wstr);
1350 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1470 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1351 1471
1352 rxvt_push_locale (THIS->locale); 1472 rxvt_push_locale (THIS->locale);
1353 1473
1354 wchar_t *r = rstr; 1474 wchar_t *r = rstr;
1355 for (wchar_t *s = wstr; *s; s++) 1475 for (wchar_t *s = wstr; *s; s++)
1476 {
1477 int w = WCWIDTH (*s);
1478
1356 if (wcwidth (*s) == 0) 1479 if (w == 0)
1357 { 1480 {
1358 if (r == rstr) 1481 if (r == rstr)
1359 croak ("leading combining character unencodable"); 1482 croak ("leading combining character unencodable");
1360 1483
1361 unicode_t n = rxvt_compose (r[-1], *s); 1484 unicode_t n = rxvt_compose (r[-1], *s);
1362 if (n == NOCHAR) 1485 if (n == NOCHAR)
1363 n = rxvt_composite.compose (r[-1], *s); 1486 n = rxvt_composite.compose (r[-1], *s);
1364 1487
1365 r[-1] = n; 1488 r[-1] = n;
1366 } 1489 }
1367#if !UNICODE_3 1490#if !UNICODE_3
1368 else if (*s >= 0x10000) 1491 else if (*s >= 0x10000)
1369 *r++ = rxvt_composite.compose (*s); 1492 *r++ = rxvt_composite.compose (*s);
1370#endif 1493#endif
1371 else 1494 else
1372 *r++ = *s; 1495 *r++ = *s;
1496
1497 // the *2 above only allows wcwidth <= 2
1498 if (w > 1)
1499 *r++ = NOCHAR;
1500 }
1373 1501
1374 rxvt_pop_locale (); 1502 rxvt_pop_locale ();
1375 1503
1376 RETVAL = wcs2sv (rstr, r - rstr); 1504 RETVAL = wcs2sv (rstr, r - rstr);
1377
1378 delete [] rstr;
1379} 1505}
1380 OUTPUT: 1506 OUTPUT:
1381 RETVAL 1507 RETVAL
1382 1508
1383SV * 1509SV *
… …
1395 else if (IS_COMPOSE (*s)) 1521 else if (IS_COMPOSE (*s))
1396 dlen += rxvt_composite.expand (*s, 0); 1522 dlen += rxvt_composite.expand (*s, 0);
1397 else 1523 else
1398 dlen++; 1524 dlen++;
1399 1525
1400 wchar_t *rstr = new wchar_t [dlen]; 1526 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1401 1527
1402 // decode 1528 // decode
1403 wchar_t *r = rstr; 1529 wchar_t *r = rstr;
1404 for (wchar_t *s = wstr; *s; s++) 1530 for (wchar_t *s = wstr; *s; s++)
1405 if (*s == NOCHAR) 1531 if (*s == NOCHAR)
… …
1408 r += rxvt_composite.expand (*s, r); 1534 r += rxvt_composite.expand (*s, r);
1409 else 1535 else
1410 *r++ = *s; 1536 *r++ = *s;
1411 1537
1412 RETVAL = wcs2sv (rstr, r - rstr); 1538 RETVAL = wcs2sv (rstr, r - rstr);
1413
1414 delete [] rstr;
1415} 1539}
1416 OUTPUT: 1540 OUTPUT:
1417 RETVAL 1541 RETVAL
1418 1542
1419void 1543void
1420rxvt_term::_resource (char *name, int index, SV *newval = 0) 1544rxvt_term::_resource (char *name, int index, SV *newval = 0)
1421 PPCODE: 1545 PPCODE:
1422{ 1546{
1423 struct resval { const char *name; int value; } rslist [] = { 1547 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1424# define def(name) { # name, Rs_ ## name }, 1548# define def(name) { # name, Rs_ ## name },
1425# define reserve(name,count) 1549# define reserve(name,count)
1426# include "rsinc.h" 1550# include "rsinc.h"
1427# undef def 1551# undef def
1428# undef reserve 1552# undef reserve
1429 }; 1553 };
1430 1554
1431 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1555 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1432 1556
1433 do { 1557 do {
1434 if (rs-- == rslist) 1558 if (rs-- == rslist)
1435 croak ("no such resource '%s', requested", name); 1559 croak ("no such resource '%s', requested", name);
1436 } while (strcmp (name, rs->name)); 1560 } while (strcmp (name, rs->name));
… …
1529 if (items == 3) 1653 if (items == 3)
1530 { 1654 {
1531 rc.row = SvIV (ST (1)); 1655 rc.row = SvIV (ST (1));
1532 rc.col = SvIV (ST (2)); 1656 rc.col = SvIV (ST (2));
1533 1657
1534 if (ix == 2 && rc.col == 0) 1658 if (ix == 2)
1535 { 1659 {
1660 if (rc.col == 0)
1661 {
1662 // col == 0 means end of previous line
1536 rc.row--; 1663 rc.row--;
1537 rc.col = THIS->ncol; 1664 rc.col = THIS->ncol;
1665 }
1666 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1667 && rc.col > ROW(rc.row).l)
1668 {
1669 // col >= length means while line and add newline
1670 rc.col = THIS->ncol;
1671 }
1538 } 1672 }
1539 1673
1540 clamp_it (rc.col, 0, THIS->ncol); 1674 clamp_it (rc.col, 0, THIS->ncol);
1541 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1675 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1542 1676
… …
1550 CODE: 1684 CODE:
1551 RETVAL = THIS->charsets [THIS->screen.charset]; 1685 RETVAL = THIS->charsets [THIS->screen.charset];
1552 OUTPUT: 1686 OUTPUT:
1553 RETVAL 1687 RETVAL
1554 1688
1555#void 1689void
1556#rxvt_term::selection_clear () 1690rxvt_term::selection_clear ()
1557 1691
1558void 1692void
1559rxvt_term::selection_make (Time eventtime, bool rect = false) 1693rxvt_term::selection_make (Time eventtime, bool rect = false)
1560 CODE: 1694 CODE:
1561 THIS->selection.op = SELECTION_CONT; 1695 THIS->selection.op = SELECTION_CONT;
… …
1651void 1785void
1652rxvt_term::XListProperties (Window window) 1786rxvt_term::XListProperties (Window window)
1653 PPCODE: 1787 PPCODE:
1654{ 1788{
1655 int count; 1789 int count;
1656 Atom *props = XListProperties (THIS->display->display, window, &count); 1790 Atom *props = XListProperties (THIS->dpy, window, &count);
1657 1791
1658 EXTEND (SP, count); 1792 EXTEND (SP, count);
1659 while (count--) 1793 while (count--)
1660 PUSHs (newSVuv ((U32)props [count])); 1794 PUSHs (newSVuv ((U32)props [count]));
1661 1795
… …
1670 int format; 1804 int format;
1671 unsigned long nitems; 1805 unsigned long nitems;
1672 unsigned long bytes_after; 1806 unsigned long bytes_after;
1673 unsigned char *prop; 1807 unsigned char *prop;
1674 1808
1675 XGetWindowProperty (THIS->display->display, window, property, 1809 XGetWindowProperty (THIS->dpy, window, property,
1676 0, 1<<24, 0, AnyPropertyType, 1810 0, 1<<24, 0, AnyPropertyType,
1677 &type, &format, &nitems, &bytes_after, &prop); 1811 &type, &format, &nitems, &bytes_after, &prop);
1678 1812
1679 if (type != None) 1813 if (type != None)
1680 { 1814 {
… …
1699 1833
1700 int elemsize = format == 16 ? sizeof (short) 1834 int elemsize = format == 16 ? sizeof (short)
1701 : format == 32 ? sizeof (long) 1835 : format == 32 ? sizeof (long)
1702 : 1; 1836 : 1;
1703 1837
1704 XChangeProperty (THIS->display->display, window, property, 1838 XChangeProperty (THIS->dpy, window, property,
1705 type, format, PropModeReplace, 1839 type, format, PropModeReplace,
1706 (unsigned char *)data_, len / elemsize); 1840 (unsigned char *)data_, len / elemsize);
1707 XSync (THIS->display->display, 0);
1708} 1841}
1709 1842
1710Atom 1843Atom
1711XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1844XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1712 C_ARGS: term->display->display, atom_name, only_if_exists 1845 C_ARGS: term->dpy, atom_name, only_if_exists
1713 1846
1714char * 1847char *
1715XGetAtomName (rxvt_term *term, Atom atom) 1848XGetAtomName (rxvt_term *term, Atom atom)
1716 C_ARGS: term->display->display, atom 1849 C_ARGS: term->dpy, atom
1717 CLEANUP: 1850 CLEANUP:
1718 XFree (RETVAL); 1851 XFree (RETVAL);
1719 1852
1720void 1853void
1721XDeleteProperty (rxvt_term *term, Window window, Atom property) 1854XDeleteProperty (rxvt_term *term, Window window, Atom property)
1722 C_ARGS: term->display->display, window, property 1855 C_ARGS: term->dpy, window, property
1723 1856
1724Window 1857Window
1725rxvt_term::DefaultRootWindow () 1858rxvt_term::DefaultRootWindow ()
1726 CODE: 1859 CODE:
1727 RETVAL = THIS->display->root; 1860 RETVAL = THIS->display->root;
… …
1730 1863
1731#if 0 1864#if 0
1732 1865
1733Window 1866Window
1734XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1867XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1735 C_ARGS: term->display->display, (Window)parent, 1868 C_ARGS: term->dpy, (Window)parent,
1736 x, y, width, height, 0, 1869 x, y, width, height, 0,
1737 term->pix_colors_focused[Color_border], 1870 term->pix_colors_focused[Color_border],
1738 term->pix_colors_focused[Color_border] 1871 term->pix_colors_focused[Color_border]
1739 1872
1740#endif 1873#endif
1741 1874
1742void 1875void
1743XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1876XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1744 C_ARGS: term->display->display, window, parent, x, y 1877 C_ARGS: term->dpy, window, parent, x, y
1745 1878
1746void 1879void
1747XMapWindow (rxvt_term *term, Window window) 1880XMapWindow (rxvt_term *term, Window window)
1748 C_ARGS: term->display->display, window 1881 C_ARGS: term->dpy, window
1749 1882
1750void 1883void
1751XUnmapWindow (rxvt_term *term, Window window) 1884XUnmapWindow (rxvt_term *term, Window window)
1752 C_ARGS: term->display->display, window 1885 C_ARGS: term->dpy, window
1753 1886
1754void 1887void
1755XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1888XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1756 C_ARGS: term->display->display, window, x, y, width, height 1889 C_ARGS: term->dpy, window, x, y, width, height
1757 1890
1758void 1891void
1759rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1892rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1760 CODE: 1893 CODE:
1761{ 1894{
1762 XWindowAttributes attr; 1895 XWindowAttributes attr;
1763 XGetWindowAttributes (THIS->display->display, window, &attr); 1896 XGetWindowAttributes (THIS->dpy, window, &attr);
1764 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1897 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1765} 1898}
1766 1899
1767void 1900void
1768rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1901rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1769 PPCODE: 1902 PPCODE:
1770{ 1903{
1771 int dx, dy; 1904 int dx, dy;
1772 Window child; 1905 Window child;
1773 1906
1774 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1907 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1775 { 1908 {
1776 EXTEND (SP, 3); 1909 EXTEND (SP, 3);
1777 PUSHs (newSViv (dx)); 1910 PUSHs (newSViv (dx));
1778 PUSHs (newSViv (dy)); 1911 PUSHs (newSViv (dy));
1779 PUSHs (newSVuv (child)); 1912 PUSHs (newSVuv (child));

Diff Legend

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