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.98 by root, Mon Feb 6 05:40:15 2006 UTC vs.
Revision 1.122 by root, Sun Jun 15 14:07:58 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);
… …
791 const_iv (Button3Mask), 663 const_iv (Button3Mask),
792 const_iv (Button4Mask), 664 const_iv (Button4Mask),
793 const_iv (Button5Mask), 665 const_iv (Button5Mask),
794 const_iv (AnyModifier), 666 const_iv (AnyModifier),
795 667
796 const_iv (EVENT_NONE), 668 const_iv (NoSymbol),
797 const_iv (EVENT_READ), 669 const_iv (GrabModeSync),
798 const_iv (EVENT_WRITE), 670 const_iv (GrabModeAsync),
799 671
800 const_iv (NoEventMask), 672 const_iv (NoEventMask),
801 const_iv (KeyPressMask), 673 const_iv (KeyPressMask),
802 const_iv (KeyReleaseMask), 674 const_iv (KeyReleaseMask),
803 const_iv (ButtonPressMask), 675 const_iv (ButtonPressMask),
… …
902_exit (int status) 774_exit (int status)
903 775
904NV 776NV
905NOW () 777NOW ()
906 CODE: 778 CODE:
907 RETVAL = NOW; 779 RETVAL = ev::now ();
908 OUTPUT: 780 OUTPUT:
909 RETVAL 781 RETVAL
910 782
911int 783int
912GET_BASEFG (int rend) 784GET_BASEFG (int rend)
… …
937 RETVAL 809 RETVAL
938 810
939int 811int
940GET_CUSTOM (int rend) 812GET_CUSTOM (int rend)
941 CODE: 813 CODE:
942 RETVAL = (rend && RS_customMask) >> RS_customShift; 814 RETVAL = (rend & RS_customMask) >> RS_customShift;
943 OUTPUT: 815 OUTPUT:
944 RETVAL 816 RETVAL
945 817
946int 818int
947SET_CUSTOM (int rend, int new_value) 819SET_CUSTOM (int rend, int new_value)
… …
984 for (int i = AvFILL (env) + 1; i--; ) 856 for (int i = AvFILL (env) + 1; i--; )
985 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 857 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
986 858
987 envv->push_back (0); 859 envv->push_back (0);
988 860
989 bool success;
990
991 try 861 try
992 { 862 {
993 success = term->init (argv, envv); 863 term->init (argv, envv);
994 } 864 }
995 catch (const class rxvt_failure_exception &e) 865 catch (const class rxvt_failure_exception &e)
996 {
997 success = false;
998 }
999
1000 if (!success)
1001 { 866 {
1002 term->destroy (); 867 term->destroy ();
1003 croak ("error while initializing new terminal instance"); 868 croak ("error while initializing new terminal instance");
1004 } 869 }
1005 870
… …
1015void 880void
1016rxvt_term::set_should_invoke (int htype, int inc) 881rxvt_term::set_should_invoke (int htype, int inc)
1017 CODE: 882 CODE:
1018 THIS->perl.should_invoke [htype] += inc; 883 THIS->perl.should_invoke [htype] += inc;
1019 884
1020void 885int
1021rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 886rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1022 CODE: 887 CODE:
1023 XGrabButton (THIS->dpy, button, modifiers, window, 1, 888 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1024 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 889 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1025 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 890 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
891 OUTPUT: RETVAL
1026 892
1027void 893int
1028rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt) 894rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029 CODE: 895 CODE:
1030 XUngrabButton (THIS->dpy, button, modifiers, window); 896 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
897 OUTPUT: RETVAL
1031 898
1032#if 0
1033
1034void 899void
1035XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 900rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1036 C_ARGS: 901 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1037 THIS->dpy, keycode, modifiers, window, 1, 902 CODE:
1038 GrabModeSync, GrabModeSync 903 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1039 904
1040void 905void
1041XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 906rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
907 CODE:
1042 C_ARGS: THIS->dpy, keycode, modifiers, window 908 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1043 909
1044#endif 910void
911rxvt_term::XUngrabKeyboard (Time eventtime)
912 CODE:
913 XUngrabKeyboard (THIS->dpy, eventtime);
1045 914
1046bool 915bool
1047rxvt_term::grab (Time eventtime, int sync = 0) 916rxvt_term::grab (Time eventtime, int sync = 0)
1048 CODE: 917 CODE:
1049{ 918{
… …
1084rxvt_term::ungrab () 953rxvt_term::ungrab ()
1085 CODE: 954 CODE:
1086 ungrab (THIS); 955 ungrab (THIS);
1087 956
1088int 957int
958rxvt_term::XStringToKeysym (char *string)
959 CODE:
960 RETVAL = XStringToKeysym (string);
961 OUTPUT: RETVAL
962
963char *
964rxvt_term::XKeysymToString (int sym)
965 CODE:
966 RETVAL = XKeysymToString (sym);
967 OUTPUT: RETVAL
968
969int
970rxvt_term::XKeysymToKeycode (int sym)
971 CODE:
972 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
973 OUTPUT: RETVAL
974
975int
976rxvt_term::XKeycodeToKeysym (int code, int index)
977 CODE:
978 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
979 OUTPUT: RETVAL
980
981int
1089rxvt_term::strwidth (SV *str) 982rxvt_term::strwidth (SV *str)
1090 CODE: 983 CODE:
1091{ 984{
1092 wchar_t *wstr = sv2wcs (str); 985 wchar_t *wstr = sv2wcs (str);
1093 986
1094 rxvt_push_locale (THIS->locale); 987 rxvt_push_locale (THIS->locale);
1095 RETVAL = wcswidth (wstr, wcslen (wstr)); 988 RETVAL = 0;
989 for (wchar_t *wc = wstr; *wc; wc++)
990 {
991 int w = WCWIDTH (*wc);
992
993 if (w)
994 RETVAL += max (w, 1);
995 }
1096 rxvt_pop_locale (); 996 rxvt_pop_locale ();
1097 997
1098 free (wstr); 998 free (wstr);
1099} 999}
1100 OUTPUT: 1000 OUTPUT:
… …
1130 rxvt_pop_locale (); 1030 rxvt_pop_locale ();
1131 1031
1132 RETVAL = wcs2sv (wstr); 1032 RETVAL = wcs2sv (wstr);
1133 free (wstr); 1033 free (wstr);
1134} 1034}
1035 OUTPUT:
1036 RETVAL
1037
1038char *
1039rxvt_term::locale ()
1040 CODE:
1041 RETVAL = THIS->locale;
1135 OUTPUT: 1042 OUTPUT:
1136 RETVAL 1043 RETVAL
1137 1044
1138#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1045#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1139 1046
… …
1209 } 1116 }
1210 OUTPUT: 1117 OUTPUT:
1211 RETVAL 1118 RETVAL
1212 1119
1213SV * 1120SV *
1214rxvt_term::_env () 1121rxvt_term::envv ()
1122 ALIAS:
1123 argv = 1
1215 CODE: 1124 PPCODE:
1216{ 1125{
1217 if (THIS->envv) 1126 stringvec *vec = ix ? THIS->argv : THIS->envv;
1218 {
1219 AV *av = newAV ();
1220 1127
1128 EXTEND (SP, vec->size ());
1129
1221 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1130 for (char **i = vec->begin (); i != vec->end (); ++i)
1222 if (*i) 1131 if (*i)
1223 av_push (av, newSVpv (*i, 0)); 1132 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1224
1225 RETVAL = newRV_noinc ((SV *)av);
1226 }
1227 else
1228 RETVAL = &PL_sv_undef;
1229} 1133}
1230 OUTPUT:
1231 RETVAL
1232 1134
1233int 1135int
1234rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1136rxvt_term::pty_ev_events (int events = ev::UNDEF)
1235 CODE: 1137 CODE:
1236 RETVAL = THIS->pty_ev.events; 1138 RETVAL = THIS->pty_ev.events;
1237 if (events != EVENT_UNDEF) 1139 if (events != ev::UNDEF)
1238 THIS->pty_ev.set (events); 1140 THIS->pty_ev.set (events);
1239 OUTPUT: 1141 OUTPUT:
1240 RETVAL 1142 RETVAL
1241 1143
1242int 1144int
… …
1321 1223
1322void 1224void
1323rxvt_term::want_refresh () 1225rxvt_term::want_refresh ()
1324 CODE: 1226 CODE:
1325 THIS->want_refresh = 1; 1227 THIS->want_refresh = 1;
1228 THIS->refresh_check ();
1326 1229
1327void 1230void
1328rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1231rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1329 PPCODE: 1232 PPCODE:
1330{ 1233{
… …
1485SV * 1388SV *
1486rxvt_term::special_decode (SV *text) 1389rxvt_term::special_decode (SV *text)
1487 CODE: 1390 CODE:
1488{ 1391{
1489 wchar_t *wstr = sv2wcs (text); 1392 wchar_t *wstr = sv2wcs (text);
1490 int wlen = wcslen (wstr);
1491 int dlen = 0; 1393 int dlen = 0;
1492 1394
1493 // find length 1395 // find length
1494 for (wchar_t *s = wstr; *s; s++) 1396 for (wchar_t *s = wstr; *s; s++)
1495 if (*s == NOCHAR) 1397 if (*s == NOCHAR)
… …
1558 1460
1559const char * 1461const char *
1560rxvt_term::x_resource (const char *name) 1462rxvt_term::x_resource (const char *name)
1561 1463
1562bool 1464bool
1563rxvt_term::option (U32 optval, int set = -1) 1465rxvt_term::option (U8 optval, int set = -1)
1564 CODE: 1466 CODE:
1565{ 1467{
1566 RETVAL = THIS->options & optval; 1468 RETVAL = THIS->option (optval);
1567 1469
1568 if (set >= 0) 1470 if (set >= 0)
1569 { 1471 {
1570 if (set)
1571 THIS->options |= optval; 1472 THIS->set_option (optval, set);
1572 else
1573 THIS->options &= ~optval;
1574 1473
1575 if (THIS->check_ev.is_active ()) // avoid doing this before START 1474 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1576 switch (optval) 1475 switch (optval)
1577 { 1476 {
1578 case Opt_skipBuiltinGlyphs: 1477 case Opt_skipBuiltinGlyphs:
1579 THIS->set_fonts (); 1478 THIS->set_fonts ();
1580 THIS->scr_remap_chars (); 1479 THIS->scr_remap_chars ();
1581 THIS->scr_touch (true); 1480 THIS->scr_touch (true);
1582 THIS->want_refresh = 1; 1481 THIS->want_refresh = 1;
1482 THIS->refresh_check ();
1583 break; 1483 break;
1584 1484
1585 case Opt_cursorUnderline: 1485 case Opt_cursorUnderline:
1586 THIS->want_refresh = 1; 1486 THIS->want_refresh = 1;
1487 THIS->refresh_check ();
1587 break; 1488 break;
1588 1489
1589# case Opt_scrollBar_floating: 1490# case Opt_scrollBar_floating:
1590# case Opt_scrollBar_right: 1491# case Opt_scrollBar_right:
1591# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1492# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1649 1550
1650 clamp_it (rc.col, 0, THIS->ncol); 1551 clamp_it (rc.col, 0, THIS->ncol);
1651 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1552 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1652 1553
1653 if (ix) 1554 if (ix)
1555 {
1654 THIS->want_refresh = 1; 1556 THIS->want_refresh = 1;
1557 THIS->refresh_check ();
1558 }
1655 } 1559 }
1656} 1560}
1657 1561
1658char 1562char
1659rxvt_term::cur_charset () 1563rxvt_term::cur_charset ()
… …
1766 Atom *props = XListProperties (THIS->dpy, window, &count); 1670 Atom *props = XListProperties (THIS->dpy, window, &count);
1767 1671
1768 EXTEND (SP, count); 1672 EXTEND (SP, count);
1769 while (count--) 1673 while (count--)
1770 PUSHs (newSVuv ((U32)props [count])); 1674 PUSHs (newSVuv ((U32)props [count]));
1771 1675
1772 XFree (props); 1676 XFree (props);
1773} 1677}
1774 1678
1775void 1679void
1776rxvt_term::XGetWindowProperty (Window window, Atom property) 1680rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1799 XFree (prop); 1703 XFree (prop);
1800 } 1704 }
1801} 1705}
1802 1706
1803void 1707void
1804rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1708rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1805 CODE: 1709 CODE:
1806{ 1710{
1807 STRLEN len; 1711 STRLEN len;
1808 char *data_ = SvPVbyte (data, len); 1712 char *data_ = SvPVbyte (data, len);
1809 1713
… …
1812 : 1; 1716 : 1;
1813 1717
1814 XChangeProperty (THIS->dpy, window, property, 1718 XChangeProperty (THIS->dpy, window, property,
1815 type, format, PropModeReplace, 1719 type, format, PropModeReplace,
1816 (unsigned char *)data_, len / elemsize); 1720 (unsigned char *)data_, len / elemsize);
1817 XSync (THIS->dpy, 0);
1818} 1721}
1819 1722
1820Atom 1723Atom
1821XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1724XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1822 C_ARGS: term->dpy, atom_name, only_if_exists 1725 C_ARGS: term->dpy, atom_name, only_if_exists
… …
1906overlay::hide () 1809overlay::hide ()
1907 1810
1908void 1811void
1909overlay::DESTROY () 1812overlay::DESTROY ()
1910 1813
1911############################################################################# 1814INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1912# urxvt::watcher
1913#############################################################################
1914 1815
1915MODULE = urxvt PACKAGE = urxvt::watcher
1916
1917CHAINED
1918perl_watcher::cb (SV *cb)
1919 CODE:
1920 THIS->cb (cb);
1921 OUTPUT:
1922 RETVAL
1923
1924#############################################################################
1925# urxvt::timer
1926#############################################################################
1927
1928MODULE = urxvt PACKAGE = urxvt::timer
1929
1930SV *
1931timer::new ()
1932 CODE:
1933 timer *w = new timer;
1934 w->start (NOW);
1935 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1936 w->self = (HV *)SvRV (RETVAL);
1937 OUTPUT:
1938 RETVAL
1939
1940NV
1941timer::at ()
1942 CODE:
1943 RETVAL = THIS->at;
1944 OUTPUT:
1945 RETVAL
1946
1947CHAINED
1948timer::interval (NV interval)
1949 CODE:
1950 THIS->interval = interval;
1951 OUTPUT:
1952 RETVAL
1953
1954CHAINED
1955timer::set (NV tstamp)
1956 CODE:
1957 THIS->set (tstamp);
1958 OUTPUT:
1959 RETVAL
1960
1961CHAINED
1962timer::start (NV tstamp = THIS->at)
1963 CODE:
1964 THIS->start (tstamp);
1965 OUTPUT:
1966 RETVAL
1967
1968CHAINED
1969timer::after (NV delay)
1970 CODE:
1971 THIS->start (NOW + delay);
1972 OUTPUT:
1973 RETVAL
1974
1975CHAINED
1976timer::stop ()
1977 CODE:
1978 THIS->stop ();
1979 OUTPUT:
1980 RETVAL
1981
1982void
1983timer::DESTROY ()
1984
1985#############################################################################
1986# urxvt::iow
1987#############################################################################
1988
1989MODULE = urxvt PACKAGE = urxvt::iow
1990
1991SV *
1992iow::new ()
1993 CODE:
1994 iow *w = new iow;
1995 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1996 w->self = (HV *)SvRV (RETVAL);
1997 OUTPUT:
1998 RETVAL
1999
2000CHAINED
2001iow::fd (int fd)
2002 CODE:
2003 THIS->fd = fd;
2004 OUTPUT:
2005 RETVAL
2006
2007CHAINED
2008iow::events (short events)
2009 CODE:
2010 THIS->events = events;
2011 OUTPUT:
2012 RETVAL
2013
2014CHAINED
2015iow::start ()
2016 CODE:
2017 THIS->start ();
2018 OUTPUT:
2019 RETVAL
2020
2021CHAINED
2022iow::stop ()
2023 CODE:
2024 THIS->stop ();
2025 OUTPUT:
2026 RETVAL
2027
2028void
2029iow::DESTROY ()
2030
2031#############################################################################
2032# urxvt::iw
2033#############################################################################
2034
2035MODULE = urxvt PACKAGE = urxvt::iw
2036
2037SV *
2038iw::new ()
2039 CODE:
2040 iw *w = new iw;
2041 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2042 w->self = (HV *)SvRV (RETVAL);
2043 OUTPUT:
2044 RETVAL
2045
2046CHAINED
2047iw::start ()
2048 CODE:
2049 THIS->start ();
2050 OUTPUT:
2051 RETVAL
2052
2053CHAINED
2054iw::stop ()
2055 CODE:
2056 THIS->stop ();
2057 OUTPUT:
2058 RETVAL
2059
2060void
2061iw::DESTROY ()
2062
2063#############################################################################
2064# urxvt::pw
2065#############################################################################
2066
2067MODULE = urxvt PACKAGE = urxvt::pw
2068
2069SV *
2070pw::new ()
2071 CODE:
2072 pw *w = new pw;
2073 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2074 w->self = (HV *)SvRV (RETVAL);
2075 OUTPUT:
2076 RETVAL
2077
2078CHAINED
2079pw::start (int pid)
2080 CODE:
2081 THIS->start (pid);
2082 OUTPUT:
2083 RETVAL
2084
2085CHAINED
2086pw::stop ()
2087 CODE:
2088 THIS->stop ();
2089 OUTPUT:
2090 RETVAL
2091
2092void
2093pw::DESTROY ()
2094
2095

Diff Legend

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