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.83 by root, Fri Jan 20 15:40:39 2006 UTC vs.
Revision 1.127 by root, Sat May 30 08:51:23 2009 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
85//TODO: use magic
86static SV *
87newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
88{ 75{
89 HV *hv = newHV (); 76 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 77 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 78 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); 100 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 101
115 return (long)mg->mg_ptr; 102 return (long)mg->mg_ptr;
116} 103}
117 104
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 105#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 106#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 107
121///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
122 109
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
124 111
125struct perl_watcher 112class overlay : overlay_base
126{ 113{
127 SV *cbsv; 114 rxvt_term *THIS;
115 AV *overlay_av;
116 int border;
117
118public:
128 HV *self; 119 HV *self;
129
130 perl_watcher ()
131 : cbsv (0)
132 {
133 }
134
135 ~perl_watcher ()
136 {
137 SvREFCNT_dec (cbsv);
138 }
139
140 void cb (SV *cb)
141 {
142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
144 }
145
146 void invoke (const char *type, SV *self, int arg = -1);
147};
148
149void
150perl_watcher::invoke (const char *type, SV *self, int arg)
151{
152 dSP;
153
154 ENTER;
155 SAVETMPS;
156
157 PUSHMARK (SP);
158
159 XPUSHs (sv_2mortal (self));
160
161 if (arg >= 0)
162 XPUSHs (sv_2mortal (newSViv (arg)));
163
164 PUTBACK;
165 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
166 SPAGAIN;
167
168 PUTBACK;
169 FREETMPS;
170 LEAVE;
171
172 if (SvTRUE (ERRSV))
173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
174}
175
176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
178
179struct timer : perl_watcher, time_watcher
180{
181 tstamp interval;
182
183 timer ()
184 : time_watcher (this, &timer::execute)
185 {
186 }
187
188 void execute (time_watcher &w)
189 {
190 if (interval)
191 start (at + interval);
192
193 invoke ("urxvt::timer", newSVtimer (this));
194 }
195};
196
197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
199
200struct iow : perl_watcher, io_watcher
201{
202 iow ()
203 : io_watcher (this, &iow::execute)
204 {
205 }
206
207 void execute (io_watcher &w, short revents)
208 {
209 invoke ("urxvt::iow", newSViow (this), revents);
210 }
211};
212
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
215
216struct iw : perl_watcher, idle_watcher
217{
218 iw ()
219 : idle_watcher (this, &iw::execute)
220 {
221 }
222
223 void execute (idle_watcher &w)
224 {
225 invoke ("urxvt::iw", newSViw (this));
226 }
227};
228
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
231
232struct pw : perl_watcher, child_watcher
233{
234 pw ()
235 : child_watcher (this, &pw::execute)
236 {
237 }
238
239 void execute (child_watcher &w, int status)
240 {
241 invoke ("urxvt::pw", newSVpw (this), status);
242 }
243};
244
245/////////////////////////////////////////////////////////////////////////////
246
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248
249struct overlay {
250 HV *self;
251 bool visible;
252 rxvt_term *THIS;
253 int x, y, w, h;
254 int border;
255 text_t **text;
256 rend_t **rend;
257 120
258 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 121 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
259 ~overlay (); 122 ~overlay ();
260 123
261 void show (); 124 void show ();
265 128
266 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
267}; 130};
268 131
269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 132overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
270: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false) 133: THIS(THIS), border(border == 2), overlay_av (0)
271{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
140 if (w < 0) w = 0;
141 if (h < 0) h = 0;
142
272 if (border == 2) 143 if (border == 2)
273 { 144 {
274 w += 2; 145 w += 2;
275 h += 2; 146 h += 2;
276 } 147 }
314 *rp++ = r; 185 *rp++ = r;
315 } 186 }
316 } 187 }
317 188
318 show (); 189 show ();
319 THIS->want_refresh = 1;
320} 190}
321 191
322overlay::~overlay () 192overlay::~overlay ()
323{ 193{
324 hide (); 194 hide ();
329 delete [] rend[y]; 199 delete [] rend[y];
330 } 200 }
331 201
332 delete [] text; 202 delete [] text;
333 delete [] rend; 203 delete [] rend;
204}
205
206void
207overlay::show ()
208{
209 if (overlay_av)
210 return;
211
212 overlay_av = (AV *)SvREFCNT_inc (SvRV (
213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
214 ));
215 av_push (overlay_av, newSViv ((long)this));
334 216
335 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
336} 219}
337 220
338void 221void
339overlay::show () 222overlay::hide ()
340{ 223{
341 if (visible) 224 if (!overlay_av)
342 return; 225 return;
343 226
344 visible = true;
345
346 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
347 av_push (av, newSViv ((long)this));
348}
349
350void
351overlay::hide ()
352{
353 if (!visible)
354 return;
355
356 visible = false;
357
358 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
359
360 int i; 227 int i;
361 228
362 for (i = AvFILL (av); i >= 0; i--) 229 for (i = AvFILL (overlay_av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this) 230 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364 {
365 av_delete (av, i, G_DISCARD);
366 break; 231 break;
367 }
368 232
369 for (; i < AvFILL (av); i++) 233 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 234 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 235
372 av_pop (av); 236 av_pop (overlay_av);
237
238 SvREFCNT_dec (overlay_av);
239 overlay_av = 0;
240
241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
373} 243}
374 244
375void overlay::swap () 245void overlay::swap ()
376{ 246{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 247 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
378 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 248 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
379 249
380 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
381 int ov_h = min (h, THIS->nrow - ov_y); 251 int ov_h = min (h, THIS->nrow - ov_y);
252
253 // hide cursor if it is within the overlay area
254 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
255 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
256 THIS->screen.flags &= ~Screen_VisibleCursor;
382 257
383 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
384 { 259 {
385 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
386 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
422 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
423 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
424 } 299 }
425 300
426 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
427} 303}
428 304
305/////////////////////////////////////////////////////////////////////////////
306
307#define IOM_CLASS "urxvt"
308#define IOM_WARN rxvt_warn
309#include "iom_perl.h"
429 310
430///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
431 312
432struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
433 314
437{ 318{
438 if (perl) 319 if (perl)
439 { 320 {
440 perl_destruct (perl); 321 perl_destruct (perl);
441 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
442 } 324 }
443} 325}
444 326
445void 327void
446rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
450 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
451 333
452 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
453 swap (perl_environ, environ); 335 swap (perl_environ, environ);
454 336
455 char *argv[] = { 337 char *args[] = {
456 "", 338 "",
457 "-e" 339 "-e"
458 "BEGIN {" 340 "BEGIN {"
459 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
460 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
461 "}" 343 "}"
462 "" 344 ""
463 "use urxvt;" 345 "use urxvt;"
464 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
465 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
466 perl = perl_alloc (); 351 perl = perl_alloc ();
467 perl_construct (perl); 352 perl_construct (perl);
468 353
469 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
470 || perl_run (perl)) 355 || perl_run (perl))
471 { 356 {
472 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
473 358
474 perl_destruct (perl); 359 perl_destruct (perl);
492static void 377static void
493ungrab (rxvt_term *THIS) 378ungrab (rxvt_term *THIS)
494{ 379{
495 if (THIS->perl.grabtime) 380 if (THIS->perl.grabtime)
496 { 381 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 382 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 383 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 384 THIS->perl.grabtime = 0;
500 } 385 }
501} 386}
502 387
503bool 388bool
508 393
509 // pre-handling of some events 394 // pre-handling of some events
510 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
511 { 396 {
512 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 397 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
513 398
514 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
515 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
516 } 401 }
517 402
518 swap (perl_environ, environ); 403 swap (perl_environ, environ);
554 break; 439 break;
555 440
556 case DT_STR_LEN: 441 case DT_STR_LEN:
557 { 442 {
558 char *str = va_arg (ap, char *); 443 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 444 int len = va_arg (ap, int);
560 445
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 446 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 447 }
563 break; 448 break;
564 449
565 case DT_WCS_LEN: 450 case DT_WCS_LEN:
566 { 451 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 452 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 453 int wlen = va_arg (ap, int);
569 454
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 455 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
456 }
457 break;
458
459 case DT_LCS_LEN:
460 {
461 long *lstr = va_arg (ap, long *);
462 int llen = va_arg (ap, int);
463
464 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 465 }
572 break; 466 break;
573 467
574 case DT_XEVENT: 468 case DT_XEVENT:
575 { 469 {
576 XEvent *xe = va_arg (ap, XEvent *); 470 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 471 HV *hv = newHV ();
578 472
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 473# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
580# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 474# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
581# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 475# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 476# undef set
583 477
584 setiv (type, xe->type); 478 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 479 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 480 setiv (serial, xe->xany.serial);
587 481
596 setuv (root, xe->xmotion.root); 490 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 491 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 492 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 493 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 494 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight); 495 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 496 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 497 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 498 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 499 setuv (state, xe->xmotion.state);
606 500
640 break; 534 break;
641 } 535 }
642 536
643 break; 537 break;
644 538
539 case PropertyNotify:
540 setuv (window, xe->xproperty.window);
541 setuv (atom, xe->xproperty.atom);
542 setuv (time, xe->xproperty.time);
543 setiv (state, xe->xproperty.state);
544 break;
545
645 case ClientMessage: 546 case ClientMessage:
646 setuv (window, xe->xclient.window); 547 setuv (window, xe->xclient.window);
647 setuv (message_type, xe->xclient.message_type); 548 setuv (message_type, xe->xclient.message_type);
648 setuv (format, xe->xclient.format); 549 setuv (format, xe->xclient.format);
649 setuv (l0, xe->xclient.data.l[0]); 550 setuv (l0, xe->xclient.data.l[0]);
650 setuv (l1, xe->xclient.data.l[1]); 551 setuv (l1, xe->xclient.data.l[1]);
651 setuv (l2, xe->xclient.data.l[2]); 552 setuv (l2, xe->xclient.data.l[2]);
652 setuv (l3, xe->xclient.data.l[3]); 553 setuv (l3, xe->xclient.data.l[3]);
653 setuv (l4, xe->xclient.data.l[4]); 554 setuv (l4, xe->xclient.data.l[4]);
555 break;
654 } 556 }
655 557
656 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
657 } 559 }
658 break; 560 break;
700 602
701 // post-handling of some events 603 // post-handling of some events
702 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
703 { 605 {
704 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 606 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
705 607
706 for (int i = AvFILL (av); i >= 0; i--) 608 for (int i = AvFILL (av); i >= 0; i--)
707 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
708 } 610 }
709 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
710 { 612 {
711 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
712 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
615
616 // don't allow further calls
617 term->perl.self = 0;
713 } 618 }
714 619
715 swap (perl_environ, environ); 620 swap (perl_environ, environ);
716 621
717 return event_consumed; 622 return event_consumed;
741# include "optinc.h" 646# include "optinc.h"
742# undef nodef 647# undef nodef
743# undef def 648# undef def
744 649
745 HV *stash = gv_stashpv ("urxvt", 1); 650 HV *stash = gv_stashpv ("urxvt", 1);
746 struct { 651 static const struct {
747 const char *name; 652 const char *name;
748 IV iv; 653 IV iv;
749 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
750# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
751 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
752 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
753 const_iv (RS_Bold), 659 const_iv (RS_Bold),
754 const_iv (RS_Italic), 660 const_iv (RS_Italic),
755 const_iv (RS_Blink), 661 const_iv (RS_Blink),
770 const_iv (Button3Mask), 676 const_iv (Button3Mask),
771 const_iv (Button4Mask), 677 const_iv (Button4Mask),
772 const_iv (Button5Mask), 678 const_iv (Button5Mask),
773 const_iv (AnyModifier), 679 const_iv (AnyModifier),
774 680
775 const_iv (EVENT_NONE), 681 const_iv (NoSymbol),
776 const_iv (EVENT_READ), 682 const_iv (GrabModeSync),
777 const_iv (EVENT_WRITE), 683 const_iv (GrabModeAsync),
778 684
779 const_iv (NoEventMask), 685 const_iv (NoEventMask),
780 const_iv (KeyPressMask), 686 const_iv (KeyPressMask),
781 const_iv (KeyReleaseMask), 687 const_iv (KeyReleaseMask),
782 const_iv (ButtonPressMask), 688 const_iv (ButtonPressMask),
834 const_iv (SelectionRequest), 740 const_iv (SelectionRequest),
835 const_iv (SelectionNotify), 741 const_iv (SelectionNotify),
836 const_iv (ColormapNotify), 742 const_iv (ColormapNotify),
837 const_iv (ClientMessage), 743 const_iv (ClientMessage),
838 const_iv (MappingNotify), 744 const_iv (MappingNotify),
745# if ENABLE_XIM_ONTHESPOT
746 const_iv (XIMReverse),
747 const_iv (XIMUnderline),
748 const_iv (XIMHighlight),
749 const_iv (XIMPrimary),
750 const_iv (XIMSecondary),
751 const_iv (XIMTertiary),
752 const_iv (XIMVisibleToForward),
753 const_iv (XIMVisibleToBackword),
754 const_iv (XIMVisibleToCenter),
755# if 0
756 const_iv (XIMForwardChar),
757 const_iv (XIMBackwardChar),
758 const_iv (XIMForwardWord),
759 const_iv (XIMBackwardWord),
760 const_iv (XIMCaretUp),
761 const_iv (XIMCaretDown),
762 const_iv (XIMNextLine),
763 const_iv (XIMPreviousLine),
764 const_iv (XIMLineStart),
765 const_iv (XIMLineEnd),
766 const_iv (XIMAbsolutePosition),
767 const_iv (XIMDontChange),
768# endif
769# endif
839 }; 770 };
840 771
841 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 772 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
842 civ-- > const_iv; )
843 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 773 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
844} 774}
845 775
846void 776void
847warn (const char *msg) 777warn (const char *msg)
857_exit (int status) 787_exit (int status)
858 788
859NV 789NV
860NOW () 790NOW ()
861 CODE: 791 CODE:
862 RETVAL = NOW; 792 RETVAL = ev::now ();
863 OUTPUT: 793 OUTPUT:
864 RETVAL 794 RETVAL
865 795
866int 796int
867GET_BASEFG (int rend) 797GET_BASEFG (int rend)
878 RETVAL 808 RETVAL
879 809
880int 810int
881SET_FGCOLOR (int rend, int new_color) 811SET_FGCOLOR (int rend, int new_color)
882 CODE: 812 CODE:
883 RETVAL = SET_FGCOLOR (rend, new_color); 813 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
884 OUTPUT: 814 OUTPUT:
885 RETVAL 815 RETVAL
886 816
887int 817int
888SET_BGCOLOR (int rend, int new_color) 818SET_BGCOLOR (int rend, int new_color)
889 CODE: 819 CODE:
890 RETVAL = SET_BGCOLOR (rend, new_color); 820 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
891 OUTPUT: 821 OUTPUT:
892 RETVAL 822 RETVAL
893 823
894int 824int
895GET_CUSTOM (int rend) 825GET_CUSTOM (int rend)
896 CODE: 826 CODE:
897 RETVAL = (rend && RS_customMask) >> RS_customShift; 827 RETVAL = (rend & RS_customMask) >> RS_customShift;
898 OUTPUT: 828 OUTPUT:
899 RETVAL 829 RETVAL
900 830
901int 831int
902SET_CUSTOM (int rend, int new_value) 832SET_CUSTOM (int rend, int new_value)
909 | ((new_value << RS_customShift) & RS_customMask); 839 | ((new_value << RS_customShift) & RS_customMask);
910} 840}
911 OUTPUT: 841 OUTPUT:
912 RETVAL 842 RETVAL
913 843
844void
845termlist ()
846 PPCODE:
847{
848 EXTEND (SP, rxvt_term::termlist.size ());
849
850 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
851 if ((*t)->perl.self)
852 PUSHs (sv_2mortal (newSVterm (*t)));
853}
854
914MODULE = urxvt PACKAGE = urxvt::term 855MODULE = urxvt PACKAGE = urxvt::term
915 856
916SV * 857SV *
917_new (...) 858_new (AV *env, AV *arg)
918 CODE: 859 CODE:
919{ 860{
920 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
921 croak ("first argument to urxvt::term->_new must be arrayref");
922
923 rxvt_term *term = new rxvt_term; 861 rxvt_term *term = new rxvt_term;
924 862
925 term->argv = new stringvec; 863 stringvec *argv = new stringvec;
926 term->envv = new stringvec; 864 stringvec *envv = new stringvec;
927 865
928 for (int i = 1; i < items; i++) 866 for (int i = 0; i <= AvFILL (arg); i++)
929 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 867 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
930 868
931 AV *envv = (AV *)SvRV (ST (0));
932 for (int i = AvFILL (envv) + 1; i--; ) 869 for (int i = AvFILL (env) + 1; i--; )
933 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 870 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
934 871
935 term->envv->push_back (0); 872 envv->push_back (0);
936
937 bool success;
938 873
939 try 874 try
940 { 875 {
941 success = term->init (term->argv->size (), term->argv->begin ()); 876 term->init (argv, envv);
942 } 877 }
943 catch (const class rxvt_failure_exception &e) 878 catch (const class rxvt_failure_exception &e)
944 {
945 success = false;
946 }
947
948 if (!success)
949 { 879 {
950 term->destroy (); 880 term->destroy ();
951 croak ("error while initializing new terminal instance"); 881 croak ("error while initializing new terminal instance");
952 } 882 }
953 883
963void 893void
964rxvt_term::set_should_invoke (int htype, int inc) 894rxvt_term::set_should_invoke (int htype, int inc)
965 CODE: 895 CODE:
966 THIS->perl.should_invoke [htype] += inc; 896 THIS->perl.should_invoke [htype] += inc;
967 897
968void 898int
969rxvt_term::grab_button (int button, U32 modifiers) 899rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
970 CODE: 900 CODE:
971 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 901 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
972 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 902 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
973 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 903 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
904 OUTPUT: RETVAL
905
906int
907rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
908 CODE:
909 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
910 OUTPUT: RETVAL
911
912void
913rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
914 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
915 CODE:
916 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
917
918void
919rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
920 CODE:
921 XUngrabKey (THIS->dpy, keycode, modifiers, window);
922
923void
924rxvt_term::XUngrabKeyboard (Time eventtime)
925 CODE:
926 XUngrabKeyboard (THIS->dpy, eventtime);
974 927
975bool 928bool
976rxvt_term::grab (Time eventtime, int sync = 0) 929rxvt_term::grab (Time eventtime, int sync = 0)
977 CODE: 930 CODE:
978{ 931{
979 int mode = sync ? GrabModeSync : GrabModeAsync; 932 int mode = sync ? GrabModeSync : GrabModeAsync;
980 933
981 THIS->perl.grabtime = 0; 934 THIS->perl.grabtime = 0;
982 935
983 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 936 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
984 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 937 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
985 mode, mode, None, GRAB_CURSOR, eventtime)) 938 mode, mode, None, GRAB_CURSOR, eventtime))
986 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 939 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
987 THIS->perl.grabtime = eventtime; 940 THIS->perl.grabtime = eventtime;
988 else 941 else
989 XUngrabPointer (THIS->display->display, eventtime); 942 XUngrabPointer (THIS->dpy, eventtime);
990 943
991 RETVAL = !!THIS->perl.grabtime; 944 RETVAL = !!THIS->perl.grabtime;
992} 945}
993 OUTPUT: 946 OUTPUT:
994 RETVAL 947 RETVAL
995 948
996void 949void
997rxvt_term::allow_events_async () 950rxvt_term::allow_events_async ()
998 CODE: 951 CODE:
999 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 952 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1000 953
1001void 954void
1002rxvt_term::allow_events_sync () 955rxvt_term::allow_events_sync ()
1003 CODE: 956 CODE:
1004 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 957 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1005 958
1006void 959void
1007rxvt_term::allow_events_replay () 960rxvt_term::allow_events_replay ()
1008 CODE: 961 CODE:
1009 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 962 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1010 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1011 964
1012void 965void
1013rxvt_term::ungrab () 966rxvt_term::ungrab ()
1014 CODE: 967 CODE:
1015 ungrab (THIS); 968 ungrab (THIS);
969
970int
971rxvt_term::XStringToKeysym (char *string)
972 CODE:
973 RETVAL = XStringToKeysym (string);
974 OUTPUT: RETVAL
975
976char *
977rxvt_term::XKeysymToString (int sym)
978 CODE:
979 RETVAL = XKeysymToString (sym);
980 OUTPUT: RETVAL
981
982int
983rxvt_term::XKeysymToKeycode (int sym)
984 CODE:
985 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
986 OUTPUT: RETVAL
987
988int
989rxvt_term::XKeycodeToKeysym (int code, int index)
990 CODE:
991 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
992 OUTPUT: RETVAL
1016 993
1017int 994int
1018rxvt_term::strwidth (SV *str) 995rxvt_term::strwidth (SV *str)
1019 CODE: 996 CODE:
1020{ 997{
1021 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1022 999
1023 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1024 RETVAL = wcswidth (wstr, wcslen (wstr)); 1001 RETVAL = 0;
1002 for (wchar_t *wc = wstr; *wc; wc++)
1003 {
1004 int w = WCWIDTH (*wc);
1005
1006 if (w)
1007 RETVAL += max (w, 1);
1008 }
1025 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1026 1010
1027 free (wstr); 1011 free (wstr);
1028} 1012}
1029 OUTPUT: 1013 OUTPUT:
1062 free (wstr); 1046 free (wstr);
1063} 1047}
1064 OUTPUT: 1048 OUTPUT:
1065 RETVAL 1049 RETVAL
1066 1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1055 OUTPUT:
1056 RETVAL
1057
1067#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1068 1059
1069#define TERM_OFFSET_width TERM_OFFSET(width) 1060#define TERM_OFFSET_width TERM_OFFSET(width)
1070#define TERM_OFFSET_height TERM_OFFSET(height) 1061#define TERM_OFFSET_height TERM_OFFSET(height)
1071#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1072#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1073#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1074#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1075#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1076#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1077#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1078#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1079#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1080#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1072#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1081#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1082#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1083#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1084 1076
1085int 1077int
1086rxvt_term::width () 1078rxvt_term::width ()
1087 ALIAS: 1079 ALIAS:
1088 width = TERM_OFFSET_width 1080 width = TERM_OFFSET_width
1089 height = TERM_OFFSET_height 1081 height = TERM_OFFSET_height
1090 fwidth = TERM_OFFSET_fwidth 1082 fwidth = TERM_OFFSET_fwidth
1091 fheight = TERM_OFFSET_fheight 1083 fheight = TERM_OFFSET_fheight
1092 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1093 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1094 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1095 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1096 mapped = TERM_OFFSET_mapped 1088 mapped = TERM_OFFSET_mapped
1097 int_bwidth = TERM_OFFSET_int_bwidth 1089 int_bwidth = TERM_OFFSET_int_bwidth
1098 ext_bwidth = TERM_OFFSET_ext_bwidth 1090 ext_bwidth = TERM_OFFSET_ext_bwidth
1099 lineSpace = TERM_OFFSET_lineSpace 1091 lineSpace = TERM_OFFSET_lineSpace
1092 letterSpace = TERM_OFFSET_letterSpace
1100 saveLines = TERM_OFFSET_saveLines 1093 saveLines = TERM_OFFSET_saveLines
1101 total_rows = TERM_OFFSET_total_rows 1094 total_rows = TERM_OFFSET_total_rows
1102 top_row = TERM_OFFSET_top_row 1095 top_row = TERM_OFFSET_top_row
1103 CODE: 1096 CODE:
1104 RETVAL = *(int *)((char *)THIS + ix); 1097 RETVAL = *(int *)((char *)THIS + ix);
1105 OUTPUT: 1098 OUTPUT:
1106 RETVAL 1099 RETVAL
1107 1100
1109rxvt_term::ModLevel3Mask () 1102rxvt_term::ModLevel3Mask ()
1110 ALIAS: 1103 ALIAS:
1111 ModLevel3Mask = 0 1104 ModLevel3Mask = 0
1112 ModMetaMask = 1 1105 ModMetaMask = 1
1113 ModNumLockMask = 2 1106 ModNumLockMask = 2
1107 current_screen = 3
1108 hidden_cursor = 4
1114 CODE: 1109 CODE:
1115 switch (ix) 1110 switch (ix)
1116 { 1111 {
1117 case 0: RETVAL = THIS->ModLevel3Mask; break; 1112 case 0: RETVAL = THIS->ModLevel3Mask; break;
1118 case 1: RETVAL = THIS->ModMetaMask; break; 1113 case 1: RETVAL = THIS->ModMetaMask; break;
1119 case 2: RETVAL = THIS->ModNumLockMask; break; 1114 case 2: RETVAL = THIS->ModNumLockMask; break;
1115 case 3: RETVAL = THIS->current_screen; break;
1116#ifdef CURSOR_BLINK
1117 case 4: RETVAL = THIS->hidden_cursor; break;
1118#endif
1120 } 1119 }
1121 OUTPUT: 1120 OUTPUT:
1122 RETVAL 1121 RETVAL
1123 1122
1124char * 1123char *
1134 } 1133 }
1135 OUTPUT: 1134 OUTPUT:
1136 RETVAL 1135 RETVAL
1137 1136
1138SV * 1137SV *
1139rxvt_term::_env () 1138rxvt_term::envv ()
1139 ALIAS:
1140 argv = 1
1140 CODE: 1141 PPCODE:
1141{ 1142{
1142 if (THIS->envv) 1143 stringvec *vec = ix ? THIS->argv : THIS->envv;
1143 {
1144 AV *av = newAV ();
1145 1144
1145 EXTEND (SP, vec->size ());
1146
1146 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1147 for (char **i = vec->begin (); i != vec->end (); ++i)
1147 if (*i) 1148 if (*i)
1148 av_push (av, newSVpv (*i, 0)); 1149 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1149
1150 RETVAL = newRV_noinc ((SV *)av);
1151 }
1152 else
1153 RETVAL = &PL_sv_undef;
1154} 1150}
1155 OUTPUT:
1156 RETVAL
1157 1151
1158int 1152int
1159rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1153rxvt_term::pty_ev_events (int events = ev::UNDEF)
1160 CODE: 1154 CODE:
1161 RETVAL = THIS->pty_ev.events; 1155 RETVAL = THIS->pty_ev.events;
1162 if (events != EVENT_UNDEF) 1156 if (events != ev::UNDEF)
1163 THIS->pty_ev.set (events); 1157 THIS->pty_ev.set (events);
1158 OUTPUT:
1159 RETVAL
1160
1161int
1162rxvt_term::pty_fd ()
1163 CODE:
1164 RETVAL = THIS->pty->pty;
1164 OUTPUT: 1165 OUTPUT:
1165 RETVAL 1166 RETVAL
1166 1167
1167Window 1168Window
1168rxvt_term::parent () 1169rxvt_term::parent ()
1210 1211
1211void 1212void
1212rxvt_term::focus_out () 1213rxvt_term::focus_out ()
1213 1214
1214void 1215void
1216rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1217 ALIAS:
1218 key_release = 1
1219 CODE:
1220{
1221 XKeyEvent xkey;
1222
1223 memset (&xkey, 0, sizeof (xkey));
1224
1225 xkey.time = time;
1226 xkey.state = state;
1227 xkey.keycode = keycode;
1228
1229 xkey.type = ix ? KeyRelease : KeyPress;
1230 xkey.display = THIS->dpy;
1231 xkey.window = THIS->vt;
1232 xkey.root = THIS->display->root;
1233 xkey.subwindow = THIS->vt;
1234
1235 if (ix)
1236 THIS->key_release (xkey);
1237 else
1238 THIS->key_press (xkey);
1239}
1240
1241void
1215rxvt_term::want_refresh () 1242rxvt_term::want_refresh ()
1216 CODE: 1243 CODE:
1217 THIS->want_refresh = 1; 1244 THIS->want_refresh = 1;
1245 THIS->refresh_check ();
1218 1246
1219void 1247void
1220rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1248rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1221 PPCODE: 1249 PPCODE:
1222{ 1250{
1225 1253
1226 line_t &l = ROW(row_number); 1254 line_t &l = ROW(row_number);
1227 1255
1228 if (GIMME_V != G_VOID) 1256 if (GIMME_V != G_VOID)
1229 { 1257 {
1230 wchar_t *wstr = new wchar_t [THIS->ncol]; 1258 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1231 1259
1232 for (int col = 0; col < THIS->ncol; col++) 1260 for (int col = 0; col < THIS->ncol; col++)
1233 wstr [col] = l.t [col]; 1261 wstr [col] = l.t [col];
1234 1262
1235 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1263 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1236
1237 delete [] wstr;
1238 } 1264 }
1239 1265
1240 if (new_text) 1266 if (new_text)
1241 { 1267 {
1242 wchar_t *wstr = sv2wcs (new_text); 1268 wchar_t *wstr = sv2wcs (new_text);
1335rxvt_term::special_encode (SV *string) 1361rxvt_term::special_encode (SV *string)
1336 CODE: 1362 CODE:
1337{ 1363{
1338 wchar_t *wstr = sv2wcs (string); 1364 wchar_t *wstr = sv2wcs (string);
1339 int wlen = wcslen (wstr); 1365 int wlen = wcslen (wstr);
1340 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1366 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1341 1367
1342 rxvt_push_locale (THIS->locale); 1368 rxvt_push_locale (THIS->locale);
1343 1369
1344 wchar_t *r = rstr; 1370 wchar_t *r = rstr;
1345 for (wchar_t *s = wstr; *s; s++) 1371 for (wchar_t *s = wstr; *s; s++)
1372 {
1373 int w = WCWIDTH (*s);
1374
1346 if (wcwidth (*s) == 0) 1375 if (w == 0)
1347 { 1376 {
1348 if (r == rstr) 1377 if (r == rstr)
1349 croak ("leading combining character unencodable"); 1378 croak ("leading combining character unencodable");
1350 1379
1351 unicode_t n = rxvt_compose (r[-1], *s); 1380 unicode_t n = rxvt_compose (r[-1], *s);
1352 if (n == NOCHAR) 1381 if (n == NOCHAR)
1353 n = rxvt_composite.compose (r[-1], *s); 1382 n = rxvt_composite.compose (r[-1], *s);
1354 1383
1355 r[-1] = n; 1384 r[-1] = n;
1356 } 1385 }
1357#if !UNICODE_3 1386#if !UNICODE_3
1358 else if (*s >= 0x10000) 1387 else if (*s >= 0x10000)
1359 *r++ = rxvt_composite.compose (*s); 1388 *r++ = rxvt_composite.compose (*s);
1360#endif 1389#endif
1361 else 1390 else
1362 *r++ = *s; 1391 *r++ = *s;
1392
1393 // the *2 above only allows wcwidth <= 2
1394 if (w > 1)
1395 *r++ = NOCHAR;
1396 }
1363 1397
1364 rxvt_pop_locale (); 1398 rxvt_pop_locale ();
1365 1399
1366 RETVAL = wcs2sv (rstr, r - rstr); 1400 RETVAL = wcs2sv (rstr, r - rstr);
1367
1368 delete [] rstr;
1369} 1401}
1370 OUTPUT: 1402 OUTPUT:
1371 RETVAL 1403 RETVAL
1372 1404
1373SV * 1405SV *
1374rxvt_term::special_decode (SV *text) 1406rxvt_term::special_decode (SV *text)
1375 CODE: 1407 CODE:
1376{ 1408{
1377 wchar_t *wstr = sv2wcs (text); 1409 wchar_t *wstr = sv2wcs (text);
1378 int wlen = wcslen (wstr);
1379 int dlen = 0; 1410 int dlen = 0;
1380 1411
1381 // find length 1412 // find length
1382 for (wchar_t *s = wstr; *s; s++) 1413 for (wchar_t *s = wstr; *s; s++)
1383 if (*s == NOCHAR) 1414 if (*s == NOCHAR)
1385 else if (IS_COMPOSE (*s)) 1416 else if (IS_COMPOSE (*s))
1386 dlen += rxvt_composite.expand (*s, 0); 1417 dlen += rxvt_composite.expand (*s, 0);
1387 else 1418 else
1388 dlen++; 1419 dlen++;
1389 1420
1390 wchar_t *rstr = new wchar_t [dlen]; 1421 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1391 1422
1392 // decode 1423 // decode
1393 wchar_t *r = rstr; 1424 wchar_t *r = rstr;
1394 for (wchar_t *s = wstr; *s; s++) 1425 for (wchar_t *s = wstr; *s; s++)
1395 if (*s == NOCHAR) 1426 if (*s == NOCHAR)
1398 r += rxvt_composite.expand (*s, r); 1429 r += rxvt_composite.expand (*s, r);
1399 else 1430 else
1400 *r++ = *s; 1431 *r++ = *s;
1401 1432
1402 RETVAL = wcs2sv (rstr, r - rstr); 1433 RETVAL = wcs2sv (rstr, r - rstr);
1403
1404 delete [] rstr;
1405} 1434}
1406 OUTPUT: 1435 OUTPUT:
1407 RETVAL 1436 RETVAL
1408 1437
1409void 1438void
1410rxvt_term::_resource (char *name, int index, SV *newval = 0) 1439rxvt_term::_resource (char *name, int index, SV *newval = 0)
1411 PPCODE: 1440 PPCODE:
1412{ 1441{
1413 struct resval { const char *name; int value; } rslist [] = { 1442 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1414# define def(name) { # name, Rs_ ## name }, 1443# define def(name) { # name, Rs_ ## name },
1415# define reserve(name,count) 1444# define reserve(name,count)
1416# include "rsinc.h" 1445# include "rsinc.h"
1417# undef def 1446# undef def
1418# undef reserve 1447# undef reserve
1419 }; 1448 };
1420 1449
1421 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1450 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1422 1451
1452 if (*name)
1423 do { 1453 {
1454 do {
1424 if (rs-- == rslist) 1455 if (rs-- == rslist)
1425 croak ("no such resource '%s', requested", name); 1456 croak ("no such resource '%s', requested", name);
1426 } while (strcmp (name, rs->name)); 1457 } while (strcmp (name, rs->name));
1427 1458
1428 index += rs->value; 1459 index += rs->value;
1460 }
1461 else
1462 {
1463 --rs;
1464 name = "";
1465 }
1429 1466
1430 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1467 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1431 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1468 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1432 1469
1433 if (GIMME_V != G_VOID) 1470 if (GIMME_V != G_VOID)
1448 1485
1449const char * 1486const char *
1450rxvt_term::x_resource (const char *name) 1487rxvt_term::x_resource (const char *name)
1451 1488
1452bool 1489bool
1453rxvt_term::option (U32 optval, int set = -1) 1490rxvt_term::option (U8 optval, int set = -1)
1454 CODE: 1491 CODE:
1455{ 1492{
1456 RETVAL = THIS->options & optval; 1493 RETVAL = THIS->option (optval);
1457 1494
1458 if (set >= 0) 1495 if (set >= 0)
1459 { 1496 {
1460 if (set)
1461 THIS->options |= optval; 1497 THIS->set_option (optval, set);
1462 else
1463 THIS->options &= ~optval;
1464 1498
1465 if (THIS->check_ev.is_active ()) // avoid doing this before START 1499 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1466 switch (optval) 1500 switch (optval)
1467 { 1501 {
1468 case Opt_skipBuiltinGlyphs: 1502 case Opt_skipBuiltinGlyphs:
1469 THIS->set_fonts (); 1503 THIS->set_fonts ();
1470 THIS->scr_remap_chars (); 1504 THIS->scr_remap_chars ();
1471 THIS->scr_touch (true); 1505 THIS->scr_touch (true);
1472 THIS->want_refresh = 1; 1506 THIS->want_refresh = 1;
1507 THIS->refresh_check ();
1473 break; 1508 break;
1474 1509
1475 case Opt_cursorUnderline: 1510 case Opt_cursorUnderline:
1476 THIS->want_refresh = 1; 1511 THIS->want_refresh = 1;
1512 THIS->refresh_check ();
1477 break; 1513 break;
1478 1514
1479# case Opt_scrollBar_floating: 1515# case Opt_scrollBar_floating:
1480# case Opt_scrollBar_right: 1516# case Opt_scrollBar_right:
1481# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1517# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1519 if (items == 3) 1555 if (items == 3)
1520 { 1556 {
1521 rc.row = SvIV (ST (1)); 1557 rc.row = SvIV (ST (1));
1522 rc.col = SvIV (ST (2)); 1558 rc.col = SvIV (ST (2));
1523 1559
1524 if (ix == 2 && rc.col == 0) 1560 if (ix == 2)
1525 { 1561 {
1562 if (rc.col == 0)
1563 {
1564 // col == 0 means end of previous line
1526 rc.row--; 1565 rc.row--;
1527 rc.col = THIS->ncol; 1566 rc.col = THIS->ncol;
1567 }
1568 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1569 && rc.col > ROW(rc.row).l)
1570 {
1571 // col >= length means while line and add newline
1572 rc.col = THIS->ncol;
1573 }
1528 } 1574 }
1529 1575
1530 clamp_it (rc.col, 0, THIS->ncol); 1576 clamp_it (rc.col, 0, THIS->ncol);
1531 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1577 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1532 1578
1533 if (ix) 1579 if (ix)
1580 {
1534 THIS->want_refresh = 1; 1581 THIS->want_refresh = 1;
1582 THIS->refresh_check ();
1583 }
1535 } 1584 }
1536} 1585}
1537 1586
1538char 1587char
1539rxvt_term::cur_charset () 1588rxvt_term::cur_charset ()
1540 CODE: 1589 CODE:
1541 RETVAL = THIS->charsets [THIS->screen.charset]; 1590 RETVAL = THIS->charsets [THIS->screen.charset];
1542 OUTPUT: 1591 OUTPUT:
1543 RETVAL 1592 RETVAL
1544 1593
1545#void 1594void
1546#rxvt_term::selection_clear () 1595rxvt_term::selection_clear ()
1547 1596
1548void 1597void
1549rxvt_term::selection_make (Time eventtime, bool rect = false) 1598rxvt_term::selection_make (Time eventtime, bool rect = false)
1550 CODE: 1599 CODE:
1551 THIS->selection.op = SELECTION_CONT; 1600 THIS->selection.op = SELECTION_CONT;
1579void 1628void
1580rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1629rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1581 1630
1582void 1631void
1583rxvt_term::scr_bell () 1632rxvt_term::scr_bell ()
1633
1634void
1635rxvt_term::scr_change_screen (int screen)
1584 1636
1585void 1637void
1586rxvt_term::scr_add_lines (SV *string) 1638rxvt_term::scr_add_lines (SV *string)
1587 CODE: 1639 CODE:
1588{ 1640{
1638void 1690void
1639rxvt_term::XListProperties (Window window) 1691rxvt_term::XListProperties (Window window)
1640 PPCODE: 1692 PPCODE:
1641{ 1693{
1642 int count; 1694 int count;
1643 Atom *props = XListProperties (THIS->display->display, window, &count); 1695 Atom *props = XListProperties (THIS->dpy, window, &count);
1644 1696
1645 EXTEND (SP, count); 1697 EXTEND (SP, count);
1646 while (count--) 1698 while (count--)
1647 PUSHs (newSVuv ((U32)props [count])); 1699 PUSHs (newSVuv ((U32)props [count]));
1648 1700
1649 XFree (props); 1701 XFree (props);
1650} 1702}
1651 1703
1652void 1704void
1653rxvt_term::XGetWindowProperty (Window window, Atom property) 1705rxvt_term::XGetWindowProperty (Window window, Atom property)
1657 int format; 1709 int format;
1658 unsigned long nitems; 1710 unsigned long nitems;
1659 unsigned long bytes_after; 1711 unsigned long bytes_after;
1660 unsigned char *prop; 1712 unsigned char *prop;
1661 1713
1662 XGetWindowProperty (THIS->display->display, window, property, 1714 XGetWindowProperty (THIS->dpy, window, property,
1663 0, 1<<24, 0, AnyPropertyType, 1715 0, 1<<24, 0, AnyPropertyType,
1664 &type, &format, &nitems, &bytes_after, &prop); 1716 &type, &format, &nitems, &bytes_after, &prop);
1665 1717
1666 if (type != None) 1718 if (type != None)
1667 { 1719 {
1676 XFree (prop); 1728 XFree (prop);
1677 } 1729 }
1678} 1730}
1679 1731
1680void 1732void
1681rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1733rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1682 CODE: 1734 CODE:
1683{ 1735{
1684 STRLEN len; 1736 STRLEN len;
1685 char *data_ = SvPVbyte (data, len); 1737 char *data_ = SvPVbyte (data, len);
1686 1738
1687 int elemsize = format == 16 ? sizeof (short) 1739 int elemsize = format == 16 ? sizeof (short)
1688 : format == 32 ? sizeof (long) 1740 : format == 32 ? sizeof (long)
1689 : 1; 1741 : 1;
1690 1742
1691 XChangeProperty (THIS->display->display, window, property, 1743 XChangeProperty (THIS->dpy, window, property,
1692 type, format, PropModeReplace, 1744 type, format, PropModeReplace,
1693 (unsigned char *)data_, len / elemsize); 1745 (unsigned char *)data_, len / elemsize);
1694 XSync (THIS->display->display, 0);
1695} 1746}
1696 1747
1697Atom 1748Atom
1698XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1749XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1699 C_ARGS: term->display->display, atom_name, only_if_exists 1750 C_ARGS: term->dpy, atom_name, only_if_exists
1700 1751
1701char * 1752char *
1702XGetAtomName (rxvt_term *term, Atom atom) 1753XGetAtomName (rxvt_term *term, Atom atom)
1703 C_ARGS: term->display->display, atom 1754 C_ARGS: term->dpy, atom
1704 CLEANUP: 1755 CLEANUP:
1705 XFree (RETVAL); 1756 XFree (RETVAL);
1706 1757
1707void 1758void
1708XDeleteProperty (rxvt_term *term, Window window, Atom property) 1759XDeleteProperty (rxvt_term *term, Window window, Atom property)
1709 C_ARGS: term->display->display, window, property 1760 C_ARGS: term->dpy, window, property
1710 1761
1711Window 1762Window
1712rxvt_term::DefaultRootWindow () 1763rxvt_term::DefaultRootWindow ()
1713 CODE: 1764 CODE:
1714 RETVAL = THIS->display->root; 1765 RETVAL = THIS->display->root;
1717 1768
1718#if 0 1769#if 0
1719 1770
1720Window 1771Window
1721XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1772XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1722 C_ARGS: term->display->display, (Window)parent, 1773 C_ARGS: term->dpy, (Window)parent,
1723 x, y, width, height, 0, 1774 x, y, width, height, 0,
1724 term->pix_colors_focused[Color_border], 1775 term->pix_colors_focused[Color_border],
1725 term->pix_colors_focused[Color_border] 1776 term->pix_colors_focused[Color_border]
1726 1777
1727#endif 1778#endif
1728 1779
1729void 1780void
1730XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1781XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1731 C_ARGS: term->display->display, window, parent, x, y 1782 C_ARGS: term->dpy, window, parent, x, y
1732 1783
1733void 1784void
1734XMapWindow (rxvt_term *term, Window window) 1785XMapWindow (rxvt_term *term, Window window)
1735 C_ARGS: term->display->display, window 1786 C_ARGS: term->dpy, window
1736 1787
1737void 1788void
1738XUnmapWindow (rxvt_term *term, Window window) 1789XUnmapWindow (rxvt_term *term, Window window)
1739 C_ARGS: term->display->display, window 1790 C_ARGS: term->dpy, window
1740 1791
1741void 1792void
1742XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1793XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1743 C_ARGS: term->display->display, (Window)window, x, y, width, height 1794 C_ARGS: term->dpy, window, x, y, width, height
1795
1796void
1797rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1798 CODE:
1799{
1800 XWindowAttributes attr;
1801 XGetWindowAttributes (THIS->dpy, window, &attr);
1802 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1803}
1744 1804
1745void 1805void
1746rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1806rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1747 PPCODE: 1807 PPCODE:
1748{ 1808{
1749 int dx, dy; 1809 int dx, dy;
1750 Window child; 1810 Window child;
1751 1811
1752 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1812 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1753 { 1813 {
1754 EXTEND (SP, 3); 1814 EXTEND (SP, 3);
1755 PUSHs (newSViv (dx)); 1815 PUSHs (newSViv (dx));
1756 PUSHs (newSViv (dy)); 1816 PUSHs (newSViv (dy));
1757 PUSHs (newSVuv (child)); 1817 PUSHs (newSVuv (child));
1774overlay::hide () 1834overlay::hide ()
1775 1835
1776void 1836void
1777overlay::DESTROY () 1837overlay::DESTROY ()
1778 1838
1779############################################################################# 1839INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1780# urxvt::watcher
1781#############################################################################
1782 1840
1783MODULE = urxvt PACKAGE = urxvt::watcher
1784
1785CHAINED
1786perl_watcher::cb (SV *cb)
1787 CODE:
1788 THIS->cb (cb);
1789 OUTPUT:
1790 RETVAL
1791
1792#############################################################################
1793# urxvt::timer
1794#############################################################################
1795
1796MODULE = urxvt PACKAGE = urxvt::timer
1797
1798SV *
1799timer::new ()
1800 CODE:
1801 timer *w = new timer;
1802 w->start (NOW);
1803 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1804 w->self = (HV *)SvRV (RETVAL);
1805 OUTPUT:
1806 RETVAL
1807
1808NV
1809timer::at ()
1810 CODE:
1811 RETVAL = THIS->at;
1812 OUTPUT:
1813 RETVAL
1814
1815CHAINED
1816timer::interval (NV interval)
1817 CODE:
1818 THIS->interval = interval;
1819 OUTPUT:
1820 RETVAL
1821
1822CHAINED
1823timer::set (NV tstamp)
1824 CODE:
1825 THIS->set (tstamp);
1826 OUTPUT:
1827 RETVAL
1828
1829CHAINED
1830timer::start (NV tstamp = THIS->at)
1831 CODE:
1832 THIS->start (tstamp);
1833 OUTPUT:
1834 RETVAL
1835
1836CHAINED
1837timer::after (NV delay)
1838 CODE:
1839 THIS->start (NOW + delay);
1840 OUTPUT:
1841 RETVAL
1842
1843CHAINED
1844timer::stop ()
1845 CODE:
1846 THIS->stop ();
1847 OUTPUT:
1848 RETVAL
1849
1850void
1851timer::DESTROY ()
1852
1853#############################################################################
1854# urxvt::iow
1855#############################################################################
1856
1857MODULE = urxvt PACKAGE = urxvt::iow
1858
1859SV *
1860iow::new ()
1861 CODE:
1862 iow *w = new iow;
1863 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1864 w->self = (HV *)SvRV (RETVAL);
1865 OUTPUT:
1866 RETVAL
1867
1868CHAINED
1869iow::fd (int fd)
1870 CODE:
1871 THIS->fd = fd;
1872 OUTPUT:
1873 RETVAL
1874
1875CHAINED
1876iow::events (short events)
1877 CODE:
1878 THIS->events = events;
1879 OUTPUT:
1880 RETVAL
1881
1882CHAINED
1883iow::start ()
1884 CODE:
1885 THIS->start ();
1886 OUTPUT:
1887 RETVAL
1888
1889CHAINED
1890iow::stop ()
1891 CODE:
1892 THIS->stop ();
1893 OUTPUT:
1894 RETVAL
1895
1896void
1897iow::DESTROY ()
1898
1899#############################################################################
1900# urxvt::iw
1901#############################################################################
1902
1903MODULE = urxvt PACKAGE = urxvt::iw
1904
1905SV *
1906iw::new ()
1907 CODE:
1908 iw *w = new iw;
1909 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1910 w->self = (HV *)SvRV (RETVAL);
1911 OUTPUT:
1912 RETVAL
1913
1914CHAINED
1915iw::start ()
1916 CODE:
1917 THIS->start ();
1918 OUTPUT:
1919 RETVAL
1920
1921CHAINED
1922iw::stop ()
1923 CODE:
1924 THIS->stop ();
1925 OUTPUT:
1926 RETVAL
1927
1928void
1929iw::DESTROY ()
1930
1931#############################################################################
1932# urxvt::pw
1933#############################################################################
1934
1935MODULE = urxvt PACKAGE = urxvt::pw
1936
1937SV *
1938pw::new ()
1939 CODE:
1940 pw *w = new pw;
1941 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1942 w->self = (HV *)SvRV (RETVAL);
1943 OUTPUT:
1944 RETVAL
1945
1946CHAINED
1947pw::start (int pid)
1948 CODE:
1949 THIS->start (pid);
1950 OUTPUT:
1951 RETVAL
1952
1953CHAINED
1954pw::stop ()
1955 CODE:
1956 THIS->stop ();
1957 OUTPUT:
1958 RETVAL
1959
1960void
1961pw::DESTROY ()
1962
1963

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines