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.71 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.118 by root, Fri Dec 14 05:25:25 2007 UTC

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
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55#define ENABLE_PERL_FRILLS 1
56
57///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
58 56
59static wchar_t * 57static wchar_t *
60sv2wcs (SV *sv) 58sv2wcs (SV *sv)
61{ 59{
75 73
76 return sv; 74 return sv;
77} 75}
78 76
79static SV * 77static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85//TODO: use magic
86static SV *
87newSVptr (void *ptr, const char *klass) 78newSVptr (void *ptr, const char *klass)
88{ 79{
89 HV *hv = newHV (); 80 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 81 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 82 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 104 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 105
115 return (long)mg->mg_ptr; 106 return (long)mg->mg_ptr;
116} 107}
117 108
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 109#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 110#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 111
121///////////////////////////////////////////////////////////////////////////// 112/////////////////////////////////////////////////////////////////////////////
122 113
123struct perl_watcher
124{
125 SV *cbsv;
126 HV *self;
127
128 perl_watcher ()
129 : cbsv (newSV (0))
130 {
131 }
132
133 ~perl_watcher ()
134 {
135 SvREFCNT_dec (cbsv);
136 }
137
138 void cb (SV *cb)
139 {
140 sv_setsv (cbsv, cb);
141 }
142
143 void invoke (const char *type, SV *self, int arg = -1);
144};
145
146void
147perl_watcher::invoke (const char *type, SV *self, int arg)
148{
149 dSP;
150
151 ENTER;
152 SAVETMPS;
153
154 PUSHMARK (SP);
155
156 XPUSHs (sv_2mortal (self));
157
158 if (arg >= 0)
159 XPUSHs (sv_2mortal (newSViv (arg)));
160
161 PUTBACK;
162 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
163 SPAGAIN;
164
165 PUTBACK;
166 FREETMPS;
167 LEAVE;
168
169 if (SvTRUE (ERRSV))
170 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
171}
172
173#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
174#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")
175
176struct timer : time_watcher, perl_watcher
177{
178 tstamp interval;
179
180 timer ()
181 : time_watcher (this, &timer::execute)
182 {
183 }
184
185 void execute (time_watcher &w)
186 {
187 if (interval)
188 start (at + interval);
189
190 invoke ("urxvt::timer", newSVtimer (this));
191 }
192};
193
194#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
195#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow")
196
197struct iow : io_watcher, perl_watcher
198{
199 iow ()
200 : io_watcher (this, &iow::execute)
201 {
202 }
203
204 void execute (io_watcher &w, short revents)
205 {
206 invoke ("urxvt::iow", newSViow (this), revents);
207 }
208};
209
210/////////////////////////////////////////////////////////////////////////////
211
212#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 114#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
213 115
214struct overlay { 116class overlay {
215 HV *self;
216 rxvt_term *THIS; 117 rxvt_term *THIS;
118 AV *overlay_av;
217 int x, y, w, h; 119 int x, y, w, h;
218 int border; 120 int border;
219 text_t **text; 121 text_t **text;
220 rend_t **rend; 122 rend_t **rend;
221 123
124public:
125 HV *self;
126
222 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 127 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
223 ~overlay (); 128 ~overlay ();
224 129
225 void show (); 130 void show ();
226 void hide (); 131 void hide ();
229 134
230 void set (int x, int y, SV *str, SV *rend); 135 void set (int x, int y, SV *str, SV *rend);
231}; 136};
232 137
233overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 138overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
234: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2) 139: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
235{ 140{
141 if (w < 0) w = 0;
142 if (h < 0) h = 0;
143
236 if (border == 2) 144 if (border == 2)
237 { 145 {
238 w += 2; 146 w += 2;
239 h += 2; 147 h += 2;
240 } 148 }
278 *rp++ = r; 186 *rp++ = r;
279 } 187 }
280 } 188 }
281 189
282 show (); 190 show ();
283 THIS->want_refresh = 1;
284} 191}
285 192
286overlay::~overlay () 193overlay::~overlay ()
287{ 194{
288 hide (); 195 hide ();
293 delete [] rend[y]; 200 delete [] rend[y];
294 } 201 }
295 202
296 delete [] text; 203 delete [] text;
297 delete [] rend; 204 delete [] rend;
205}
206
207void
208overlay::show ()
209{
210 if (overlay_av)
211 return;
212
213 overlay_av = (AV *)SvREFCNT_inc (SvRV (
214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
215 ));
216 av_push (overlay_av, newSViv ((long)this));
298 217
299 THIS->want_refresh = 1; 218 THIS->want_refresh = 1;
300} 219 THIS->refresh_check ();
301
302void
303overlay::show ()
304{
305 char key[33]; sprintf (key, "%32lx", (long)this);
306
307 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
308 hv_store (hv, key, 32, newSViv ((long)this), 0);
309} 220}
310 221
311void 222void
312overlay::hide () 223overlay::hide ()
313{ 224{
314 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 225 if (!overlay_av)
226 return;
315 227
316 if (ovs) 228 int i;
317 {
318 char key[33]; sprintf (key, "%32lx", (long)this);
319 229
320 HV *hv = (HV *)SvRV (*ovs); 230 for (i = AvFILL (overlay_av); i >= 0; i--)
321 hv_delete (hv, key, 32, G_DISCARD); 231 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
322 } 232 break;
233
234 for (; i < AvFILL (overlay_av); i++)
235 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
236
237 av_pop (overlay_av);
238
239 SvREFCNT_dec (overlay_av);
240 overlay_av = 0;
241
242 THIS->want_refresh = 1;
243 THIS->refresh_check ();
323} 244}
324 245
325void overlay::swap () 246void overlay::swap ()
326{ 247{
327 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 248 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
367 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 288 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
368 croak ("rend must be arrayref"); 289 croak ("rend must be arrayref");
369 290
370 AV *av = (AV *)SvRV (rend); 291 AV *av = (AV *)SvRV (rend);
371 292
372 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 293 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
373 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 294 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
374 } 295 }
375 296
376 THIS->want_refresh = 1; 297 THIS->want_refresh = 1;
298 THIS->refresh_check ();
377} 299}
378 300
301/////////////////////////////////////////////////////////////////////////////
302
303#define IOM_CLASS "urxvt"
304#define IOM_WARN rxvt_warn
305#include <iom_perl.h>
379 306
380///////////////////////////////////////////////////////////////////////////// 307/////////////////////////////////////////////////////////////////////////////
381 308
382struct rxvt_perl_interp rxvt_perl; 309struct rxvt_perl_interp rxvt_perl;
383 310
402 perl_environ = rxvt_environ; 329 perl_environ = rxvt_environ;
403 swap (perl_environ, environ); 330 swap (perl_environ, environ);
404 331
405 char *argv[] = { 332 char *argv[] = {
406 "", 333 "",
407 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 334 "-e"
335 "BEGIN {"
336 " urxvt->bootstrap;"
337 " unshift @INC, '" LIBDIR "';"
338 "}"
339 ""
340 "use urxvt;"
408 }; 341 };
409 342
410 perl = perl_alloc (); 343 perl = perl_alloc ();
411 perl_construct (perl); 344 perl_construct (perl);
412 345
427 360
428 if (perl) 361 if (perl)
429 { 362 {
430 // runs outside of perls ENV 363 // runs outside of perls ENV
431 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 364 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
432 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 365 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
433 } 366 }
434} 367}
435 368
436static void 369static void
437ungrab (rxvt_term *THIS) 370ungrab (rxvt_term *THIS)
438{ 371{
439 if (THIS->perl.grabtime) 372 if (THIS->perl.grabtime)
440 { 373 {
441 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 374 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
442 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 375 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
443 THIS->perl.grabtime = 0; 376 THIS->perl.grabtime = 0;
444 } 377 }
445} 378}
446 379
447static void
448swap_overlays (rxvt_term *term)
449{
450 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
451
452 if (HvKEYS (hv))
453 {
454 hv_iterinit (hv);
455
456 while (HE *he = hv_iternext (hv))
457 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
458 }
459}
460
461bool 380bool
462rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 381rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
463{ 382{
464 if (!perl || !term->perl.self) 383 if (!perl || !term->perl.self)
465 return false; 384 return false;
466 385
467 // pre-handling of some events 386 // pre-handling of some events
468 if (htype == HOOK_REFRESH_END) 387 if (htype == HOOK_REFRESH_END)
469 swap_overlays (term); 388 {
389 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
390
391 for (int i = 0; i <= AvFILL (av); i++)
392 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
393 }
470 394
471 swap (perl_environ, environ); 395 swap (perl_environ, environ);
472 396
473 bool event_consumed; 397 bool event_consumed;
474 398
507 break; 431 break;
508 432
509 case DT_STR_LEN: 433 case DT_STR_LEN:
510 { 434 {
511 char *str = va_arg (ap, char *); 435 char *str = va_arg (ap, char *);
512 int len = va_arg (ap, int); 436 int len = va_arg (ap, int);
513 437
514 XPUSHs (sv_2mortal (newSVpvn (str, len))); 438 XPUSHs (sv_2mortal (newSVpvn (str, len)));
515 } 439 }
516 break; 440 break;
517 441
518 case DT_WCS_LEN: 442 case DT_WCS_LEN:
519 { 443 {
520 wchar_t *wstr = va_arg (ap, wchar_t *); 444 wchar_t *wstr = va_arg (ap, wchar_t *);
521 int wlen = va_arg (ap, int); 445 int wlen = va_arg (ap, int);
522 446
523 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 447 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
448 }
449 break;
450
451 case DT_LCS_LEN:
452 {
453 long *lstr = va_arg (ap, long *);
454 int llen = va_arg (ap, int);
455
456 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
524 } 457 }
525 break; 458 break;
526 459
527 case DT_XEVENT: 460 case DT_XEVENT:
528 { 461 {
529 XEvent *xe = va_arg (ap, XEvent *); 462 XEvent *xe = va_arg (ap, XEvent *);
530 HV *hv = newHV (); 463 HV *hv = newHV ();
531 464
532# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 465# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
533# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 466# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
467# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
534# undef set 468# undef set
535 469
536 setiv (type, xe->type); 470 setiv (type, xe->type);
537 setiv (send_event, xe->xany.send_event); 471 setiv (send_event, xe->xany.send_event);
538 setiv (serial, xe->xany.serial); 472 setiv (serial, xe->xany.serial);
539 473
542 case KeyPress: 476 case KeyPress:
543 case KeyRelease: 477 case KeyRelease:
544 case ButtonPress: 478 case ButtonPress:
545 case ButtonRelease: 479 case ButtonRelease:
546 case MotionNotify: 480 case MotionNotify:
481 setuv (window, xe->xmotion.window);
482 setuv (root, xe->xmotion.root);
483 setuv (subwindow, xe->xmotion.subwindow);
547 setiv (time, xe->xmotion.time); 484 setuv (time, xe->xmotion.time);
548 setiv (x, xe->xmotion.x); 485 setiv (x, xe->xmotion.x);
549 setiv (y, xe->xmotion.y); 486 setiv (y, xe->xmotion.y);
550 setiv (row, xe->xmotion.y / term->fheight); 487 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
551 setiv (col, xe->xmotion.x / term->fwidth); 488 setiv (col, xe->xmotion.x / term->fwidth);
552 setiv (x_root, xe->xmotion.x_root); 489 setiv (x_root, xe->xmotion.x_root);
553 setiv (y_root, xe->xmotion.y_root); 490 setiv (y_root, xe->xmotion.y_root);
554 setiv (state, xe->xmotion.state); 491 setuv (state, xe->xmotion.state);
492
493 switch (xe->type)
494 {
495 case KeyPress:
496 case KeyRelease:
497 setuv (keycode, xe->xkey.keycode);
498 break;
499
500 case ButtonPress:
501 case ButtonRelease:
502 setuv (button, xe->xbutton.button);
503 break;
504
505 case MotionNotify:
506 setiv (is_hint, xe->xmotion.is_hint);
507 break;
508 }
509
555 break; 510 break;
556 }
557 511
512 case MapNotify:
513 case UnmapNotify:
514 case ConfigureNotify:
515 setuv (event, xe->xconfigure.event);
516 setuv (window, xe->xconfigure.window);
517
558 switch (xe->type) 518 switch (xe->type)
559 { 519 {
560 case KeyPress: 520 case ConfigureNotify:
561 case KeyRelease: 521 setiv (x, xe->xconfigure.x);
562 setiv (keycode, xe->xkey.keycode); 522 setiv (y, xe->xconfigure.y);
523 setiv (width, xe->xconfigure.width);
524 setiv (height, xe->xconfigure.height);
525 setuv (above, xe->xconfigure.above);
526 break;
527 }
528
563 break; 529 break;
564 530
565 case ButtonPress: 531 case PropertyNotify:
566 case ButtonRelease: 532 setuv (window, xe->xproperty.window);
567 setiv (button, xe->xbutton.button); 533 setuv (atom, xe->xproperty.atom);
534 setuv (time, xe->xproperty.time);
535 setiv (state, xe->xproperty.state);
568 break; 536 break;
569 537
570 case MotionNotify: 538 case ClientMessage:
571 setiv (is_hint, xe->xmotion.is_hint); 539 setuv (window, xe->xclient.window);
540 setuv (message_type, xe->xclient.message_type);
541 setuv (format, xe->xclient.format);
542 setuv (l0, xe->xclient.data.l[0]);
543 setuv (l1, xe->xclient.data.l[1]);
544 setuv (l2, xe->xclient.data.l[2]);
545 setuv (l3, xe->xclient.data.l[3]);
546 setuv (l4, xe->xclient.data.l[4]);
572 break; 547 break;
573 } 548 }
574 549
575 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 550 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
576 } 551 }
617 else 592 else
618 event_consumed = false; 593 event_consumed = false;
619 594
620 // post-handling of some events 595 // post-handling of some events
621 if (htype == HOOK_REFRESH_BEGIN) 596 if (htype == HOOK_REFRESH_BEGIN)
622 swap_overlays (term); 597 {
598 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
599
600 for (int i = AvFILL (av); i >= 0; i--)
601 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
602 }
623 else if (htype == HOOK_DESTROY) 603 else if (htype == HOOK_DESTROY)
624 { 604 {
625 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
626 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
607
608 // don't allow further calls
609 term->perl.self = 0;
627 } 610 }
628 611
629 swap (perl_environ, environ); 612 swap (perl_environ, environ);
630 613
631 return event_consumed; 614 return event_consumed;
655# include "optinc.h" 638# include "optinc.h"
656# undef nodef 639# undef nodef
657# undef def 640# undef def
658 641
659 HV *stash = gv_stashpv ("urxvt", 1); 642 HV *stash = gv_stashpv ("urxvt", 1);
660 struct { 643 static const struct {
661 const char *name; 644 const char *name;
662 IV iv; 645 IV iv;
663 } *civ, const_iv[] = { 646 } *civ, const_iv[] = {
664# define const_iv(name) { # name, (IV)name } 647# define const_iv(name) { # name, (IV)name }
665 const_iv (DEFAULT_RSTYLE), 648 const_iv (DEFAULT_RSTYLE),
684 const_iv (Button3Mask), 667 const_iv (Button3Mask),
685 const_iv (Button4Mask), 668 const_iv (Button4Mask),
686 const_iv (Button5Mask), 669 const_iv (Button5Mask),
687 const_iv (AnyModifier), 670 const_iv (AnyModifier),
688 671
689 const_iv (EVENT_NONE), 672 const_iv (NoSymbol),
690 const_iv (EVENT_READ), 673 const_iv (GrabModeSync),
691 const_iv (EVENT_WRITE), 674 const_iv (GrabModeAsync),
692 675
693 const_iv (NoEventMask), 676 const_iv (NoEventMask),
694 const_iv (KeyPressMask), 677 const_iv (KeyPressMask),
695 const_iv (KeyReleaseMask), 678 const_iv (KeyReleaseMask),
696 const_iv (ButtonPressMask), 679 const_iv (ButtonPressMask),
748 const_iv (SelectionRequest), 731 const_iv (SelectionRequest),
749 const_iv (SelectionNotify), 732 const_iv (SelectionNotify),
750 const_iv (ColormapNotify), 733 const_iv (ColormapNotify),
751 const_iv (ClientMessage), 734 const_iv (ClientMessage),
752 const_iv (MappingNotify), 735 const_iv (MappingNotify),
736# if ENABLE_XIM_ONTHESPOT
737 const_iv (XIMReverse),
738 const_iv (XIMUnderline),
739 const_iv (XIMHighlight),
740 const_iv (XIMPrimary),
741 const_iv (XIMSecondary),
742 const_iv (XIMTertiary),
743 const_iv (XIMVisibleToForward),
744 const_iv (XIMVisibleToBackword),
745 const_iv (XIMVisibleToCenter),
746# if 0
747 const_iv (XIMForwardChar),
748 const_iv (XIMBackwardChar),
749 const_iv (XIMForwardWord),
750 const_iv (XIMBackwardWord),
751 const_iv (XIMCaretUp),
752 const_iv (XIMCaretDown),
753 const_iv (XIMNextLine),
754 const_iv (XIMPreviousLine),
755 const_iv (XIMLineStart),
756 const_iv (XIMLineEnd),
757 const_iv (XIMAbsolutePosition),
758 const_iv (XIMDontChange),
759# endif
760# endif
753 }; 761 };
754 762
755 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 763 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
756 civ-- > const_iv; )
757 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 764 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
758} 765}
759 766
760void 767void
761warn (const char *msg) 768warn (const char *msg)
771_exit (int status) 778_exit (int status)
772 779
773NV 780NV
774NOW () 781NOW ()
775 CODE: 782 CODE:
776 RETVAL = NOW; 783 RETVAL = ev::now ();
777 OUTPUT: 784 OUTPUT:
778 RETVAL 785 RETVAL
779 786
780int 787int
781GET_BASEFG (int rend) 788GET_BASEFG (int rend)
792 RETVAL 799 RETVAL
793 800
794int 801int
795SET_FGCOLOR (int rend, int new_color) 802SET_FGCOLOR (int rend, int new_color)
796 CODE: 803 CODE:
797 RETVAL = SET_FGCOLOR (rend, new_color); 804 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
798 OUTPUT: 805 OUTPUT:
799 RETVAL 806 RETVAL
800 807
801int 808int
802SET_BGCOLOR (int rend, int new_color) 809SET_BGCOLOR (int rend, int new_color)
803 CODE: 810 CODE:
804 RETVAL = SET_BGCOLOR (rend, new_color); 811 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
805 OUTPUT: 812 OUTPUT:
806 RETVAL 813 RETVAL
807 814
808int 815int
809GET_CUSTOM (int rend) 816GET_CUSTOM (int rend)
810 CODE: 817 CODE:
811 RETVAL = (rend && RS_customMask) >> RS_customShift; 818 RETVAL = (rend & RS_customMask) >> RS_customShift;
812 OUTPUT: 819 OUTPUT:
813 RETVAL 820 RETVAL
814 821
815int 822int
816SET_CUSTOM (int rend, int new_value) 823SET_CUSTOM (int rend, int new_value)
823 | ((new_value << RS_customShift) & RS_customMask); 830 | ((new_value << RS_customShift) & RS_customMask);
824} 831}
825 OUTPUT: 832 OUTPUT:
826 RETVAL 833 RETVAL
827 834
835void
836termlist ()
837 PPCODE:
838{
839 EXTEND (SP, rxvt_term::termlist.size ());
840
841 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
842 if ((*t)->perl.self)
843 PUSHs (sv_2mortal (newSVterm (*t)));
844}
845
828MODULE = urxvt PACKAGE = urxvt::term 846MODULE = urxvt PACKAGE = urxvt::term
829 847
830SV * 848SV *
831_new (...) 849_new (AV *env, AV *arg)
832 CODE: 850 CODE:
833{ 851{
834 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
835 croak ("first argument to urxvt::term->_new must be arrayref");
836
837 rxvt_term *term = new rxvt_term; 852 rxvt_term *term = new rxvt_term;
838 853
839 term->argv = new stringvec; 854 stringvec *argv = new stringvec;
840 term->envv = new stringvec; 855 stringvec *envv = new stringvec;
841 856
842 for (int i = 1; i < items; i++) 857 for (int i = 0; i <= AvFILL (arg); i++)
843 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 858 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
844 859
845 AV *envv = (AV *)SvRV (ST (0));
846 for (int i = av_len (envv) + 1; i--; ) 860 for (int i = AvFILL (env) + 1; i--; )
847 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 861 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
848 862
849 term->envv->push_back (0); 863 envv->push_back (0);
850
851 bool success;
852 864
853 try 865 try
854 { 866 {
855 success = term->init (term->argv->size (), term->argv->begin ()); 867 term->init (argv, envv);
856 } 868 }
857 catch (const class rxvt_failure_exception &e) 869 catch (const class rxvt_failure_exception &e)
858 {
859 success = false;
860 }
861
862 if (!success)
863 { 870 {
864 term->destroy (); 871 term->destroy ();
865 croak ("error while initializing new terminal instance"); 872 croak ("error while initializing new terminal instance");
866 } 873 }
867 874
872 RETVAL 879 RETVAL
873 880
874void 881void
875rxvt_term::destroy () 882rxvt_term::destroy ()
876 883
877#if ENABLE_PERL_FRILLS
878
879void
880rxvt_term::XListProperties (U32 window)
881 PPCODE:
882{
883 int count;
884 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
885
886 EXTEND (SP, count);
887 while (count--)
888 PUSHs (newSVuv ((U32)props [count]));
889
890 XFree (props);
891}
892
893void
894rxvt_term::XGetWindowProperty (U32 window, U32 property)
895 PPCODE:
896{
897 Atom type;
898 int format;
899 unsigned long nitems;
900 unsigned long bytes_after;
901 unsigned char *prop;
902 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
903 0, 1<<30, 0, AnyPropertyType,
904 &type, &format, &nitems, &bytes_after, &prop);
905 if (type != None)
906 {
907 EXTEND (SP, 3);
908 PUSHs (newSVuv ((U32)type));
909 PUSHs (newSViv (format));
910 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
911 XFree (prop);
912 }
913}
914
915void
916rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
917 CODE:
918{
919 STRLEN len;
920 char *data_ = SvPVbyte (data, len);
921
922 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
923 type, format, PropModeReplace,
924 (unsigned char *)data, len * 8 / format);
925}
926
927void
928rxvt_term::XDeleteProperty (U32 window, U32 property)
929 CODE:
930 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
931
932U32
933rxvt_term::DefaultRootWindow ()
934 CODE:
935 RETVAL = (U32)THIS->display->root;
936 OUTPUT:
937 RETVAL
938
939U32
940rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
941 CODE:
942 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
943 x, y, width, height, 0,
944 THIS->pix_colors_focused[Color_border],
945 THIS->pix_colors_focused[Color_border]);
946 OUTPUT:
947 RETVAL
948
949void
950rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
951 CODE:
952 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
953
954void
955rxvt_term::XMapWindow (U32 window)
956 CODE:
957 XMapWindow (THIS->display->display, (Window)window);
958
959void
960rxvt_term::XUnmapWindow (U32 window)
961 CODE:
962 XUnmapWindow (THIS->display->display, (Window)window);
963
964#endif
965
966void 884void
967rxvt_term::set_should_invoke (int htype, int inc) 885rxvt_term::set_should_invoke (int htype, int inc)
968 CODE: 886 CODE:
969 THIS->perl.should_invoke [htype] += inc; 887 THIS->perl.should_invoke [htype] += inc;
970 888
971void 889int
972rxvt_term::grab_button (int button, U32 modifiers) 890rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
973 CODE: 891 CODE:
974 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 892 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
975 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 893 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
976 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 894 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
895 OUTPUT: RETVAL
896
897int
898rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
899 CODE:
900 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
901 OUTPUT: RETVAL
902
903void
904rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
905 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
906 CODE:
907 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
908
909void
910rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
911 CODE:
912 XUngrabKey (THIS->dpy, keycode, modifiers, window);
913
914void
915rxvt_term::XUngrabKeyboard (Time eventtime)
916 CODE:
917 XUngrabKeyboard (THIS->dpy, eventtime);
977 918
978bool 919bool
979rxvt_term::grab (U32 eventtime, int sync = 0) 920rxvt_term::grab (Time eventtime, int sync = 0)
980 CODE: 921 CODE:
981{ 922{
982 int mode = sync ? GrabModeSync : GrabModeAsync; 923 int mode = sync ? GrabModeSync : GrabModeAsync;
983 924
984 THIS->perl.grabtime = 0; 925 THIS->perl.grabtime = 0;
985 926
986 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 927 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
987 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 928 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
988 mode, mode, None, GRAB_CURSOR, eventtime)) 929 mode, mode, None, GRAB_CURSOR, eventtime))
989 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 930 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
990 THIS->perl.grabtime = eventtime; 931 THIS->perl.grabtime = eventtime;
991 else 932 else
992 XUngrabPointer (THIS->display->display, eventtime); 933 XUngrabPointer (THIS->dpy, eventtime);
993 934
994 RETVAL = !!THIS->perl.grabtime; 935 RETVAL = !!THIS->perl.grabtime;
995} 936}
996 OUTPUT: 937 OUTPUT:
997 RETVAL 938 RETVAL
998 939
999void 940void
1000rxvt_term::allow_events_async () 941rxvt_term::allow_events_async ()
1001 CODE: 942 CODE:
1002 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 943 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1003 944
1004void 945void
1005rxvt_term::allow_events_sync () 946rxvt_term::allow_events_sync ()
1006 CODE: 947 CODE:
1007 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 948 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1008 949
1009void 950void
1010rxvt_term::allow_events_replay () 951rxvt_term::allow_events_replay ()
1011 CODE: 952 CODE:
1012 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 953 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1013 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 954 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1014 955
1015void 956void
1016rxvt_term::ungrab () 957rxvt_term::ungrab ()
1017 CODE: 958 CODE:
1018 ungrab (THIS); 959 ungrab (THIS);
960
961int
962rxvt_term::XStringToKeysym (char *string)
963 CODE:
964 RETVAL = XStringToKeysym (string);
965 OUTPUT: RETVAL
966
967char *
968rxvt_term::XKeysymToString (int sym)
969 CODE:
970 RETVAL = XKeysymToString (sym);
971 OUTPUT: RETVAL
972
973int
974rxvt_term::XKeysymToKeycode (int sym)
975 CODE:
976 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
977 OUTPUT: RETVAL
978
979int
980rxvt_term::XKeycodeToKeysym (int code, int index)
981 CODE:
982 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
983 OUTPUT: RETVAL
1019 984
1020int 985int
1021rxvt_term::strwidth (SV *str) 986rxvt_term::strwidth (SV *str)
1022 CODE: 987 CODE:
1023{ 988{
1024 wchar_t *wstr = sv2wcs (str); 989 wchar_t *wstr = sv2wcs (str);
1025 990
1026 rxvt_push_locale (THIS->locale); 991 rxvt_push_locale (THIS->locale);
1027 RETVAL = wcswidth (wstr, wcslen (wstr)); 992 RETVAL = 0;
993 for (wchar_t *wc = wstr; *wc; wc++)
994 {
995 int w = WCWIDTH (*wc);
996
997 if (w)
998 RETVAL += max (w, 1);
999 }
1028 rxvt_pop_locale (); 1000 rxvt_pop_locale ();
1029 1001
1030 free (wstr); 1002 free (wstr);
1031} 1003}
1032 OUTPUT: 1004 OUTPUT:
1062 rxvt_pop_locale (); 1034 rxvt_pop_locale ();
1063 1035
1064 RETVAL = wcs2sv (wstr); 1036 RETVAL = wcs2sv (wstr);
1065 free (wstr); 1037 free (wstr);
1066} 1038}
1039 OUTPUT:
1040 RETVAL
1041
1042char *
1043rxvt_term::locale ()
1044 CODE:
1045 RETVAL = THIS->locale;
1067 OUTPUT: 1046 OUTPUT:
1068 RETVAL 1047 RETVAL
1069 1048
1070#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1049#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1071 1050
1076#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1055#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1077#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1056#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1078#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1057#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1079#define TERM_OFFSET_focus TERM_OFFSET(focus) 1058#define TERM_OFFSET_focus TERM_OFFSET(focus)
1080#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1059#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1060#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1061#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1062#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1081#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1063#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1082#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1064#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1083#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1065#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1084 1066
1085int 1067int
1092 fbase = TERM_OFFSET_fbase 1074 fbase = TERM_OFFSET_fbase
1093 nrow = TERM_OFFSET_nrow 1075 nrow = TERM_OFFSET_nrow
1094 ncol = TERM_OFFSET_ncol 1076 ncol = TERM_OFFSET_ncol
1095 focus = TERM_OFFSET_focus 1077 focus = TERM_OFFSET_focus
1096 mapped = TERM_OFFSET_mapped 1078 mapped = TERM_OFFSET_mapped
1079 int_bwidth = TERM_OFFSET_int_bwidth
1080 ext_bwidth = TERM_OFFSET_ext_bwidth
1081 lineSpace = TERM_OFFSET_lineSpace
1097 saveLines = TERM_OFFSET_saveLines 1082 saveLines = TERM_OFFSET_saveLines
1098 total_rows = TERM_OFFSET_total_rows 1083 total_rows = TERM_OFFSET_total_rows
1099 top_row = TERM_OFFSET_top_row 1084 top_row = TERM_OFFSET_top_row
1100 CODE: 1085 CODE:
1101 RETVAL = *(int *)((char *)THIS + ix); 1086 RETVAL = *(int *)((char *)THIS + ix);
1106rxvt_term::ModLevel3Mask () 1091rxvt_term::ModLevel3Mask ()
1107 ALIAS: 1092 ALIAS:
1108 ModLevel3Mask = 0 1093 ModLevel3Mask = 0
1109 ModMetaMask = 1 1094 ModMetaMask = 1
1110 ModNumLockMask = 2 1095 ModNumLockMask = 2
1096 current_screen = 3
1097 hidden_cursor = 4
1111 CODE: 1098 CODE:
1112 switch (ix) 1099 switch (ix)
1113 { 1100 {
1114 case 0: RETVAL = THIS->ModLevel3Mask; break; 1101 case 0: RETVAL = THIS->ModLevel3Mask; break;
1115 case 1: RETVAL = THIS->ModMetaMask; break; 1102 case 1: RETVAL = THIS->ModMetaMask; break;
1116 case 2: RETVAL = THIS->ModNumLockMask; break; 1103 case 2: RETVAL = THIS->ModNumLockMask; break;
1104 case 3: RETVAL = THIS->current_screen; break;
1105 case 4: RETVAL = THIS->hidden_cursor; break;
1117 } 1106 }
1118 OUTPUT: 1107 OUTPUT:
1119 RETVAL 1108 RETVAL
1120 1109
1121char * 1110char *
1131 } 1120 }
1132 OUTPUT: 1121 OUTPUT:
1133 RETVAL 1122 RETVAL
1134 1123
1135SV * 1124SV *
1136rxvt_term::_env () 1125rxvt_term::envv ()
1126 ALIAS:
1127 argv = 1
1137 CODE: 1128 PPCODE:
1138{ 1129{
1139 if (THIS->envv) 1130 stringvec *vec = ix ? THIS->argv : THIS->envv;
1140 {
1141 AV *av = newAV ();
1142 1131
1132 EXTEND (SP, vec->size ());
1133
1143 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1134 for (char **i = vec->begin (); i != vec->end (); ++i)
1144 if (*i) 1135 if (*i)
1145 av_push (av, newSVpv (*i, 0)); 1136 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1146
1147 RETVAL = newRV_noinc ((SV *)av);
1148 }
1149 else
1150 RETVAL = &PL_sv_undef;
1151} 1137}
1152 OUTPUT:
1153 RETVAL
1154 1138
1155int 1139int
1156rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1140rxvt_term::pty_ev_events (int events = ev::UNDEF)
1157 CODE: 1141 CODE:
1158 RETVAL = THIS->pty_ev.events; 1142 RETVAL = THIS->pty_ev.events;
1159 if (events != EVENT_UNDEF) 1143 if (events != ev::UNDEF)
1160 THIS->pty_ev.set (events); 1144 THIS->pty_ev.set (events);
1161 OUTPUT: 1145 OUTPUT:
1162 RETVAL 1146 RETVAL
1163 1147
1164U32 1148int
1149rxvt_term::pty_fd ()
1150 CODE:
1151 RETVAL = THIS->pty->pty;
1152 OUTPUT:
1153 RETVAL
1154
1155Window
1165rxvt_term::parent () 1156rxvt_term::parent ()
1166 CODE: 1157 CODE:
1167 RETVAL = (U32)THIS->parent [0]; 1158 RETVAL = THIS->parent [0];
1168 OUTPUT: 1159 OUTPUT:
1169 RETVAL 1160 RETVAL
1170 1161
1171U32 1162Window
1172rxvt_term::vt () 1163rxvt_term::vt ()
1173 CODE: 1164 CODE:
1174 RETVAL = (U32)THIS->vt; 1165 RETVAL = THIS->vt;
1175 OUTPUT: 1166 OUTPUT:
1176 RETVAL 1167 RETVAL
1177 1168
1178void 1169void
1179rxvt_term::vt_emask_add (U32 emask) 1170rxvt_term::vt_emask_add (U32 emask)
1201} 1192}
1202 OUTPUT: 1193 OUTPUT:
1203 RETVAL 1194 RETVAL
1204 1195
1205void 1196void
1197rxvt_term::focus_in ()
1198
1199void
1200rxvt_term::focus_out ()
1201
1202void
1203rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1204 ALIAS:
1205 key_release = 1
1206 CODE:
1207{
1208 XKeyEvent xkey;
1209
1210 memset (&xkey, 0, sizeof (xkey));
1211
1212 xkey.time = time;
1213 xkey.state = state;
1214 xkey.keycode = keycode;
1215
1216 xkey.type = ix ? KeyRelease : KeyPress;
1217 xkey.display = THIS->dpy;
1218 xkey.window = THIS->vt;
1219 xkey.root = THIS->display->root;
1220 xkey.subwindow = THIS->vt;
1221
1222 if (ix)
1223 THIS->key_release (xkey);
1224 else
1225 THIS->key_press (xkey);
1226}
1227
1228void
1206rxvt_term::want_refresh () 1229rxvt_term::want_refresh ()
1207 CODE: 1230 CODE:
1208 THIS->want_refresh = 1; 1231 THIS->want_refresh = 1;
1232 THIS->refresh_check ();
1209 1233
1210void 1234void
1211rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1235rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1212 PPCODE: 1236 PPCODE:
1213{ 1237{
1216 1240
1217 line_t &l = ROW(row_number); 1241 line_t &l = ROW(row_number);
1218 1242
1219 if (GIMME_V != G_VOID) 1243 if (GIMME_V != G_VOID)
1220 { 1244 {
1221 wchar_t *wstr = new wchar_t [THIS->ncol]; 1245 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1222 1246
1223 for (int col = 0; col < THIS->ncol; col++) 1247 for (int col = 0; col < THIS->ncol; col++)
1224 wstr [col] = l.t [col]; 1248 wstr [col] = l.t [col];
1225 1249
1226 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1250 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1227
1228 delete [] wstr;
1229 } 1251 }
1230 1252
1231 if (new_text) 1253 if (new_text)
1232 { 1254 {
1233 wchar_t *wstr = sv2wcs (new_text); 1255 wchar_t *wstr = sv2wcs (new_text);
1234 1256
1235 int len = min (wcslen (wstr) - start_ofs, max_len); 1257 int len = min (wcslen (wstr) - start_ofs, max_len);
1236 1258
1237 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1259 if (start_col < 0 || start_col + len > THIS->ncol)
1238 { 1260 {
1239 free (wstr); 1261 free (wstr);
1240 croak ("new_text extends beyond horizontal margins"); 1262 croak ("new_text extends beyond horizontal margins");
1241 } 1263 }
1242 1264
1274 { 1296 {
1275 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1297 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1276 croak ("new_rend must be arrayref"); 1298 croak ("new_rend must be arrayref");
1277 1299
1278 AV *av = (AV *)SvRV (new_rend); 1300 AV *av = (AV *)SvRV (new_rend);
1279 int len = min (av_len (av) + 1 - start_ofs, max_len); 1301 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1280 1302
1281 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1303 if (start_col < 0 || start_col + len > THIS->ncol)
1282 croak ("new_rend array extends beyond horizontal margins"); 1304 croak ("new_rend array extends beyond horizontal margins");
1283 1305
1284 for (int col = start_col; col < start_col + len; col++) 1306 for (int col = start_col; col < start_col + len; col++)
1285 { 1307 {
1286 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1308 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1326rxvt_term::special_encode (SV *string) 1348rxvt_term::special_encode (SV *string)
1327 CODE: 1349 CODE:
1328{ 1350{
1329 wchar_t *wstr = sv2wcs (string); 1351 wchar_t *wstr = sv2wcs (string);
1330 int wlen = wcslen (wstr); 1352 int wlen = wcslen (wstr);
1331 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1353 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1332 1354
1333 rxvt_push_locale (THIS->locale); 1355 rxvt_push_locale (THIS->locale);
1334 1356
1335 wchar_t *r = rstr; 1357 wchar_t *r = rstr;
1336 for (wchar_t *s = wstr; *s; s++) 1358 for (wchar_t *s = wstr; *s; s++)
1359 {
1360 int w = WCWIDTH (*s);
1361
1337 if (wcwidth (*s) == 0) 1362 if (w == 0)
1338 { 1363 {
1339 if (r == rstr) 1364 if (r == rstr)
1340 croak ("leading combining character unencodable"); 1365 croak ("leading combining character unencodable");
1341 1366
1342 unicode_t n = rxvt_compose (r[-1], *s); 1367 unicode_t n = rxvt_compose (r[-1], *s);
1343 if (n == NOCHAR) 1368 if (n == NOCHAR)
1344 n = rxvt_composite.compose (r[-1], *s); 1369 n = rxvt_composite.compose (r[-1], *s);
1345 1370
1346 r[-1] = n; 1371 r[-1] = n;
1347 } 1372 }
1348#if !UNICODE_3 1373#if !UNICODE_3
1349 else if (*s >= 0x10000) 1374 else if (*s >= 0x10000)
1350 *r++ = rxvt_composite.compose (*s); 1375 *r++ = rxvt_composite.compose (*s);
1351#endif 1376#endif
1352 else 1377 else
1353 *r++ = *s; 1378 *r++ = *s;
1379
1380 // the *2 above only allows wcwidth <= 2
1381 if (w > 1)
1382 *r++ = NOCHAR;
1383 }
1354 1384
1355 rxvt_pop_locale (); 1385 rxvt_pop_locale ();
1356 1386
1357 RETVAL = wcs2sv (rstr, r - rstr); 1387 RETVAL = wcs2sv (rstr, r - rstr);
1358
1359 delete [] rstr;
1360} 1388}
1361 OUTPUT: 1389 OUTPUT:
1362 RETVAL 1390 RETVAL
1363 1391
1364SV * 1392SV *
1365rxvt_term::special_decode (SV *text) 1393rxvt_term::special_decode (SV *text)
1366 CODE: 1394 CODE:
1367{ 1395{
1368 wchar_t *wstr = sv2wcs (text); 1396 wchar_t *wstr = sv2wcs (text);
1369 int wlen = wcslen (wstr);
1370 int dlen = 0; 1397 int dlen = 0;
1371 1398
1372 // find length 1399 // find length
1373 for (wchar_t *s = wstr; *s; s++) 1400 for (wchar_t *s = wstr; *s; s++)
1374 if (*s == NOCHAR) 1401 if (*s == NOCHAR)
1376 else if (IS_COMPOSE (*s)) 1403 else if (IS_COMPOSE (*s))
1377 dlen += rxvt_composite.expand (*s, 0); 1404 dlen += rxvt_composite.expand (*s, 0);
1378 else 1405 else
1379 dlen++; 1406 dlen++;
1380 1407
1381 wchar_t *rstr = new wchar_t [dlen]; 1408 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1382 1409
1383 // decode 1410 // decode
1384 wchar_t *r = rstr; 1411 wchar_t *r = rstr;
1385 for (wchar_t *s = wstr; *s; s++) 1412 for (wchar_t *s = wstr; *s; s++)
1386 if (*s == NOCHAR) 1413 if (*s == NOCHAR)
1389 r += rxvt_composite.expand (*s, r); 1416 r += rxvt_composite.expand (*s, r);
1390 else 1417 else
1391 *r++ = *s; 1418 *r++ = *s;
1392 1419
1393 RETVAL = wcs2sv (rstr, r - rstr); 1420 RETVAL = wcs2sv (rstr, r - rstr);
1394
1395 delete [] rstr;
1396} 1421}
1397 OUTPUT: 1422 OUTPUT:
1398 RETVAL 1423 RETVAL
1399 1424
1400void 1425void
1401rxvt_term::_resource (char *name, int index, SV *newval = 0) 1426rxvt_term::_resource (char *name, int index, SV *newval = 0)
1402 PPCODE: 1427 PPCODE:
1403{ 1428{
1404 struct resval { const char *name; int value; } rslist [] = { 1429 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1405# define def(name) { # name, Rs_ ## name }, 1430# define def(name) { # name, Rs_ ## name },
1406# define reserve(name,count) 1431# define reserve(name,count)
1407# include "rsinc.h" 1432# include "rsinc.h"
1408# undef def 1433# undef def
1409# undef reserve 1434# undef reserve
1410 }; 1435 };
1411 1436
1412 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1437 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1413 1438
1414 do { 1439 do {
1415 if (rs-- == rslist) 1440 if (rs-- == rslist)
1416 croak ("no such resource '%s', requested", name); 1441 croak ("no such resource '%s', requested", name);
1417 } while (strcmp (name, rs->name)); 1442 } while (strcmp (name, rs->name));
1439 1464
1440const char * 1465const char *
1441rxvt_term::x_resource (const char *name) 1466rxvt_term::x_resource (const char *name)
1442 1467
1443bool 1468bool
1444rxvt_term::option (U32 optval, int set = -1) 1469rxvt_term::option (U8 optval, int set = -1)
1445 CODE: 1470 CODE:
1446{ 1471{
1447 RETVAL = THIS->options & optval; 1472 RETVAL = THIS->option (optval);
1448 1473
1449 if (set >= 0) 1474 if (set >= 0)
1450 { 1475 {
1451 if (set)
1452 THIS->options |= optval; 1476 THIS->set_option (optval, set);
1453 else
1454 THIS->options &= ~optval;
1455 1477
1478 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1456 switch (optval) 1479 switch (optval)
1457 { 1480 {
1458 case Opt_skipBuiltinGlyphs: 1481 case Opt_skipBuiltinGlyphs:
1459 THIS->set_fonts (); 1482 THIS->set_fonts ();
1460 THIS->scr_remap_chars (); 1483 THIS->scr_remap_chars ();
1461 THIS->scr_touch (true); 1484 THIS->scr_touch (true);
1462 THIS->want_refresh = 1; 1485 THIS->want_refresh = 1;
1486 THIS->refresh_check ();
1463 break; 1487 break;
1464 1488
1465 case Opt_cursorUnderline: 1489 case Opt_cursorUnderline:
1466 THIS->want_refresh = 1; 1490 THIS->want_refresh = 1;
1491 THIS->refresh_check ();
1467 break; 1492 break;
1468 1493
1469# case Opt_scrollBar_floating: 1494# case Opt_scrollBar_floating:
1470# case Opt_scrollBar_right: 1495# case Opt_scrollBar_right:
1471# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1496# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1472# break; 1497# break;
1473 } 1498 }
1474 } 1499 }
1475} 1500}
1476 OUTPUT: 1501 OUTPUT:
1477 RETVAL 1502 RETVAL
1478 1503
1506 PUSHs (sv_2mortal (newSViv (rc.col))); 1531 PUSHs (sv_2mortal (newSViv (rc.col)));
1507 } 1532 }
1508 1533
1509 if (items == 3) 1534 if (items == 3)
1510 { 1535 {
1536 rc.row = SvIV (ST (1));
1537 rc.col = SvIV (ST (2));
1538
1539 if (ix == 2)
1540 {
1541 if (rc.col == 0)
1542 {
1543 // col == 0 means end of previous line
1544 rc.row--;
1545 rc.col = THIS->ncol;
1546 }
1547 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1548 && rc.col > ROW(rc.row).l)
1549 {
1550 // col >= length means while line and add newline
1551 rc.col = THIS->ncol;
1552 }
1553 }
1554
1555 clamp_it (rc.col, 0, THIS->ncol);
1511 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1); 1556 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1512 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1513 1557
1514 if (ix) 1558 if (ix)
1559 {
1515 THIS->want_refresh = 1; 1560 THIS->want_refresh = 1;
1561 THIS->refresh_check ();
1562 }
1516 } 1563 }
1517} 1564}
1518 1565
1519char 1566char
1520rxvt_term::cur_charset () 1567rxvt_term::cur_charset ()
1521 CODE: 1568 CODE:
1522 RETVAL = THIS->charsets [THIS->screen.charset]; 1569 RETVAL = THIS->charsets [THIS->screen.charset];
1523 OUTPUT: 1570 OUTPUT:
1524 RETVAL 1571 RETVAL
1525 1572
1526#void 1573void
1527#rxvt_term::selection_clear () 1574rxvt_term::selection_clear ()
1528 1575
1529void 1576void
1530rxvt_term::selection_make (U32 eventtime, bool rect = false) 1577rxvt_term::selection_make (Time eventtime, bool rect = false)
1531 CODE: 1578 CODE:
1532 THIS->selection.op = SELECTION_CONT; 1579 THIS->selection.op = SELECTION_CONT;
1533 THIS->selection.rect = rect; 1580 THIS->selection.rect = rect;
1534 THIS->selection_make (eventtime); 1581 THIS->selection_make (eventtime);
1535 1582
1536int 1583int
1537rxvt_term::selection_grab (U32 eventtime) 1584rxvt_term::selection_grab (Time eventtime)
1538 1585
1539void 1586void
1540rxvt_term::selection (SV *newtext = 0) 1587rxvt_term::selection (SV *newtext = 0)
1541 PPCODE: 1588 PPCODE:
1542{ 1589{
1560void 1607void
1561rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1608rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1562 1609
1563void 1610void
1564rxvt_term::scr_bell () 1611rxvt_term::scr_bell ()
1612
1613void
1614rxvt_term::scr_change_screen (int screen)
1565 1615
1566void 1616void
1567rxvt_term::scr_add_lines (SV *string) 1617rxvt_term::scr_add_lines (SV *string)
1568 CODE: 1618 CODE:
1569{ 1619{
1610 o->self = (HV *)SvRV (RETVAL); 1660 o->self = (HV *)SvRV (RETVAL);
1611} 1661}
1612 OUTPUT: 1662 OUTPUT:
1613 RETVAL 1663 RETVAL
1614 1664
1665#############################################################################
1666# Various X Utility Functions
1667#############################################################################
1668
1669void
1670rxvt_term::XListProperties (Window window)
1671 PPCODE:
1672{
1673 int count;
1674 Atom *props = XListProperties (THIS->dpy, window, &count);
1675
1676 EXTEND (SP, count);
1677 while (count--)
1678 PUSHs (newSVuv ((U32)props [count]));
1679
1680 XFree (props);
1681}
1682
1683void
1684rxvt_term::XGetWindowProperty (Window window, Atom property)
1685 PPCODE:
1686{
1687 Atom type;
1688 int format;
1689 unsigned long nitems;
1690 unsigned long bytes_after;
1691 unsigned char *prop;
1692
1693 XGetWindowProperty (THIS->dpy, window, property,
1694 0, 1<<24, 0, AnyPropertyType,
1695 &type, &format, &nitems, &bytes_after, &prop);
1696
1697 if (type != None)
1698 {
1699 int elemsize = format == 16 ? sizeof (short)
1700 : format == 32 ? sizeof (long)
1701 : 1;
1702
1703 EXTEND (SP, 3);
1704 PUSHs (newSVuv ((U32)type));
1705 PUSHs (newSViv (format));
1706 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1707 XFree (prop);
1708 }
1709}
1710
1711void
1712rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1713 CODE:
1714{
1715 STRLEN len;
1716 char *data_ = SvPVbyte (data, len);
1717
1718 int elemsize = format == 16 ? sizeof (short)
1719 : format == 32 ? sizeof (long)
1720 : 1;
1721
1722 XChangeProperty (THIS->dpy, window, property,
1723 type, format, PropModeReplace,
1724 (unsigned char *)data_, len / elemsize);
1725}
1726
1727Atom
1728XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1729 C_ARGS: term->dpy, atom_name, only_if_exists
1730
1731char *
1732XGetAtomName (rxvt_term *term, Atom atom)
1733 C_ARGS: term->dpy, atom
1734 CLEANUP:
1735 XFree (RETVAL);
1736
1737void
1738XDeleteProperty (rxvt_term *term, Window window, Atom property)
1739 C_ARGS: term->dpy, window, property
1740
1741Window
1742rxvt_term::DefaultRootWindow ()
1743 CODE:
1744 RETVAL = THIS->display->root;
1745 OUTPUT:
1746 RETVAL
1747
1748#if 0
1749
1750Window
1751XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1752 C_ARGS: term->dpy, (Window)parent,
1753 x, y, width, height, 0,
1754 term->pix_colors_focused[Color_border],
1755 term->pix_colors_focused[Color_border]
1756
1757#endif
1758
1759void
1760XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1761 C_ARGS: term->dpy, window, parent, x, y
1762
1763void
1764XMapWindow (rxvt_term *term, Window window)
1765 C_ARGS: term->dpy, window
1766
1767void
1768XUnmapWindow (rxvt_term *term, Window window)
1769 C_ARGS: term->dpy, window
1770
1771void
1772XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1773 C_ARGS: term->dpy, window, x, y, width, height
1774
1775void
1776rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1777 CODE:
1778{
1779 XWindowAttributes attr;
1780 XGetWindowAttributes (THIS->dpy, window, &attr);
1781 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1782}
1783
1784void
1785rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1786 PPCODE:
1787{
1788 int dx, dy;
1789 Window child;
1790
1791 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1792 {
1793 EXTEND (SP, 3);
1794 PUSHs (newSViv (dx));
1795 PUSHs (newSViv (dy));
1796 PUSHs (newSVuv (child));
1797 }
1798}
1799
1800#############################################################################
1801# urxvt::overlay
1802#############################################################################
1803
1615MODULE = urxvt PACKAGE = urxvt::overlay 1804MODULE = urxvt PACKAGE = urxvt::overlay
1616 1805
1617void 1806void
1618overlay::set (int x, int y, SV *text, SV *rend = 0) 1807overlay::set (int x, int y, SV *text, SV *rend = 0)
1619 1808
1624overlay::hide () 1813overlay::hide ()
1625 1814
1626void 1815void
1627overlay::DESTROY () 1816overlay::DESTROY ()
1628 1817
1629MODULE = urxvt PACKAGE = urxvt::timer 1818INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1630 1819
1631SV *
1632timer::new ()
1633 CODE:
1634 timer *w = new timer;
1635 w->start (NOW);
1636 RETVAL = newSVptr ((void *)w, "urxvt::timer");
1637 w->self = (HV *)SvRV (RETVAL);
1638 OUTPUT:
1639 RETVAL
1640
1641timer *
1642timer::cb (SV *cb)
1643 CODE:
1644 THIS->cb (cb);
1645 RETVAL = THIS;
1646 OUTPUT:
1647 RETVAL
1648
1649NV
1650timer::at ()
1651 CODE:
1652 RETVAL = THIS->at;
1653 OUTPUT:
1654 RETVAL
1655
1656timer *
1657timer::interval (NV interval)
1658 CODE:
1659 THIS->interval = interval;
1660 RETVAL = THIS;
1661 OUTPUT:
1662 RETVAL
1663
1664timer *
1665timer::set (NV tstamp)
1666 CODE:
1667 THIS->set (tstamp);
1668 RETVAL = THIS;
1669 OUTPUT:
1670 RETVAL
1671
1672timer *
1673timer::start (NV tstamp = THIS->at)
1674 CODE:
1675 THIS->start (tstamp);
1676 RETVAL = THIS;
1677 OUTPUT:
1678 RETVAL
1679
1680timer *
1681timer::stop ()
1682 CODE:
1683 THIS->stop ();
1684 RETVAL = THIS;
1685 OUTPUT:
1686 RETVAL
1687
1688void
1689timer::DESTROY ()
1690
1691MODULE = urxvt PACKAGE = urxvt::iow
1692
1693SV *
1694iow::new ()
1695 CODE:
1696 iow *w = new iow;
1697 RETVAL = newSVptr ((void *)w, "urxvt::iow");
1698 w->self = (HV *)SvRV (RETVAL);
1699 OUTPUT:
1700 RETVAL
1701
1702iow *
1703iow::cb (SV *cb)
1704 CODE:
1705 THIS->cb (cb);
1706 RETVAL = THIS;
1707 OUTPUT:
1708 RETVAL
1709
1710iow *
1711iow::fd (int fd)
1712 CODE:
1713 THIS->fd = fd;
1714 RETVAL = THIS;
1715 OUTPUT:
1716 RETVAL
1717
1718iow *
1719iow::events (short events)
1720 CODE:
1721 THIS->events = events;
1722 RETVAL = THIS;
1723 OUTPUT:
1724 RETVAL
1725
1726iow *
1727iow::start ()
1728 CODE:
1729 THIS->start ();
1730 RETVAL = THIS;
1731 OUTPUT:
1732 RETVAL
1733
1734iow *
1735iow::stop ()
1736 CODE:
1737 THIS->stop ();
1738 RETVAL = THIS;
1739 OUTPUT:
1740 RETVAL
1741
1742void
1743iow::DESTROY ()
1744
1745

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines