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.99 by root, Sat Feb 11 02:28:19 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
… …
554 break; 555 break;
555 556
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 XPUSHs (sv_2mortal (newSVpvn (str, len))); 562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 563 }
563 break; 564 break;
564 565
565 case DT_WCS_LEN: 566 case DT_WCS_LEN:
566 { 567 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 568 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 569 int wlen = va_arg (ap, int);
569 570
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 571 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
572 }
573 break;
574
575 case DT_LCS_LEN:
576 {
577 long *lstr = va_arg (ap, long *);
578 int llen = va_arg (ap, int);
579
580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 581 }
572 break; 582 break;
573 583
574 case DT_XEVENT: 584 case DT_XEVENT:
575 { 585 {
576 XEvent *xe = va_arg (ap, XEvent *); 586 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 587 HV *hv = newHV ();
578 588
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 589# 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) 590# 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) 591# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 592# undef set
583 593
584 setiv (type, xe->type); 594 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 595 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 596 setiv (serial, xe->xany.serial);
587 597
… …
716 } 726 }
717 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
718 { 728 {
719 clearSVptr ((SV *)term->perl.self); 729 clearSVptr ((SV *)term->perl.self);
720 SvREFCNT_dec ((SV *)term->perl.self); 730 SvREFCNT_dec ((SV *)term->perl.self);
731
732 // don't allow further calls
733 term->perl.self = 0;
721 } 734 }
722 735
723 swap (perl_environ, environ); 736 swap (perl_environ, environ);
724 737
725 return event_consumed; 738 return event_consumed;
… …
749# include "optinc.h" 762# include "optinc.h"
750# undef nodef 763# undef nodef
751# undef def 764# undef def
752 765
753 HV *stash = gv_stashpv ("urxvt", 1); 766 HV *stash = gv_stashpv ("urxvt", 1);
754 struct { 767 static const struct {
755 const char *name; 768 const char *name;
756 IV iv; 769 IV iv;
757 } *civ, const_iv[] = { 770 } *civ, const_iv[] = {
758# define const_iv(name) { # name, (IV)name } 771# define const_iv(name) { # name, (IV)name }
759 const_iv (DEFAULT_RSTYLE), 772 const_iv (DEFAULT_RSTYLE),
… …
842 const_iv (SelectionRequest), 855 const_iv (SelectionRequest),
843 const_iv (SelectionNotify), 856 const_iv (SelectionNotify),
844 const_iv (ColormapNotify), 857 const_iv (ColormapNotify),
845 const_iv (ClientMessage), 858 const_iv (ClientMessage),
846 const_iv (MappingNotify), 859 const_iv (MappingNotify),
860# if ENABLE_XIM_ONTHESPOT
861 const_iv (XIMReverse),
862 const_iv (XIMUnderline),
863 const_iv (XIMHighlight),
864 const_iv (XIMPrimary),
865 const_iv (XIMSecondary),
866 const_iv (XIMTertiary),
867 const_iv (XIMVisibleToForward),
868 const_iv (XIMVisibleToBackword),
869 const_iv (XIMVisibleToCenter),
870# if 0
871 const_iv (XIMForwardChar),
872 const_iv (XIMBackwardChar),
873 const_iv (XIMForwardWord),
874 const_iv (XIMBackwardWord),
875 const_iv (XIMCaretUp),
876 const_iv (XIMCaretDown),
877 const_iv (XIMNextLine),
878 const_iv (XIMPreviousLine),
879 const_iv (XIMLineStart),
880 const_iv (XIMLineEnd),
881 const_iv (XIMAbsolutePosition),
882 const_iv (XIMDontChange),
883# endif
884# endif
847 }; 885 };
848 886
849 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; )
850 civ-- > const_iv; )
851 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
852} 889}
853 890
854void 891void
855warn (const char *msg) 892warn (const char *msg)
… …
886 RETVAL 923 RETVAL
887 924
888int 925int
889SET_FGCOLOR (int rend, int new_color) 926SET_FGCOLOR (int rend, int new_color)
890 CODE: 927 CODE:
891 RETVAL = SET_FGCOLOR (rend, new_color); 928 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
892 OUTPUT: 929 OUTPUT:
893 RETVAL 930 RETVAL
894 931
895int 932int
896SET_BGCOLOR (int rend, int new_color) 933SET_BGCOLOR (int rend, int new_color)
897 CODE: 934 CODE:
898 RETVAL = SET_BGCOLOR (rend, new_color); 935 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
899 OUTPUT: 936 OUTPUT:
900 RETVAL 937 RETVAL
901 938
902int 939int
903GET_CUSTOM (int rend) 940GET_CUSTOM (int rend)
… …
917 | ((new_value << RS_customShift) & RS_customMask); 954 | ((new_value << RS_customShift) & RS_customMask);
918} 955}
919 OUTPUT: 956 OUTPUT:
920 RETVAL 957 RETVAL
921 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
922MODULE = urxvt PACKAGE = urxvt::term 970MODULE = urxvt PACKAGE = urxvt::term
923 971
924SV * 972SV *
925_new (...) 973_new (AV *env, AV *arg)
926 CODE: 974 CODE:
927{ 975{
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; 976 rxvt_term *term = new rxvt_term;
932 977
933 stringvec *argv = new stringvec; 978 stringvec *argv = new stringvec;
934 stringvec *envv = new stringvec; 979 stringvec *envv = new stringvec;
935 980
936 for (int i = 1; i < items; i++) 981 for (int i = 0; i <= AvFILL (arg); i++)
937 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 982 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
938 983
939 AV *env = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (env) + 1; i--; ) 984 for (int i = AvFILL (env) + 1; i--; )
941 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 985 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 986
943 envv->push_back (0); 987 envv->push_back (0);
944 988
… …
972rxvt_term::set_should_invoke (int htype, int inc) 1016rxvt_term::set_should_invoke (int htype, int inc)
973 CODE: 1017 CODE:
974 THIS->perl.should_invoke [htype] += inc; 1018 THIS->perl.should_invoke [htype] += inc;
975 1019
976void 1020void
977rxvt_term::grab_button (int button, U32 modifiers) 1021rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
978 CODE: 1022 CODE:
979 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1023 XGrabButton (THIS->dpy, button, modifiers, window, 1,
980 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1024 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
981 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1025 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
982 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
983bool 1046bool
984rxvt_term::grab (Time eventtime, int sync = 0) 1047rxvt_term::grab (Time eventtime, int sync = 0)
985 CODE: 1048 CODE:
986{ 1049{
987 int mode = sync ? GrabModeSync : GrabModeAsync; 1050 int mode = sync ? GrabModeSync : GrabModeAsync;
988 1051
989 THIS->perl.grabtime = 0; 1052 THIS->perl.grabtime = 0;
990 1053
991 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1054 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
992 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1055 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
993 mode, mode, None, GRAB_CURSOR, eventtime)) 1056 mode, mode, None, GRAB_CURSOR, eventtime))
994 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1057 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
995 THIS->perl.grabtime = eventtime; 1058 THIS->perl.grabtime = eventtime;
996 else 1059 else
997 XUngrabPointer (THIS->display->display, eventtime); 1060 XUngrabPointer (THIS->dpy, eventtime);
998 1061
999 RETVAL = !!THIS->perl.grabtime; 1062 RETVAL = !!THIS->perl.grabtime;
1000} 1063}
1001 OUTPUT: 1064 OUTPUT:
1002 RETVAL 1065 RETVAL
1003 1066
1004void 1067void
1005rxvt_term::allow_events_async () 1068rxvt_term::allow_events_async ()
1006 CODE: 1069 CODE:
1007 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1070 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1008 1071
1009void 1072void
1010rxvt_term::allow_events_sync () 1073rxvt_term::allow_events_sync ()
1011 CODE: 1074 CODE:
1012 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1075 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1013 1076
1014void 1077void
1015rxvt_term::allow_events_replay () 1078rxvt_term::allow_events_replay ()
1016 CODE: 1079 CODE:
1017 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1080 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1018 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1081 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1019 1082
1020void 1083void
1021rxvt_term::ungrab () 1084rxvt_term::ungrab ()
1022 CODE: 1085 CODE:
1023 ungrab (THIS); 1086 ungrab (THIS);
… …
1229 1292
1230void 1293void
1231rxvt_term::focus_out () 1294rxvt_term::focus_out ()
1232 1295
1233void 1296void
1297rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1298 ALIAS:
1299 key_release = 1
1300 CODE:
1301{
1302 XKeyEvent xkey;
1303
1304 memset (&xkey, 0, sizeof (xkey));
1305
1306 xkey.time = time;
1307 xkey.state = state;
1308 xkey.keycode = keycode;
1309
1310 xkey.type = ix ? KeyRelease : KeyPress;
1311 xkey.display = THIS->dpy;
1312 xkey.window = THIS->vt;
1313 xkey.root = THIS->display->root;
1314 xkey.subwindow = THIS->vt;
1315
1316 if (ix)
1317 THIS->key_release (xkey);
1318 else
1319 THIS->key_press (xkey);
1320}
1321
1322void
1234rxvt_term::want_refresh () 1323rxvt_term::want_refresh ()
1235 CODE: 1324 CODE:
1236 THIS->want_refresh = 1; 1325 THIS->want_refresh = 1;
1237 1326
1238void 1327void
… …
1244 1333
1245 line_t &l = ROW(row_number); 1334 line_t &l = ROW(row_number);
1246 1335
1247 if (GIMME_V != G_VOID) 1336 if (GIMME_V != G_VOID)
1248 { 1337 {
1249 wchar_t *wstr = new wchar_t [THIS->ncol]; 1338 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1250 1339
1251 for (int col = 0; col < THIS->ncol; col++) 1340 for (int col = 0; col < THIS->ncol; col++)
1252 wstr [col] = l.t [col]; 1341 wstr [col] = l.t [col];
1253 1342
1254 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1343 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1255
1256 delete [] wstr;
1257 } 1344 }
1258 1345
1259 if (new_text) 1346 if (new_text)
1260 { 1347 {
1261 wchar_t *wstr = sv2wcs (new_text); 1348 wchar_t *wstr = sv2wcs (new_text);
… …
1354rxvt_term::special_encode (SV *string) 1441rxvt_term::special_encode (SV *string)
1355 CODE: 1442 CODE:
1356{ 1443{
1357 wchar_t *wstr = sv2wcs (string); 1444 wchar_t *wstr = sv2wcs (string);
1358 int wlen = wcslen (wstr); 1445 int wlen = wcslen (wstr);
1359 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1446 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1360 1447
1361 rxvt_push_locale (THIS->locale); 1448 rxvt_push_locale (THIS->locale);
1362 1449
1363 wchar_t *r = rstr; 1450 wchar_t *r = rstr;
1364 for (wchar_t *s = wstr; *s; s++) 1451 for (wchar_t *s = wstr; *s; s++)
1452 {
1453 int w = WCWIDTH (*s);
1454
1365 if (wcwidth (*s) == 0) 1455 if (w == 0)
1366 { 1456 {
1367 if (r == rstr) 1457 if (r == rstr)
1368 croak ("leading combining character unencodable"); 1458 croak ("leading combining character unencodable");
1369 1459
1370 unicode_t n = rxvt_compose (r[-1], *s); 1460 unicode_t n = rxvt_compose (r[-1], *s);
1371 if (n == NOCHAR) 1461 if (n == NOCHAR)
1372 n = rxvt_composite.compose (r[-1], *s); 1462 n = rxvt_composite.compose (r[-1], *s);
1373 1463
1374 r[-1] = n; 1464 r[-1] = n;
1375 } 1465 }
1376#if !UNICODE_3 1466#if !UNICODE_3
1377 else if (*s >= 0x10000) 1467 else if (*s >= 0x10000)
1378 *r++ = rxvt_composite.compose (*s); 1468 *r++ = rxvt_composite.compose (*s);
1379#endif 1469#endif
1380 else 1470 else
1381 *r++ = *s; 1471 *r++ = *s;
1472
1473 // the *2 above only allows wcwidth <= 2
1474 if (w > 1)
1475 *r++ = NOCHAR;
1476 }
1382 1477
1383 rxvt_pop_locale (); 1478 rxvt_pop_locale ();
1384 1479
1385 RETVAL = wcs2sv (rstr, r - rstr); 1480 RETVAL = wcs2sv (rstr, r - rstr);
1386
1387 delete [] rstr;
1388} 1481}
1389 OUTPUT: 1482 OUTPUT:
1390 RETVAL 1483 RETVAL
1391 1484
1392SV * 1485SV *
… …
1404 else if (IS_COMPOSE (*s)) 1497 else if (IS_COMPOSE (*s))
1405 dlen += rxvt_composite.expand (*s, 0); 1498 dlen += rxvt_composite.expand (*s, 0);
1406 else 1499 else
1407 dlen++; 1500 dlen++;
1408 1501
1409 wchar_t *rstr = new wchar_t [dlen]; 1502 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1410 1503
1411 // decode 1504 // decode
1412 wchar_t *r = rstr; 1505 wchar_t *r = rstr;
1413 for (wchar_t *s = wstr; *s; s++) 1506 for (wchar_t *s = wstr; *s; s++)
1414 if (*s == NOCHAR) 1507 if (*s == NOCHAR)
… …
1417 r += rxvt_composite.expand (*s, r); 1510 r += rxvt_composite.expand (*s, r);
1418 else 1511 else
1419 *r++ = *s; 1512 *r++ = *s;
1420 1513
1421 RETVAL = wcs2sv (rstr, r - rstr); 1514 RETVAL = wcs2sv (rstr, r - rstr);
1422
1423 delete [] rstr;
1424} 1515}
1425 OUTPUT: 1516 OUTPUT:
1426 RETVAL 1517 RETVAL
1427 1518
1428void 1519void
1429rxvt_term::_resource (char *name, int index, SV *newval = 0) 1520rxvt_term::_resource (char *name, int index, SV *newval = 0)
1430 PPCODE: 1521 PPCODE:
1431{ 1522{
1432 struct resval { const char *name; int value; } rslist [] = { 1523 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1433# define def(name) { # name, Rs_ ## name }, 1524# define def(name) { # name, Rs_ ## name },
1434# define reserve(name,count) 1525# define reserve(name,count)
1435# include "rsinc.h" 1526# include "rsinc.h"
1436# undef def 1527# undef def
1437# undef reserve 1528# undef reserve
1438 }; 1529 };
1439 1530
1440 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1531 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1441 1532
1442 do { 1533 do {
1443 if (rs-- == rslist) 1534 if (rs-- == rslist)
1444 croak ("no such resource '%s', requested", name); 1535 croak ("no such resource '%s', requested", name);
1445 } while (strcmp (name, rs->name)); 1536 } while (strcmp (name, rs->name));
… …
1569 CODE: 1660 CODE:
1570 RETVAL = THIS->charsets [THIS->screen.charset]; 1661 RETVAL = THIS->charsets [THIS->screen.charset];
1571 OUTPUT: 1662 OUTPUT:
1572 RETVAL 1663 RETVAL
1573 1664
1574#void 1665void
1575#rxvt_term::selection_clear () 1666rxvt_term::selection_clear ()
1576 1667
1577void 1668void
1578rxvt_term::selection_make (Time eventtime, bool rect = false) 1669rxvt_term::selection_make (Time eventtime, bool rect = false)
1579 CODE: 1670 CODE:
1580 THIS->selection.op = SELECTION_CONT; 1671 THIS->selection.op = SELECTION_CONT;
… …
1670void 1761void
1671rxvt_term::XListProperties (Window window) 1762rxvt_term::XListProperties (Window window)
1672 PPCODE: 1763 PPCODE:
1673{ 1764{
1674 int count; 1765 int count;
1675 Atom *props = XListProperties (THIS->display->display, window, &count); 1766 Atom *props = XListProperties (THIS->dpy, window, &count);
1676 1767
1677 EXTEND (SP, count); 1768 EXTEND (SP, count);
1678 while (count--) 1769 while (count--)
1679 PUSHs (newSVuv ((U32)props [count])); 1770 PUSHs (newSVuv ((U32)props [count]));
1680 1771
… …
1689 int format; 1780 int format;
1690 unsigned long nitems; 1781 unsigned long nitems;
1691 unsigned long bytes_after; 1782 unsigned long bytes_after;
1692 unsigned char *prop; 1783 unsigned char *prop;
1693 1784
1694 XGetWindowProperty (THIS->display->display, window, property, 1785 XGetWindowProperty (THIS->dpy, window, property,
1695 0, 1<<24, 0, AnyPropertyType, 1786 0, 1<<24, 0, AnyPropertyType,
1696 &type, &format, &nitems, &bytes_after, &prop); 1787 &type, &format, &nitems, &bytes_after, &prop);
1697 1788
1698 if (type != None) 1789 if (type != None)
1699 { 1790 {
… …
1718 1809
1719 int elemsize = format == 16 ? sizeof (short) 1810 int elemsize = format == 16 ? sizeof (short)
1720 : format == 32 ? sizeof (long) 1811 : format == 32 ? sizeof (long)
1721 : 1; 1812 : 1;
1722 1813
1723 XChangeProperty (THIS->display->display, window, property, 1814 XChangeProperty (THIS->dpy, window, property,
1724 type, format, PropModeReplace, 1815 type, format, PropModeReplace,
1725 (unsigned char *)data_, len / elemsize); 1816 (unsigned char *)data_, len / elemsize);
1726 XSync (THIS->display->display, 0);
1727} 1817}
1728 1818
1729Atom 1819Atom
1730XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1820XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1731 C_ARGS: term->display->display, atom_name, only_if_exists 1821 C_ARGS: term->dpy, atom_name, only_if_exists
1732 1822
1733char * 1823char *
1734XGetAtomName (rxvt_term *term, Atom atom) 1824XGetAtomName (rxvt_term *term, Atom atom)
1735 C_ARGS: term->display->display, atom 1825 C_ARGS: term->dpy, atom
1736 CLEANUP: 1826 CLEANUP:
1737 XFree (RETVAL); 1827 XFree (RETVAL);
1738 1828
1739void 1829void
1740XDeleteProperty (rxvt_term *term, Window window, Atom property) 1830XDeleteProperty (rxvt_term *term, Window window, Atom property)
1741 C_ARGS: term->display->display, window, property 1831 C_ARGS: term->dpy, window, property
1742 1832
1743Window 1833Window
1744rxvt_term::DefaultRootWindow () 1834rxvt_term::DefaultRootWindow ()
1745 CODE: 1835 CODE:
1746 RETVAL = THIS->display->root; 1836 RETVAL = THIS->display->root;
… …
1749 1839
1750#if 0 1840#if 0
1751 1841
1752Window 1842Window
1753XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1843XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1754 C_ARGS: term->display->display, (Window)parent, 1844 C_ARGS: term->dpy, (Window)parent,
1755 x, y, width, height, 0, 1845 x, y, width, height, 0,
1756 term->pix_colors_focused[Color_border], 1846 term->pix_colors_focused[Color_border],
1757 term->pix_colors_focused[Color_border] 1847 term->pix_colors_focused[Color_border]
1758 1848
1759#endif 1849#endif
1760 1850
1761void 1851void
1762XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1852XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1763 C_ARGS: term->display->display, window, parent, x, y 1853 C_ARGS: term->dpy, window, parent, x, y
1764 1854
1765void 1855void
1766XMapWindow (rxvt_term *term, Window window) 1856XMapWindow (rxvt_term *term, Window window)
1767 C_ARGS: term->display->display, window 1857 C_ARGS: term->dpy, window
1768 1858
1769void 1859void
1770XUnmapWindow (rxvt_term *term, Window window) 1860XUnmapWindow (rxvt_term *term, Window window)
1771 C_ARGS: term->display->display, window 1861 C_ARGS: term->dpy, window
1772 1862
1773void 1863void
1774XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1864XMoveResizeWindow (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 1865 C_ARGS: term->dpy, window, x, y, width, height
1776 1866
1777void 1867void
1778rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1868rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1779 CODE: 1869 CODE:
1780{ 1870{
1781 XWindowAttributes attr; 1871 XWindowAttributes attr;
1782 XGetWindowAttributes (THIS->display->display, window, &attr); 1872 XGetWindowAttributes (THIS->dpy, window, &attr);
1783 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1873 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1784} 1874}
1785 1875
1786void 1876void
1787rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1877rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1788 PPCODE: 1878 PPCODE:
1789{ 1879{
1790 int dx, dy; 1880 int dx, dy;
1791 Window child; 1881 Window child;
1792 1882
1793 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1883 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1794 { 1884 {
1795 EXTEND (SP, 3); 1885 EXTEND (SP, 3);
1796 PUSHs (newSViv (dx)); 1886 PUSHs (newSViv (dx));
1797 PUSHs (newSViv (dy)); 1887 PUSHs (newSViv (dy));
1798 PUSHs (newSVuv (child)); 1888 PUSHs (newSVuv (child));

Diff Legend

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