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.101 by root, Wed Jul 5 23:34:14 2006 UTC vs.
Revision 1.124 by root, Thu Jul 31 03:24:08 2008 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h" 34#include "unistd.h"
35 35
36#include "iom.h" 36#include "ev_cpp.h"
37#include "rxvt.h" 37#include "rxvt.h"
38#include "keyboard.h" 38#include "keyboard.h"
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 44#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 45
50#undef LINENO 46#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 47#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 48#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 49#define ROW(n) THIS->row_buf [LINENO (n)]
54 50
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 51/////////////////////////////////////////////////////////////////////////////
58 52
59static wchar_t * 53static wchar_t *
60sv2wcs (SV *sv) 54sv2wcs (SV *sv)
61{ 55{
… …
75 69
76 return sv; 70 return sv;
77} 71}
78 72
79static SV * 73static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85static SV *
86newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
87{ 75{
88 HV *hv = newHV (); 76 HV *hv = newHV ();
89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 77 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
90 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 78 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
114 return (long)mg->mg_ptr; 102 return (long)mg->mg_ptr;
115} 103}
116 104
117#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self) 105#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
118#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term") 106#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
119
120/////////////////////////////////////////////////////////////////////////////
121
122#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
123
124struct perl_watcher
125{
126 SV *cbsv;
127 HV *self;
128
129 perl_watcher ()
130 : cbsv (0)
131 {
132 }
133
134 ~perl_watcher ()
135 {
136 SvREFCNT_dec (cbsv);
137 }
138
139 void cb (SV *cb)
140 {
141 SvREFCNT_dec (cbsv);
142 cbsv = newSVsv (cb);
143 }
144
145 void invoke (const char *type, SV *self, int arg = -1);
146};
147
148void
149perl_watcher::invoke (const char *type, SV *self, int arg)
150{
151 dSP;
152
153 ENTER;
154 SAVETMPS;
155
156 PUSHMARK (SP);
157
158 XPUSHs (sv_2mortal (self));
159
160 if (arg >= 0)
161 XPUSHs (sv_2mortal (newSViv (arg)));
162
163 PUTBACK;
164 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
165 SPAGAIN;
166
167 PUTBACK;
168 FREETMPS;
169 LEAVE;
170
171 if (SvTRUE (ERRSV))
172 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
173}
174
175#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
176#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR ((sv), "urxvt::timer")
177
178struct timer : perl_watcher, time_watcher
179{
180 tstamp interval;
181
182 timer ()
183 : time_watcher (this, &timer::execute)
184 {
185 }
186
187 void execute (time_watcher &w)
188 {
189 if (interval)
190 start (at + interval);
191
192 invoke ("urxvt::timer", newSVtimer (this));
193 }
194};
195
196#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
197#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR ((sv), "urxvt::iow")
198
199struct iow : perl_watcher, io_watcher
200{
201 iow ()
202 : io_watcher (this, &iow::execute)
203 {
204 }
205
206 void execute (io_watcher &w, short revents)
207 {
208 invoke ("urxvt::iow", newSViow (this), revents);
209 }
210};
211
212#define newSViw(iw) new_ref ((iw)->self, "urxvt::iw")
213#define SvIW(sv) (iw *)(perl_watcher *)SvPTR ((sv), "urxvt::iw")
214
215struct iw : perl_watcher, idle_watcher
216{
217 iw ()
218 : idle_watcher (this, &iw::execute)
219 {
220 }
221
222 void execute (idle_watcher &w)
223 {
224 invoke ("urxvt::iw", newSViw (this));
225 }
226};
227
228#define newSVpw(pw) new_ref ((pw)->self, "urxvt::pw")
229#define SvPW(sv) (pw *)(perl_watcher *)SvPTR ((sv), "urxvt::pw")
230
231struct pw : perl_watcher, child_watcher
232{
233 pw ()
234 : child_watcher (this, &pw::execute)
235 {
236 }
237
238 void execute (child_watcher &w, int status)
239 {
240 invoke ("urxvt::pw", newSVpw (this), status);
241 }
242};
243 107
244///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
245 109
246#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
247 111
… …
268}; 132};
269 133
270overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 134overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
271: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 135: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
272{ 136{
137 if (w < 0) w = 0;
138 if (h < 0) h = 0;
139
273 if (border == 2) 140 if (border == 2)
274 { 141 {
275 w += 2; 142 w += 2;
276 h += 2; 143 h += 2;
277 } 144 }
… …
343 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 210 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
344 )); 211 ));
345 av_push (overlay_av, newSViv ((long)this)); 212 av_push (overlay_av, newSViv ((long)this));
346 213
347 THIS->want_refresh = 1; 214 THIS->want_refresh = 1;
215 THIS->refresh_check ();
348} 216}
349 217
350void 218void
351overlay::hide () 219overlay::hide ()
352{ 220{
… …
366 234
367 SvREFCNT_dec (overlay_av); 235 SvREFCNT_dec (overlay_av);
368 overlay_av = 0; 236 overlay_av = 0;
369 237
370 THIS->want_refresh = 1; 238 THIS->want_refresh = 1;
239 THIS->refresh_check ();
371} 240}
372 241
373void overlay::swap () 242void overlay::swap ()
374{ 243{
375 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 244 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
420 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 289 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
421 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 290 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
422 } 291 }
423 292
424 THIS->want_refresh = 1; 293 THIS->want_refresh = 1;
294 THIS->refresh_check ();
425} 295}
426 296
297/////////////////////////////////////////////////////////////////////////////
298
299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
301#include "iom_perl.h"
427 302
428///////////////////////////////////////////////////////////////////////////// 303/////////////////////////////////////////////////////////////////////////////
429 304
430struct rxvt_perl_interp rxvt_perl; 305struct rxvt_perl_interp rxvt_perl;
431 306
… …
506 381
507 // pre-handling of some events 382 // pre-handling of some events
508 if (htype == HOOK_REFRESH_END) 383 if (htype == HOOK_REFRESH_END)
509 { 384 {
510 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 385 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
511 386
512 for (int i = 0; i <= AvFILL (av); i++) 387 for (int i = 0; i <= AvFILL (av); i++)
513 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 388 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
514 } 389 }
515 390
516 swap (perl_environ, environ); 391 swap (perl_environ, environ);
… …
715 590
716 // post-handling of some events 591 // post-handling of some events
717 if (htype == HOOK_REFRESH_BEGIN) 592 if (htype == HOOK_REFRESH_BEGIN)
718 { 593 {
719 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 594 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
720 595
721 for (int i = AvFILL (av); i >= 0; i--) 596 for (int i = AvFILL (av); i >= 0; i--)
722 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 597 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
723 } 598 }
724 else if (htype == HOOK_DESTROY) 599 else if (htype == HOOK_DESTROY)
725 { 600 {
726 clearSVptr ((SV *)term->perl.self); 601 clearSVptr ((SV *)term->perl.self);
727 SvREFCNT_dec ((SV *)term->perl.self); 602 SvREFCNT_dec ((SV *)term->perl.self);
728 603
729 // don't allow further calls 604 // don't allow further calls
730 term->perl.self = 0; 605 term->perl.self = 0;
731 } 606 }
732 607
733 swap (perl_environ, environ); 608 swap (perl_environ, environ);
… …
764 static const struct { 639 static const struct {
765 const char *name; 640 const char *name;
766 IV iv; 641 IV iv;
767 } *civ, const_iv[] = { 642 } *civ, const_iv[] = {
768# define const_iv(name) { # name, (IV)name } 643# define const_iv(name) { # name, (IV)name }
644 const_iv (NUM_RESOURCES),
769 const_iv (DEFAULT_RSTYLE), 645 const_iv (DEFAULT_RSTYLE),
770 const_iv (OVERLAY_RSTYLE), 646 const_iv (OVERLAY_RSTYLE),
771 const_iv (RS_Bold), 647 const_iv (RS_Bold),
772 const_iv (RS_Italic), 648 const_iv (RS_Italic),
773 const_iv (RS_Blink), 649 const_iv (RS_Blink),
… …
788 const_iv (Button3Mask), 664 const_iv (Button3Mask),
789 const_iv (Button4Mask), 665 const_iv (Button4Mask),
790 const_iv (Button5Mask), 666 const_iv (Button5Mask),
791 const_iv (AnyModifier), 667 const_iv (AnyModifier),
792 668
793 const_iv (EVENT_NONE), 669 const_iv (NoSymbol),
794 const_iv (EVENT_READ), 670 const_iv (GrabModeSync),
795 const_iv (EVENT_WRITE), 671 const_iv (GrabModeAsync),
796 672
797 const_iv (NoEventMask), 673 const_iv (NoEventMask),
798 const_iv (KeyPressMask), 674 const_iv (KeyPressMask),
799 const_iv (KeyReleaseMask), 675 const_iv (KeyReleaseMask),
800 const_iv (ButtonPressMask), 676 const_iv (ButtonPressMask),
… …
899_exit (int status) 775_exit (int status)
900 776
901NV 777NV
902NOW () 778NOW ()
903 CODE: 779 CODE:
904 RETVAL = NOW; 780 RETVAL = ev::now ();
905 OUTPUT: 781 OUTPUT:
906 RETVAL 782 RETVAL
907 783
908int 784int
909GET_BASEFG (int rend) 785GET_BASEFG (int rend)
… …
934 RETVAL 810 RETVAL
935 811
936int 812int
937GET_CUSTOM (int rend) 813GET_CUSTOM (int rend)
938 CODE: 814 CODE:
939 RETVAL = (rend && RS_customMask) >> RS_customShift; 815 RETVAL = (rend & RS_customMask) >> RS_customShift;
940 OUTPUT: 816 OUTPUT:
941 RETVAL 817 RETVAL
942 818
943int 819int
944SET_CUSTOM (int rend, int new_value) 820SET_CUSTOM (int rend, int new_value)
… …
981 for (int i = AvFILL (env) + 1; i--; ) 857 for (int i = AvFILL (env) + 1; i--; )
982 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
983 859
984 envv->push_back (0); 860 envv->push_back (0);
985 861
986 bool success;
987
988 try 862 try
989 { 863 {
990 success = term->init (argv, envv); 864 term->init (argv, envv);
991 } 865 }
992 catch (const class rxvt_failure_exception &e) 866 catch (const class rxvt_failure_exception &e)
993 {
994 success = false;
995 }
996
997 if (!success)
998 { 867 {
999 term->destroy (); 868 term->destroy ();
1000 croak ("error while initializing new terminal instance"); 869 croak ("error while initializing new terminal instance");
1001 } 870 }
1002 871
… …
1012void 881void
1013rxvt_term::set_should_invoke (int htype, int inc) 882rxvt_term::set_should_invoke (int htype, int inc)
1014 CODE: 883 CODE:
1015 THIS->perl.should_invoke [htype] += inc; 884 THIS->perl.should_invoke [htype] += inc;
1016 885
1017void 886int
1018rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 887rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1019 CODE: 888 CODE:
1020 XGrabButton (THIS->dpy, button, modifiers, window, 1, 889 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1021 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 890 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1022 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 891 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
892 OUTPUT: RETVAL
1023 893
1024void 894int
1025rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt) 895rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1026 CODE: 896 CODE:
1027 XUngrabButton (THIS->dpy, button, modifiers, window); 897 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
898 OUTPUT: RETVAL
1028 899
1029#if 0
1030
1031void 900void
1032XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 901rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1033 C_ARGS: 902 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1034 THIS->dpy, keycode, modifiers, window, 1, 903 CODE:
1035 GrabModeSync, GrabModeSync 904 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1036 905
1037void 906void
1038XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 907rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
908 CODE:
1039 C_ARGS: THIS->dpy, keycode, modifiers, window 909 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1040 910
1041#endif 911void
912rxvt_term::XUngrabKeyboard (Time eventtime)
913 CODE:
914 XUngrabKeyboard (THIS->dpy, eventtime);
1042 915
1043bool 916bool
1044rxvt_term::grab (Time eventtime, int sync = 0) 917rxvt_term::grab (Time eventtime, int sync = 0)
1045 CODE: 918 CODE:
1046{ 919{
… …
1081rxvt_term::ungrab () 954rxvt_term::ungrab ()
1082 CODE: 955 CODE:
1083 ungrab (THIS); 956 ungrab (THIS);
1084 957
1085int 958int
959rxvt_term::XStringToKeysym (char *string)
960 CODE:
961 RETVAL = XStringToKeysym (string);
962 OUTPUT: RETVAL
963
964char *
965rxvt_term::XKeysymToString (int sym)
966 CODE:
967 RETVAL = XKeysymToString (sym);
968 OUTPUT: RETVAL
969
970int
971rxvt_term::XKeysymToKeycode (int sym)
972 CODE:
973 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
974 OUTPUT: RETVAL
975
976int
977rxvt_term::XKeycodeToKeysym (int code, int index)
978 CODE:
979 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
980 OUTPUT: RETVAL
981
982int
1086rxvt_term::strwidth (SV *str) 983rxvt_term::strwidth (SV *str)
1087 CODE: 984 CODE:
1088{ 985{
1089 wchar_t *wstr = sv2wcs (str); 986 wchar_t *wstr = sv2wcs (str);
1090 987
1091 rxvt_push_locale (THIS->locale); 988 rxvt_push_locale (THIS->locale);
1092 RETVAL = wcswidth (wstr, wcslen (wstr)); 989 RETVAL = 0;
990 for (wchar_t *wc = wstr; *wc; wc++)
991 {
992 int w = WCWIDTH (*wc);
993
994 if (w)
995 RETVAL += max (w, 1);
996 }
1093 rxvt_pop_locale (); 997 rxvt_pop_locale ();
1094 998
1095 free (wstr); 999 free (wstr);
1096} 1000}
1097 OUTPUT: 1001 OUTPUT:
… …
1127 rxvt_pop_locale (); 1031 rxvt_pop_locale ();
1128 1032
1129 RETVAL = wcs2sv (wstr); 1033 RETVAL = wcs2sv (wstr);
1130 free (wstr); 1034 free (wstr);
1131} 1035}
1036 OUTPUT:
1037 RETVAL
1038
1039char *
1040rxvt_term::locale ()
1041 CODE:
1042 RETVAL = THIS->locale;
1132 OUTPUT: 1043 OUTPUT:
1133 RETVAL 1044 RETVAL
1134 1045
1135#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1046#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1136 1047
… …
1186 { 1097 {
1187 case 0: RETVAL = THIS->ModLevel3Mask; break; 1098 case 0: RETVAL = THIS->ModLevel3Mask; break;
1188 case 1: RETVAL = THIS->ModMetaMask; break; 1099 case 1: RETVAL = THIS->ModMetaMask; break;
1189 case 2: RETVAL = THIS->ModNumLockMask; break; 1100 case 2: RETVAL = THIS->ModNumLockMask; break;
1190 case 3: RETVAL = THIS->current_screen; break; 1101 case 3: RETVAL = THIS->current_screen; break;
1102#ifdef CURSOR_BLINK
1191 case 4: RETVAL = THIS->hidden_cursor; break; 1103 case 4: RETVAL = THIS->hidden_cursor; break;
1104#endif
1192 } 1105 }
1193 OUTPUT: 1106 OUTPUT:
1194 RETVAL 1107 RETVAL
1195 1108
1196char * 1109char *
… …
1221 if (*i) 1134 if (*i)
1222 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1135 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1223} 1136}
1224 1137
1225int 1138int
1226rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1139rxvt_term::pty_ev_events (int events = ev::UNDEF)
1227 CODE: 1140 CODE:
1228 RETVAL = THIS->pty_ev.events; 1141 RETVAL = THIS->pty_ev.events;
1229 if (events != EVENT_UNDEF) 1142 if (events != ev::UNDEF)
1230 THIS->pty_ev.set (events); 1143 THIS->pty_ev.set (events);
1231 OUTPUT: 1144 OUTPUT:
1232 RETVAL 1145 RETVAL
1233 1146
1234int 1147int
… …
1313 1226
1314void 1227void
1315rxvt_term::want_refresh () 1228rxvt_term::want_refresh ()
1316 CODE: 1229 CODE:
1317 THIS->want_refresh = 1; 1230 THIS->want_refresh = 1;
1231 THIS->refresh_check ();
1318 1232
1319void 1233void
1320rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1234rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1321 PPCODE: 1235 PPCODE:
1322{ 1236{
… …
1477SV * 1391SV *
1478rxvt_term::special_decode (SV *text) 1392rxvt_term::special_decode (SV *text)
1479 CODE: 1393 CODE:
1480{ 1394{
1481 wchar_t *wstr = sv2wcs (text); 1395 wchar_t *wstr = sv2wcs (text);
1482 int wlen = wcslen (wstr);
1483 int dlen = 0; 1396 int dlen = 0;
1484 1397
1485 // find length 1398 // find length
1486 for (wchar_t *s = wstr; *s; s++) 1399 for (wchar_t *s = wstr; *s; s++)
1487 if (*s == NOCHAR) 1400 if (*s == NOCHAR)
… …
1520# undef reserve 1433# undef reserve
1521 }; 1434 };
1522 1435
1523 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1436 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1524 1437
1438 if (*name)
1525 do { 1439 {
1440 do {
1526 if (rs-- == rslist) 1441 if (rs-- == rslist)
1527 croak ("no such resource '%s', requested", name); 1442 croak ("no such resource '%s', requested", name);
1528 } while (strcmp (name, rs->name)); 1443 } while (strcmp (name, rs->name));
1529 1444
1530 index += rs->value; 1445 index += rs->value;
1446 }
1447 else
1448 {
1449 --rs;
1450 name = "";
1451 }
1531 1452
1532 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1453 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1533 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1454 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1534 1455
1535 if (GIMME_V != G_VOID) 1456 if (GIMME_V != G_VOID)
… …
1550 1471
1551const char * 1472const char *
1552rxvt_term::x_resource (const char *name) 1473rxvt_term::x_resource (const char *name)
1553 1474
1554bool 1475bool
1555rxvt_term::option (U32 optval, int set = -1) 1476rxvt_term::option (U8 optval, int set = -1)
1556 CODE: 1477 CODE:
1557{ 1478{
1558 RETVAL = THIS->options & optval; 1479 RETVAL = THIS->option (optval);
1559 1480
1560 if (set >= 0) 1481 if (set >= 0)
1561 { 1482 {
1562 if (set)
1563 THIS->options |= optval; 1483 THIS->set_option (optval, set);
1564 else
1565 THIS->options &= ~optval;
1566 1484
1567 if (THIS->check_ev.is_active ()) // avoid doing this before START 1485 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1568 switch (optval) 1486 switch (optval)
1569 { 1487 {
1570 case Opt_skipBuiltinGlyphs: 1488 case Opt_skipBuiltinGlyphs:
1571 THIS->set_fonts (); 1489 THIS->set_fonts ();
1572 THIS->scr_remap_chars (); 1490 THIS->scr_remap_chars ();
1573 THIS->scr_touch (true); 1491 THIS->scr_touch (true);
1574 THIS->want_refresh = 1; 1492 THIS->want_refresh = 1;
1493 THIS->refresh_check ();
1575 break; 1494 break;
1576 1495
1577 case Opt_cursorUnderline: 1496 case Opt_cursorUnderline:
1578 THIS->want_refresh = 1; 1497 THIS->want_refresh = 1;
1498 THIS->refresh_check ();
1579 break; 1499 break;
1580 1500
1581# case Opt_scrollBar_floating: 1501# case Opt_scrollBar_floating:
1582# case Opt_scrollBar_right: 1502# case Opt_scrollBar_right:
1583# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1503# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1641 1561
1642 clamp_it (rc.col, 0, THIS->ncol); 1562 clamp_it (rc.col, 0, THIS->ncol);
1643 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1563 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1644 1564
1645 if (ix) 1565 if (ix)
1566 {
1646 THIS->want_refresh = 1; 1567 THIS->want_refresh = 1;
1568 THIS->refresh_check ();
1569 }
1647 } 1570 }
1648} 1571}
1649 1572
1650char 1573char
1651rxvt_term::cur_charset () 1574rxvt_term::cur_charset ()
… …
1758 Atom *props = XListProperties (THIS->dpy, window, &count); 1681 Atom *props = XListProperties (THIS->dpy, window, &count);
1759 1682
1760 EXTEND (SP, count); 1683 EXTEND (SP, count);
1761 while (count--) 1684 while (count--)
1762 PUSHs (newSVuv ((U32)props [count])); 1685 PUSHs (newSVuv ((U32)props [count]));
1763 1686
1764 XFree (props); 1687 XFree (props);
1765} 1688}
1766 1689
1767void 1690void
1768rxvt_term::XGetWindowProperty (Window window, Atom property) 1691rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1791 XFree (prop); 1714 XFree (prop);
1792 } 1715 }
1793} 1716}
1794 1717
1795void 1718void
1796rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1719rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1797 CODE: 1720 CODE:
1798{ 1721{
1799 STRLEN len; 1722 STRLEN len;
1800 char *data_ = SvPVbyte (data, len); 1723 char *data_ = SvPVbyte (data, len);
1801 1724
… …
1897overlay::hide () 1820overlay::hide ()
1898 1821
1899void 1822void
1900overlay::DESTROY () 1823overlay::DESTROY ()
1901 1824
1902############################################################################# 1825INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1903# urxvt::watcher
1904#############################################################################
1905 1826
1906MODULE = urxvt PACKAGE = urxvt::watcher
1907
1908CHAINED
1909perl_watcher::cb (SV *cb)
1910 CODE:
1911 THIS->cb (cb);
1912 OUTPUT:
1913 RETVAL
1914
1915#############################################################################
1916# urxvt::timer
1917#############################################################################
1918
1919MODULE = urxvt PACKAGE = urxvt::timer
1920
1921SV *
1922timer::new ()
1923 CODE:
1924 timer *w = new timer;
1925 w->start (NOW);
1926 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1927 w->self = (HV *)SvRV (RETVAL);
1928 OUTPUT:
1929 RETVAL
1930
1931NV
1932timer::at ()
1933 CODE:
1934 RETVAL = THIS->at;
1935 OUTPUT:
1936 RETVAL
1937
1938CHAINED
1939timer::interval (NV interval)
1940 CODE:
1941 THIS->interval = interval;
1942 OUTPUT:
1943 RETVAL
1944
1945CHAINED
1946timer::set (NV tstamp)
1947 CODE:
1948 THIS->set (tstamp);
1949 OUTPUT:
1950 RETVAL
1951
1952CHAINED
1953timer::start (NV tstamp = THIS->at)
1954 CODE:
1955 THIS->start (tstamp);
1956 OUTPUT:
1957 RETVAL
1958
1959CHAINED
1960timer::after (NV delay)
1961 CODE:
1962 THIS->start (NOW + delay);
1963 OUTPUT:
1964 RETVAL
1965
1966CHAINED
1967timer::stop ()
1968 CODE:
1969 THIS->stop ();
1970 OUTPUT:
1971 RETVAL
1972
1973void
1974timer::DESTROY ()
1975
1976#############################################################################
1977# urxvt::iow
1978#############################################################################
1979
1980MODULE = urxvt PACKAGE = urxvt::iow
1981
1982SV *
1983iow::new ()
1984 CODE:
1985 iow *w = new iow;
1986 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1987 w->self = (HV *)SvRV (RETVAL);
1988 OUTPUT:
1989 RETVAL
1990
1991CHAINED
1992iow::fd (int fd)
1993 CODE:
1994 THIS->fd = fd;
1995 OUTPUT:
1996 RETVAL
1997
1998CHAINED
1999iow::events (short events)
2000 CODE:
2001 THIS->events = events;
2002 OUTPUT:
2003 RETVAL
2004
2005CHAINED
2006iow::start ()
2007 CODE:
2008 THIS->start ();
2009 OUTPUT:
2010 RETVAL
2011
2012CHAINED
2013iow::stop ()
2014 CODE:
2015 THIS->stop ();
2016 OUTPUT:
2017 RETVAL
2018
2019void
2020iow::DESTROY ()
2021
2022#############################################################################
2023# urxvt::iw
2024#############################################################################
2025
2026MODULE = urxvt PACKAGE = urxvt::iw
2027
2028SV *
2029iw::new ()
2030 CODE:
2031 iw *w = new iw;
2032 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2033 w->self = (HV *)SvRV (RETVAL);
2034 OUTPUT:
2035 RETVAL
2036
2037CHAINED
2038iw::start ()
2039 CODE:
2040 THIS->start ();
2041 OUTPUT:
2042 RETVAL
2043
2044CHAINED
2045iw::stop ()
2046 CODE:
2047 THIS->stop ();
2048 OUTPUT:
2049 RETVAL
2050
2051void
2052iw::DESTROY ()
2053
2054#############################################################################
2055# urxvt::pw
2056#############################################################################
2057
2058MODULE = urxvt PACKAGE = urxvt::pw
2059
2060SV *
2061pw::new ()
2062 CODE:
2063 pw *w = new pw;
2064 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2065 w->self = (HV *)SvRV (RETVAL);
2066 OUTPUT:
2067 RETVAL
2068
2069CHAINED
2070pw::start (int pid)
2071 CODE:
2072 THIS->start (pid);
2073 OUTPUT:
2074 RETVAL
2075
2076CHAINED
2077pw::stop ()
2078 CODE:
2079 THIS->stop ();
2080 OUTPUT:
2081 RETVAL
2082
2083void
2084pw::DESTROY ()
2085
2086

Diff Legend

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