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.100 by root, Mon Feb 20 20:44:22 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{
… …
355 223
356 int i; 224 int i;
357 225
358 for (i = AvFILL (overlay_av); i >= 0; i--) 226 for (i = AvFILL (overlay_av); i >= 0; i--)
359 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) 227 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
360 {
361 av_delete (overlay_av, i, G_DISCARD);
362 break; 228 break;
363 }
364 229
365 for (; i < AvFILL (overlay_av); i++) 230 for (; i < AvFILL (overlay_av); i++)
366 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 231 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
367 232
368 av_pop (overlay_av); 233 av_pop (overlay_av);
369 234
370 SvREFCNT_dec (overlay_av); 235 SvREFCNT_dec (overlay_av);
371 overlay_av = 0; 236 overlay_av = 0;
372 237
373 THIS->want_refresh = 1; 238 THIS->want_refresh = 1;
239 THIS->refresh_check ();
374} 240}
375 241
376void overlay::swap () 242void overlay::swap ()
377{ 243{
378 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));
… …
423 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 289 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
424 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 290 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
425 } 291 }
426 292
427 THIS->want_refresh = 1; 293 THIS->want_refresh = 1;
294 THIS->refresh_check ();
428} 295}
429 296
297/////////////////////////////////////////////////////////////////////////////
298
299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
301#include "iom_perl.h"
430 302
431///////////////////////////////////////////////////////////////////////////// 303/////////////////////////////////////////////////////////////////////////////
432 304
433struct rxvt_perl_interp rxvt_perl; 305struct rxvt_perl_interp rxvt_perl;
434 306
… …
509 381
510 // pre-handling of some events 382 // pre-handling of some events
511 if (htype == HOOK_REFRESH_END) 383 if (htype == HOOK_REFRESH_END)
512 { 384 {
513 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));
514 386
515 for (int i = 0; i <= AvFILL (av); i++) 387 for (int i = 0; i <= AvFILL (av); i++)
516 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 388 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
517 } 389 }
518 390
519 swap (perl_environ, environ); 391 swap (perl_environ, environ);
… …
718 590
719 // post-handling of some events 591 // post-handling of some events
720 if (htype == HOOK_REFRESH_BEGIN) 592 if (htype == HOOK_REFRESH_BEGIN)
721 { 593 {
722 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));
723 595
724 for (int i = AvFILL (av); i >= 0; i--) 596 for (int i = AvFILL (av); i >= 0; i--)
725 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 597 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
726 } 598 }
727 else if (htype == HOOK_DESTROY) 599 else if (htype == HOOK_DESTROY)
728 { 600 {
729 clearSVptr ((SV *)term->perl.self); 601 clearSVptr ((SV *)term->perl.self);
730 SvREFCNT_dec ((SV *)term->perl.self); 602 SvREFCNT_dec ((SV *)term->perl.self);
731 603
732 // don't allow further calls 604 // don't allow further calls
733 term->perl.self = 0; 605 term->perl.self = 0;
734 } 606 }
735 607
736 swap (perl_environ, environ); 608 swap (perl_environ, environ);
… …
767 static const struct { 639 static const struct {
768 const char *name; 640 const char *name;
769 IV iv; 641 IV iv;
770 } *civ, const_iv[] = { 642 } *civ, const_iv[] = {
771# define const_iv(name) { # name, (IV)name } 643# define const_iv(name) { # name, (IV)name }
644 const_iv (NUM_RESOURCES),
772 const_iv (DEFAULT_RSTYLE), 645 const_iv (DEFAULT_RSTYLE),
773 const_iv (OVERLAY_RSTYLE), 646 const_iv (OVERLAY_RSTYLE),
774 const_iv (RS_Bold), 647 const_iv (RS_Bold),
775 const_iv (RS_Italic), 648 const_iv (RS_Italic),
776 const_iv (RS_Blink), 649 const_iv (RS_Blink),
… …
791 const_iv (Button3Mask), 664 const_iv (Button3Mask),
792 const_iv (Button4Mask), 665 const_iv (Button4Mask),
793 const_iv (Button5Mask), 666 const_iv (Button5Mask),
794 const_iv (AnyModifier), 667 const_iv (AnyModifier),
795 668
796 const_iv (EVENT_NONE), 669 const_iv (NoSymbol),
797 const_iv (EVENT_READ), 670 const_iv (GrabModeSync),
798 const_iv (EVENT_WRITE), 671 const_iv (GrabModeAsync),
799 672
800 const_iv (NoEventMask), 673 const_iv (NoEventMask),
801 const_iv (KeyPressMask), 674 const_iv (KeyPressMask),
802 const_iv (KeyReleaseMask), 675 const_iv (KeyReleaseMask),
803 const_iv (ButtonPressMask), 676 const_iv (ButtonPressMask),
… …
902_exit (int status) 775_exit (int status)
903 776
904NV 777NV
905NOW () 778NOW ()
906 CODE: 779 CODE:
907 RETVAL = NOW; 780 RETVAL = ev::now ();
908 OUTPUT: 781 OUTPUT:
909 RETVAL 782 RETVAL
910 783
911int 784int
912GET_BASEFG (int rend) 785GET_BASEFG (int rend)
… …
937 RETVAL 810 RETVAL
938 811
939int 812int
940GET_CUSTOM (int rend) 813GET_CUSTOM (int rend)
941 CODE: 814 CODE:
942 RETVAL = (rend && RS_customMask) >> RS_customShift; 815 RETVAL = (rend & RS_customMask) >> RS_customShift;
943 OUTPUT: 816 OUTPUT:
944 RETVAL 817 RETVAL
945 818
946int 819int
947SET_CUSTOM (int rend, int new_value) 820SET_CUSTOM (int rend, int new_value)
… …
984 for (int i = AvFILL (env) + 1; i--; ) 857 for (int i = AvFILL (env) + 1; i--; )
985 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
986 859
987 envv->push_back (0); 860 envv->push_back (0);
988 861
989 bool success;
990
991 try 862 try
992 { 863 {
993 success = term->init (argv, envv); 864 term->init (argv, envv);
994 } 865 }
995 catch (const class rxvt_failure_exception &e) 866 catch (const class rxvt_failure_exception &e)
996 {
997 success = false;
998 }
999
1000 if (!success)
1001 { 867 {
1002 term->destroy (); 868 term->destroy ();
1003 croak ("error while initializing new terminal instance"); 869 croak ("error while initializing new terminal instance");
1004 } 870 }
1005 871
… …
1015void 881void
1016rxvt_term::set_should_invoke (int htype, int inc) 882rxvt_term::set_should_invoke (int htype, int inc)
1017 CODE: 883 CODE:
1018 THIS->perl.should_invoke [htype] += inc; 884 THIS->perl.should_invoke [htype] += inc;
1019 885
1020void 886int
1021rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 887rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1022 CODE: 888 CODE:
1023 XGrabButton (THIS->dpy, button, modifiers, window, 1, 889 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1024 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 890 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1025 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 891 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
892 OUTPUT: RETVAL
1026 893
1027void 894int
1028rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt) 895rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029 CODE: 896 CODE:
1030 XUngrabButton (THIS->dpy, button, modifiers, window); 897 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
898 OUTPUT: RETVAL
1031 899
1032#if 0
1033
1034void 900void
1035XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 901rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1036 C_ARGS: 902 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1037 THIS->dpy, keycode, modifiers, window, 1, 903 CODE:
1038 GrabModeSync, GrabModeSync 904 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1039 905
1040void 906void
1041XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 907rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
908 CODE:
1042 C_ARGS: THIS->dpy, keycode, modifiers, window 909 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1043 910
1044#endif 911void
912rxvt_term::XUngrabKeyboard (Time eventtime)
913 CODE:
914 XUngrabKeyboard (THIS->dpy, eventtime);
1045 915
1046bool 916bool
1047rxvt_term::grab (Time eventtime, int sync = 0) 917rxvt_term::grab (Time eventtime, int sync = 0)
1048 CODE: 918 CODE:
1049{ 919{
… …
1084rxvt_term::ungrab () 954rxvt_term::ungrab ()
1085 CODE: 955 CODE:
1086 ungrab (THIS); 956 ungrab (THIS);
1087 957
1088int 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
1089rxvt_term::strwidth (SV *str) 983rxvt_term::strwidth (SV *str)
1090 CODE: 984 CODE:
1091{ 985{
1092 wchar_t *wstr = sv2wcs (str); 986 wchar_t *wstr = sv2wcs (str);
1093 987
1094 rxvt_push_locale (THIS->locale); 988 rxvt_push_locale (THIS->locale);
1095 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 }
1096 rxvt_pop_locale (); 997 rxvt_pop_locale ();
1097 998
1098 free (wstr); 999 free (wstr);
1099} 1000}
1100 OUTPUT: 1001 OUTPUT:
… …
1130 rxvt_pop_locale (); 1031 rxvt_pop_locale ();
1131 1032
1132 RETVAL = wcs2sv (wstr); 1033 RETVAL = wcs2sv (wstr);
1133 free (wstr); 1034 free (wstr);
1134} 1035}
1036 OUTPUT:
1037 RETVAL
1038
1039char *
1040rxvt_term::locale ()
1041 CODE:
1042 RETVAL = THIS->locale;
1135 OUTPUT: 1043 OUTPUT:
1136 RETVAL 1044 RETVAL
1137 1045
1138#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1046#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1139 1047
… …
1189 { 1097 {
1190 case 0: RETVAL = THIS->ModLevel3Mask; break; 1098 case 0: RETVAL = THIS->ModLevel3Mask; break;
1191 case 1: RETVAL = THIS->ModMetaMask; break; 1099 case 1: RETVAL = THIS->ModMetaMask; break;
1192 case 2: RETVAL = THIS->ModNumLockMask; break; 1100 case 2: RETVAL = THIS->ModNumLockMask; break;
1193 case 3: RETVAL = THIS->current_screen; break; 1101 case 3: RETVAL = THIS->current_screen; break;
1102#ifdef CURSOR_BLINK
1194 case 4: RETVAL = THIS->hidden_cursor; break; 1103 case 4: RETVAL = THIS->hidden_cursor; break;
1104#endif
1195 } 1105 }
1196 OUTPUT: 1106 OUTPUT:
1197 RETVAL 1107 RETVAL
1198 1108
1199char * 1109char *
… …
1224 if (*i) 1134 if (*i)
1225 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1135 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1226} 1136}
1227 1137
1228int 1138int
1229rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1139rxvt_term::pty_ev_events (int events = ev::UNDEF)
1230 CODE: 1140 CODE:
1231 RETVAL = THIS->pty_ev.events; 1141 RETVAL = THIS->pty_ev.events;
1232 if (events != EVENT_UNDEF) 1142 if (events != ev::UNDEF)
1233 THIS->pty_ev.set (events); 1143 THIS->pty_ev.set (events);
1234 OUTPUT: 1144 OUTPUT:
1235 RETVAL 1145 RETVAL
1236 1146
1237int 1147int
… …
1316 1226
1317void 1227void
1318rxvt_term::want_refresh () 1228rxvt_term::want_refresh ()
1319 CODE: 1229 CODE:
1320 THIS->want_refresh = 1; 1230 THIS->want_refresh = 1;
1231 THIS->refresh_check ();
1321 1232
1322void 1233void
1323rxvt_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)
1324 PPCODE: 1235 PPCODE:
1325{ 1236{
… …
1480SV * 1391SV *
1481rxvt_term::special_decode (SV *text) 1392rxvt_term::special_decode (SV *text)
1482 CODE: 1393 CODE:
1483{ 1394{
1484 wchar_t *wstr = sv2wcs (text); 1395 wchar_t *wstr = sv2wcs (text);
1485 int wlen = wcslen (wstr);
1486 int dlen = 0; 1396 int dlen = 0;
1487 1397
1488 // find length 1398 // find length
1489 for (wchar_t *s = wstr; *s; s++) 1399 for (wchar_t *s = wstr; *s; s++)
1490 if (*s == NOCHAR) 1400 if (*s == NOCHAR)
… …
1523# undef reserve 1433# undef reserve
1524 }; 1434 };
1525 1435
1526 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1436 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1527 1437
1438 if (*name)
1528 do { 1439 {
1440 do {
1529 if (rs-- == rslist) 1441 if (rs-- == rslist)
1530 croak ("no such resource '%s', requested", name); 1442 croak ("no such resource '%s', requested", name);
1531 } while (strcmp (name, rs->name)); 1443 } while (strcmp (name, rs->name));
1532 1444
1533 index += rs->value; 1445 index += rs->value;
1446 }
1447 else
1448 {
1449 --rs;
1450 name = "";
1451 }
1534 1452
1535 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1453 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1536 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);
1537 1455
1538 if (GIMME_V != G_VOID) 1456 if (GIMME_V != G_VOID)
… …
1553 1471
1554const char * 1472const char *
1555rxvt_term::x_resource (const char *name) 1473rxvt_term::x_resource (const char *name)
1556 1474
1557bool 1475bool
1558rxvt_term::option (U32 optval, int set = -1) 1476rxvt_term::option (U8 optval, int set = -1)
1559 CODE: 1477 CODE:
1560{ 1478{
1561 RETVAL = THIS->options & optval; 1479 RETVAL = THIS->option (optval);
1562 1480
1563 if (set >= 0) 1481 if (set >= 0)
1564 { 1482 {
1565 if (set)
1566 THIS->options |= optval; 1483 THIS->set_option (optval, set);
1567 else
1568 THIS->options &= ~optval;
1569 1484
1570 if (THIS->check_ev.is_active ()) // avoid doing this before START 1485 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1571 switch (optval) 1486 switch (optval)
1572 { 1487 {
1573 case Opt_skipBuiltinGlyphs: 1488 case Opt_skipBuiltinGlyphs:
1574 THIS->set_fonts (); 1489 THIS->set_fonts ();
1575 THIS->scr_remap_chars (); 1490 THIS->scr_remap_chars ();
1576 THIS->scr_touch (true); 1491 THIS->scr_touch (true);
1577 THIS->want_refresh = 1; 1492 THIS->want_refresh = 1;
1493 THIS->refresh_check ();
1578 break; 1494 break;
1579 1495
1580 case Opt_cursorUnderline: 1496 case Opt_cursorUnderline:
1581 THIS->want_refresh = 1; 1497 THIS->want_refresh = 1;
1498 THIS->refresh_check ();
1582 break; 1499 break;
1583 1500
1584# case Opt_scrollBar_floating: 1501# case Opt_scrollBar_floating:
1585# case Opt_scrollBar_right: 1502# case Opt_scrollBar_right:
1586# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1503# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1644 1561
1645 clamp_it (rc.col, 0, THIS->ncol); 1562 clamp_it (rc.col, 0, THIS->ncol);
1646 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1563 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1647 1564
1648 if (ix) 1565 if (ix)
1566 {
1649 THIS->want_refresh = 1; 1567 THIS->want_refresh = 1;
1568 THIS->refresh_check ();
1569 }
1650 } 1570 }
1651} 1571}
1652 1572
1653char 1573char
1654rxvt_term::cur_charset () 1574rxvt_term::cur_charset ()
… …
1761 Atom *props = XListProperties (THIS->dpy, window, &count); 1681 Atom *props = XListProperties (THIS->dpy, window, &count);
1762 1682
1763 EXTEND (SP, count); 1683 EXTEND (SP, count);
1764 while (count--) 1684 while (count--)
1765 PUSHs (newSVuv ((U32)props [count])); 1685 PUSHs (newSVuv ((U32)props [count]));
1766 1686
1767 XFree (props); 1687 XFree (props);
1768} 1688}
1769 1689
1770void 1690void
1771rxvt_term::XGetWindowProperty (Window window, Atom property) 1691rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1794 XFree (prop); 1714 XFree (prop);
1795 } 1715 }
1796} 1716}
1797 1717
1798void 1718void
1799rxvt_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)
1800 CODE: 1720 CODE:
1801{ 1721{
1802 STRLEN len; 1722 STRLEN len;
1803 char *data_ = SvPVbyte (data, len); 1723 char *data_ = SvPVbyte (data, len);
1804 1724
… …
1900overlay::hide () 1820overlay::hide ()
1901 1821
1902void 1822void
1903overlay::DESTROY () 1823overlay::DESTROY ()
1904 1824
1905############################################################################# 1825INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1906# urxvt::watcher
1907#############################################################################
1908 1826
1909MODULE = urxvt PACKAGE = urxvt::watcher
1910
1911CHAINED
1912perl_watcher::cb (SV *cb)
1913 CODE:
1914 THIS->cb (cb);
1915 OUTPUT:
1916 RETVAL
1917
1918#############################################################################
1919# urxvt::timer
1920#############################################################################
1921
1922MODULE = urxvt PACKAGE = urxvt::timer
1923
1924SV *
1925timer::new ()
1926 CODE:
1927 timer *w = new timer;
1928 w->start (NOW);
1929 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1930 w->self = (HV *)SvRV (RETVAL);
1931 OUTPUT:
1932 RETVAL
1933
1934NV
1935timer::at ()
1936 CODE:
1937 RETVAL = THIS->at;
1938 OUTPUT:
1939 RETVAL
1940
1941CHAINED
1942timer::interval (NV interval)
1943 CODE:
1944 THIS->interval = interval;
1945 OUTPUT:
1946 RETVAL
1947
1948CHAINED
1949timer::set (NV tstamp)
1950 CODE:
1951 THIS->set (tstamp);
1952 OUTPUT:
1953 RETVAL
1954
1955CHAINED
1956timer::start (NV tstamp = THIS->at)
1957 CODE:
1958 THIS->start (tstamp);
1959 OUTPUT:
1960 RETVAL
1961
1962CHAINED
1963timer::after (NV delay)
1964 CODE:
1965 THIS->start (NOW + delay);
1966 OUTPUT:
1967 RETVAL
1968
1969CHAINED
1970timer::stop ()
1971 CODE:
1972 THIS->stop ();
1973 OUTPUT:
1974 RETVAL
1975
1976void
1977timer::DESTROY ()
1978
1979#############################################################################
1980# urxvt::iow
1981#############################################################################
1982
1983MODULE = urxvt PACKAGE = urxvt::iow
1984
1985SV *
1986iow::new ()
1987 CODE:
1988 iow *w = new iow;
1989 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1990 w->self = (HV *)SvRV (RETVAL);
1991 OUTPUT:
1992 RETVAL
1993
1994CHAINED
1995iow::fd (int fd)
1996 CODE:
1997 THIS->fd = fd;
1998 OUTPUT:
1999 RETVAL
2000
2001CHAINED
2002iow::events (short events)
2003 CODE:
2004 THIS->events = events;
2005 OUTPUT:
2006 RETVAL
2007
2008CHAINED
2009iow::start ()
2010 CODE:
2011 THIS->start ();
2012 OUTPUT:
2013 RETVAL
2014
2015CHAINED
2016iow::stop ()
2017 CODE:
2018 THIS->stop ();
2019 OUTPUT:
2020 RETVAL
2021
2022void
2023iow::DESTROY ()
2024
2025#############################################################################
2026# urxvt::iw
2027#############################################################################
2028
2029MODULE = urxvt PACKAGE = urxvt::iw
2030
2031SV *
2032iw::new ()
2033 CODE:
2034 iw *w = new iw;
2035 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2036 w->self = (HV *)SvRV (RETVAL);
2037 OUTPUT:
2038 RETVAL
2039
2040CHAINED
2041iw::start ()
2042 CODE:
2043 THIS->start ();
2044 OUTPUT:
2045 RETVAL
2046
2047CHAINED
2048iw::stop ()
2049 CODE:
2050 THIS->stop ();
2051 OUTPUT:
2052 RETVAL
2053
2054void
2055iw::DESTROY ()
2056
2057#############################################################################
2058# urxvt::pw
2059#############################################################################
2060
2061MODULE = urxvt PACKAGE = urxvt::pw
2062
2063SV *
2064pw::new ()
2065 CODE:
2066 pw *w = new pw;
2067 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2068 w->self = (HV *)SvRV (RETVAL);
2069 OUTPUT:
2070 RETVAL
2071
2072CHAINED
2073pw::start (int pid)
2074 CODE:
2075 THIS->start (pid);
2076 OUTPUT:
2077 RETVAL
2078
2079CHAINED
2080pw::stop ()
2081 CODE:
2082 THIS->stop ();
2083 OUTPUT:
2084 RETVAL
2085
2086void
2087pw::DESTROY ()
2088
2089

Diff Legend

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