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.63 by root, Fri Jan 13 05:06:44 2006 UTC vs.
Revision 1.153 by sf-exg, Wed Apr 11 10:20:00 2012 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,2011 Marc Lehmann <schmorp@schmorp.de>
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.
23#define line_t perl_line_t 23#define line_t perl_line_t
24#include <EXTERN.h> 24#include <EXTERN.h>
25#include <perl.h> 25#include <perl.h>
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28#undef bool // perl defines it's own bool type, except with g++... what a trap
28 29
29#include "../config.h" 30#include "../config.h"
30 31
31#include <cstddef> 32#include <stddef.h>
32#include <cstdarg> 33#include <stdarg.h>
33 34
34#include "unistd.h" 35#include "unistd.h"
35 36
36#include "iom.h" 37#include "ev_cpp.h"
37#include "rxvt.h" 38#include "rxvt.h"
38#include "keyboard.h" 39#include "keyboard.h"
39#include "rxvtutil.h" 40#include "rxvtutil.h"
40#include "rxvtperl.h" 41#include "rxvtperl.h"
41 42
42#include "perlxsi.c" 43#include "perlxsi.c"
43 44
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
45# define GRAB_CURSOR THIS->leftptr_cursor 45#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 46
50#undef LINENO 47#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 49#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
54 51
55///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
56 53
57static SV *
58taint (SV *sv)
59{
60 SvTAINT (sv);
61 return sv;
62}
63
64static SV *
65taint_if (SV *sv, SV *src)
66{
67 if (SvTAINTED (src))
68 SvTAINT (sv);
69
70 return sv;
71}
72
73static wchar_t * 54static wchar_t *
74sv2wcs (SV *sv) 55sv2wcs (SV *sv)
75{ 56{
76 STRLEN len; 57 STRLEN len;
77 char *str = SvPVutf8 (sv, len); 58 char *str = SvPVutf8 (sv, len);
89 70
90 return sv; 71 return sv;
91} 72}
92 73
93static SV * 74static SV *
94new_ref (HV *hv, const char *klass)
95{
96 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
97}
98
99//TODO: use magic
100static SV *
101newSVptr (void *ptr, const char *klass) 75newSVptr (void *ptr, const char *klass)
102{ 76{
103 HV *hv = newHV (); 77 HV *hv = newHV ();
104 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 78 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
105 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 79 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
127 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
128 102
129 return (long)mg->mg_ptr; 103 return (long)mg->mg_ptr;
130} 104}
131 105
132#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 106#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
133#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 107#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
134 108
135///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
136 110
137struct perl_watcher 111#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
112
113class overlay : overlay_base
138{ 114{
139 SV *cbsv; 115 rxvt_term *THIS;
116 AV *overlay_av;
117 int border;
118
119public:
140 HV *self; 120 HV *self;
141
142 perl_watcher ()
143 : cbsv (newSV (0))
144 {
145 }
146
147 ~perl_watcher ()
148 {
149 SvREFCNT_dec (cbsv);
150 }
151
152 void cb (SV *cb)
153 {
154 sv_setsv (cbsv, cb);
155 }
156
157 void invoke (const char *type, SV *self, int arg = -1);
158};
159
160void
161perl_watcher::invoke (const char *type, SV *self, int arg)
162{
163 dSP;
164
165 ENTER;
166 SAVETMPS;
167
168 PUSHMARK (SP);
169
170 XPUSHs (sv_2mortal (self));
171
172 if (arg >= 0)
173 XPUSHs (sv_2mortal (newSViv (arg)));
174
175 PUTBACK;
176 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
177 SPAGAIN;
178
179 PUTBACK;
180 FREETMPS;
181 LEAVE;
182
183 if (SvTRUE (ERRSV))
184 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
185}
186
187#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
188#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")
189
190struct timer : time_watcher, perl_watcher
191{
192 tstamp interval;
193
194 timer ()
195 : time_watcher (this, &timer::execute)
196 {
197 }
198
199 void execute (time_watcher &w)
200 {
201 if (interval)
202 start (at + interval);
203
204 invoke ("urxvt::timer", newSVtimer (this));
205 }
206};
207
208#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
209#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow")
210
211struct iow : io_watcher, perl_watcher
212{
213 iow ()
214 : io_watcher (this, &iow::execute)
215 {
216 }
217
218 void execute (io_watcher &w, short revents)
219 {
220 invoke ("urxvt::iow", newSViow (this), revents);
221 }
222};
223
224/////////////////////////////////////////////////////////////////////////////
225
226#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
227
228struct overlay {
229 HV *self;
230 rxvt_term *THIS;
231 int x, y, w, h;
232 int border;
233 text_t **text;
234 rend_t **rend;
235 121
236 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 122 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
237 ~overlay (); 123 ~overlay ();
238 124
239 void show (); 125 void show ();
243 129
244 void set (int x, int y, SV *str, SV *rend); 130 void set (int x, int y, SV *str, SV *rend);
245}; 131};
246 132
247overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 133overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
248: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2) 134: THIS(THIS), border(border == 2), overlay_av (0)
249{ 135{
136 x = x_;
137 y = y_;
138 w = w_;
139 h = h_;
140
141 if (w < 0) w = 0;
142 if (h < 0) h = 0;
143
250 if (border == 2) 144 if (border == 2)
251 { 145 {
252 w += 2; 146 w += 2;
253 h += 2; 147 h += 2;
254 } 148 }
292 *rp++ = r; 186 *rp++ = r;
293 } 187 }
294 } 188 }
295 189
296 show (); 190 show ();
297 THIS->want_refresh = 1;
298} 191}
299 192
300overlay::~overlay () 193overlay::~overlay ()
301{ 194{
302 hide (); 195 hide ();
307 delete [] rend[y]; 200 delete [] rend[y];
308 } 201 }
309 202
310 delete [] text; 203 delete [] text;
311 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));
312 217
313 THIS->want_refresh = 1; 218 THIS->want_refresh = 1;
314} 219 THIS->refresh_check ();
315
316void
317overlay::show ()
318{
319 char key[33]; sprintf (key, "%32lx", (long)this);
320
321 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
322 hv_store (hv, key, 32, newSViv ((long)this), 0);
323} 220}
324 221
325void 222void
326overlay::hide () 223overlay::hide ()
327{ 224{
328 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 225 if (!overlay_av)
226 return;
329 227
330 if (ovs) 228 int i;
331 {
332 char key[33]; sprintf (key, "%32lx", (long)this);
333 229
334 HV *hv = (HV *)SvRV (*ovs); 230 for (i = AvFILL (overlay_av); i >= 0; i--)
335 hv_delete (hv, key, 32, G_DISCARD); 231 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
336 } 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 ();
337} 244}
338 245
339void overlay::swap () 246void overlay::swap ()
340{ 247{
341 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));
342 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 249 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
343 250
344 int ov_w = min (w, THIS->ncol - ov_x); 251 int ov_w = min (w, THIS->ncol - ov_x);
345 int ov_h = min (h, THIS->nrow - ov_y); 252 int ov_h = min (h, THIS->nrow - ov_y);
253
254 // hide cursor if it is within the overlay area
255 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
256 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
257 THIS->screen.flags &= ~Screen_VisibleCursor;
346 258
347 for (int y = ov_h; y--; ) 259 for (int y = ov_h; y--; )
348 { 260 {
349 text_t *t1 = text [y]; 261 text_t *t1 = text [y];
350 rend_t *r1 = rend [y]; 262 rend_t *r1 = rend [y];
351 263
352 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 264 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
353 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 265 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
354 266
355 for (int x = ov_w; x--; ) 267 for (int x = ov_w; x--; )
356 { 268 {
357 text_t t = *t1; *t1++ = *t2; *t2++ = t; 269 text_t t = *t1; *t1++ = *t2; *t2++ = t;
358 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 270 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
381 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 293 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
382 croak ("rend must be arrayref"); 294 croak ("rend must be arrayref");
383 295
384 AV *av = (AV *)SvRV (rend); 296 AV *av = (AV *)SvRV (rend);
385 297
386 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 298 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
387 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 299 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
388 } 300 }
389 301
390 THIS->want_refresh = 1; 302 THIS->want_refresh = 1;
303 THIS->refresh_check ();
391} 304}
392 305
306/////////////////////////////////////////////////////////////////////////////
307
308#include "iom_perl.h"
393 309
394///////////////////////////////////////////////////////////////////////////// 310/////////////////////////////////////////////////////////////////////////////
395 311
396struct rxvt_perl_interp rxvt_perl; 312struct rxvt_perl_interp rxvt_perl;
397 313
401{ 317{
402 if (perl) 318 if (perl)
403 { 319 {
404 perl_destruct (perl); 320 perl_destruct (perl);
405 perl_free (perl); 321 perl_free (perl);
322 PERL_SYS_TERM ();
406 } 323 }
407} 324}
408 325
409void 326void
410rxvt_perl_interp::init () 327rxvt_perl_interp::init (rxvt_term *term)
411{ 328{
412 if (!perl) 329 if (!perl)
413 { 330 {
331 rxvt_push_locale (""); // perl init destroys current locale
332
333 {
414 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
415 swap (perl_environ, environ); 335 localise_env set_environ (perl_environ);
416 336
417 char *argv[] = { 337 char *args[] = {
418 "", 338 "",
419 "-T", 339 "-e"
420 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 340 "BEGIN {"
341 " urxvt->bootstrap;"
342 " unshift @INC, '" LIBDIR "';"
343 "}"
344 ""
345 "use urxvt;"
421 }; 346 };
347 int argc = ecb_array_length (args);
348 char **argv = args;
422 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
423 perl = perl_alloc (); 351 perl = perl_alloc ();
424 perl_construct (perl); 352 perl_construct (perl);
425 353
426 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
427 || perl_run (perl)) 355 || perl_run (perl))
428 { 356 {
429 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
430 358
431 perl_destruct (perl); 359 perl_destruct (perl);
432 perl_free (perl); 360 perl_free (perl);
433 perl = 0; 361 perl = 0;
434 } 362 }
363 }
435 364
436 swap (perl_environ, environ); 365 rxvt_pop_locale ();
366 }
367
368 if (perl)
369 {
370 // runs outside of perls ENV
371 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
372 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
373 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
437 } 374 }
438} 375}
439 376
440static void 377static void
441ungrab (rxvt_term *THIS) 378ungrab (rxvt_term *THIS)
442{ 379{
443 if (THIS->perl.grabtime) 380 if (THIS->perl.grabtime)
444 { 381 {
445 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 382 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
446 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 383 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
447 THIS->perl.grabtime = 0; 384 THIS->perl.grabtime = 0;
448 } 385 }
449} 386}
450 387
451bool 388bool
452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 389rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
453{ 390{
454 if (!perl) 391 if (!perl || !term->perl.self)
455 return false; 392 return false;
456 393
457 if (htype == HOOK_INIT) // first hook ever called 394 localise_env set_environ (perl_environ);
395
396 // pre-handling of some events
397 if (htype == HOOK_REFRESH_END)
458 { 398 {
459 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 399 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
460 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 400
401 for (int i = 0; i <= AvFILL (av); i++)
402 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
461 } 403 }
462 else if (!term->perl.self)
463 return false; // perl not initialized for this instance
464 else if (htype == HOOK_DESTROY) 404 else if (htype == HOOK_DESTROY)
465 { 405 {
466 // handled later 406 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
407
408 for (int i = AvFILL (av); i >= 0; i--)
409 {
410 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
411 delete req;
412 }
467 } 413 }
468 else
469 {
470 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
471 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
473 414
474 if (HvKEYS (hv)) 415 bool event_consumed;
475 {
476 hv_iterinit (hv);
477 416
478 while (HE *he = hv_iternext (hv)) 417 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
482 }
483
484 if (!term->perl.should_invoke [htype]) 418 || term->perl.should_invoke [htype])
485 return false;
486 }
487
488 swap (perl_environ, environ);
489
490 try
491 { 419 {
492 dSP; 420 dSP;
493 va_list ap; 421 va_list ap;
494 422
495 va_start (ap, htype); 423 va_start (ap, htype);
497 ENTER; 425 ENTER;
498 SAVETMPS; 426 SAVETMPS;
499 427
500 PUSHMARK (SP); 428 PUSHMARK (SP);
501 429
430 EXTEND (SP, 2);
502 XPUSHs (sv_2mortal (newSVterm (term))); 431 PUSHs (sv_2mortal (newSVterm (term)));
503 XPUSHs (sv_2mortal (newSViv (htype))); 432 PUSHs (sv_2mortal (newSViv (htype)));
504 433
505 for (;;) { 434 for (;;) {
506 data_type dt = (data_type)va_arg (ap, int); 435 data_type dt = (data_type)va_arg (ap, int);
507 436
508 switch (dt) 437 switch (dt)
514 case DT_LONG: 443 case DT_LONG:
515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 444 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
516 break; 445 break;
517 446
518 case DT_STR: 447 case DT_STR:
519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 448 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
520 break; 449 break;
521 450
522 case DT_STR_LEN: 451 case DT_STR_LEN:
523 { 452 {
524 char *str = va_arg (ap, char *); 453 char *str = va_arg (ap, char *);
525 int len = va_arg (ap, int); 454 int len = va_arg (ap, int);
526 455
527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 456 XPUSHs (sv_2mortal (newSVpvn (str, len)));
528 } 457 }
529 break; 458 break;
530 459
531 case DT_WCS_LEN: 460 case DT_WCS_LEN:
532 { 461 {
533 wchar_t *wstr = va_arg (ap, wchar_t *); 462 wchar_t *wstr = va_arg (ap, wchar_t *);
463 int wlen = va_arg (ap, int);
464
465 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
466 }
467 break;
468
469 case DT_LCS_LEN:
470 {
471 long *lstr = va_arg (ap, long *);
534 int wlen = va_arg (ap, int); 472 int llen = va_arg (ap, int);
535 473
536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 474 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
537 } 475 }
538 break; 476 break;
539 477
540 case DT_XEVENT: 478 case DT_XEVENT:
541 { 479 {
542 XEvent *xe = va_arg (ap, XEvent *); 480 XEvent *xe = va_arg (ap, XEvent *);
543 HV *hv = newHV (); 481 HV *hv = newHV ();
544 482
545# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 483# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
546# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 484# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
485# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
547# undef set 486# undef set
548 487
549 setiv (type, xe->type); 488 setiv (type, xe->type);
550 setiv (send_event, xe->xany.send_event); 489 setiv (send_event, xe->xany.send_event);
551 setiv (serial, xe->xany.serial); 490 setiv (serial, xe->xany.serial);
552 491
555 case KeyPress: 494 case KeyPress:
556 case KeyRelease: 495 case KeyRelease:
557 case ButtonPress: 496 case ButtonPress:
558 case ButtonRelease: 497 case ButtonRelease:
559 case MotionNotify: 498 case MotionNotify:
499 setuv (window, xe->xmotion.window);
500 setuv (root, xe->xmotion.root);
501 setuv (subwindow, xe->xmotion.subwindow);
560 setiv (time, xe->xmotion.time); 502 setuv (time, xe->xmotion.time);
561 setiv (x, xe->xmotion.x); 503 setiv (x, xe->xmotion.x);
562 setiv (y, xe->xmotion.y); 504 setiv (y, xe->xmotion.y);
563 setiv (row, xe->xmotion.y / term->fheight); 505 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
564 setiv (col, xe->xmotion.x / term->fwidth); 506 setiv (col, xe->xmotion.x / term->fwidth);
565 setiv (x_root, xe->xmotion.x_root); 507 setiv (x_root, xe->xmotion.x_root);
566 setiv (y_root, xe->xmotion.y_root); 508 setiv (y_root, xe->xmotion.y_root);
567 setiv (state, xe->xmotion.state); 509 setuv (state, xe->xmotion.state);
510
511 switch (xe->type)
512 {
513 case KeyPress:
514 case KeyRelease:
515 setuv (keycode, xe->xkey.keycode);
516 break;
517
518 case ButtonPress:
519 case ButtonRelease:
520 setuv (button, xe->xbutton.button);
521 break;
522
523 case MotionNotify:
524 setiv (is_hint, xe->xmotion.is_hint);
525 break;
526 }
527
568 break; 528 break;
569 }
570 529
530 case MapNotify:
531 case UnmapNotify:
532 case ConfigureNotify:
533 setuv (event, xe->xconfigure.event);
534 setuv (window, xe->xconfigure.window);
535
571 switch (xe->type) 536 switch (xe->type)
572 { 537 {
573 case KeyPress: 538 case ConfigureNotify:
574 case KeyRelease: 539 setiv (x, xe->xconfigure.x);
575 setiv (keycode, xe->xkey.keycode); 540 setiv (y, xe->xconfigure.y);
541 setiv (width, xe->xconfigure.width);
542 setiv (height, xe->xconfigure.height);
543 setuv (above, xe->xconfigure.above);
544 break;
545 }
546
576 break; 547 break;
577 548
578 case ButtonPress: 549 case PropertyNotify:
579 case ButtonRelease: 550 setuv (window, xe->xproperty.window);
580 setiv (button, xe->xbutton.button); 551 setuv (atom, xe->xproperty.atom);
552 setuv (time, xe->xproperty.time);
553 setiv (state, xe->xproperty.state);
581 break; 554 break;
582 555
583 case MotionNotify: 556 case ClientMessage:
584 setiv (is_hint, xe->xmotion.is_hint); 557 setuv (window, xe->xclient.window);
558 setuv (message_type, xe->xclient.message_type);
559 setuv (format, xe->xclient.format);
560 setuv (l0, xe->xclient.data.l[0]);
561 setuv (l1, xe->xclient.data.l[1]);
562 setuv (l2, xe->xclient.data.l[2]);
563 setuv (l3, xe->xclient.data.l[3]);
564 setuv (l4, xe->xclient.data.l[4]);
585 break; 565 break;
586 } 566 }
587 567
588 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 568 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
589 } 569 }
590 break; 570 break;
591 571
592 case DT_END: 572 case DT_END:
593 { 573 goto call;
594 va_end (ap);
595
596 PUTBACK;
597 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
598 SPAGAIN;
599
600 if (count)
601 {
602 SV *status = POPs;
603 count = SvTRUE (status);
604 }
605
606 PUTBACK;
607 FREETMPS;
608 LEAVE;
609
610 if (SvTRUE (ERRSV))
611 {
612 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
613 ungrab (term); // better lose the grab than the session
614 }
615
616 if (htype == HOOK_DESTROY)
617 {
618 clearSVptr ((SV *)term->perl.self);
619 SvREFCNT_dec ((SV *)term->perl.self);
620 }
621
622 swap (perl_environ, environ);
623 return count;
624 }
625 574
626 default: 575 default:
627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 576 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 } 577 }
629 } 578 }
579
580 call:
581 va_end (ap);
582
583 PUTBACK;
584 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
585 SPAGAIN;
586
587 if (count)
588 {
589 SV *status = POPs;
590 count = SvTRUE (status);
591 }
592
593 PUTBACK;
594 FREETMPS;
595 LEAVE;
596
597 if (SvTRUE (ERRSV))
598 {
599 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
600 ungrab (term); // better lose the grab than the session
601 }
602
603 event_consumed = !!count;
630 } 604 }
631 catch (...) 605 else
606 event_consumed = false;
607
608 // post-handling of some events
609 if (htype == HOOK_REFRESH_BEGIN)
632 { 610 {
633 swap (perl_environ, environ); 611 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
634 throw; 612
613 for (int i = AvFILL (av); i >= 0; i--)
614 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
635 } 615 }
616 else if (htype == HOOK_DESTROY)
617 {
618 clearSVptr ((SV *)term->perl.self);
619 SvREFCNT_dec ((SV *)term->perl.self);
620
621 // don't allow further calls
622 term->perl.self = 0;
623 }
624
625 return event_consumed;
626}
627
628void
629rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
630{
631 localise_env set_environ (perl_environ);
632
633 ENTER;
634 SAVETMPS;
635
636 dSP;
637 XPUSHs (sv_2mortal (newSVpvn (data, len)));
638 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
639
640 if (SvTRUE (ERRSV))
641 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
642
643 FREETMPS;
644 LEAVE;
636} 645}
637 646
638///////////////////////////////////////////////////////////////////////////// 647/////////////////////////////////////////////////////////////////////////////
639 648
640MODULE = urxvt PACKAGE = urxvt 649MODULE = urxvt PACKAGE = urxvt
652# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 661# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
653# include "hookinc.h" 662# include "hookinc.h"
654# undef def 663# undef def
655 664
656 HV *option = get_hv ("urxvt::OPTION", 1); 665 HV *option = get_hv ("urxvt::OPTION", 1);
657# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 666# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
658# define nodef(name) 667# define nodef(name)
659# include "optinc.h" 668# include "optinc.h"
660# undef nodef 669# undef nodef
661# undef def 670# undef def
662 671
663 HV *stash = gv_stashpv ("urxvt", 1); 672 HV *stash = gv_stashpv ("urxvt", 1);
664 struct { 673 static const struct {
665 const char *name; 674 const char *name;
666 IV iv; 675 IV iv;
667 } *civ, const_iv[] = { 676 } *civ, const_iv[] = {
668# define const_iv(name) { # name, (IV)name } 677# define const_iv(name) { # name, (IV)name }
678 const_iv (NUM_RESOURCES),
669 const_iv (DEFAULT_RSTYLE), 679 const_iv (DEFAULT_RSTYLE),
670 const_iv (OVERLAY_RSTYLE), 680 const_iv (OVERLAY_RSTYLE),
681 const_iv (Color_Bits),
682 const_iv (RS_bgShift), const_iv (RS_bgMask),
683 const_iv (RS_fgShift), const_iv (RS_fgMask),
684 const_iv (RS_Careful),
685 const_iv (RS_fontCount),
686 const_iv (RS_fontShift),
687 const_iv (RS_fontMask),
688 const_iv (RS_baseattrMask),
689 const_iv (RS_attrMask),
690 const_iv (RS_redraw),
691 const_iv (RS_Sel),
671 const_iv (RS_Bold), 692 const_iv (RS_Bold),
672 const_iv (RS_Italic), 693 const_iv (RS_Italic),
673 const_iv (RS_Blink), 694 const_iv (RS_Blink),
674 const_iv (RS_RVid), 695 const_iv (RS_RVid),
675 const_iv (RS_Uline), 696 const_iv (RS_Uline),
688 const_iv (Button3Mask), 709 const_iv (Button3Mask),
689 const_iv (Button4Mask), 710 const_iv (Button4Mask),
690 const_iv (Button5Mask), 711 const_iv (Button5Mask),
691 const_iv (AnyModifier), 712 const_iv (AnyModifier),
692 713
693 const_iv (EVENT_NONE), 714 const_iv (NoSymbol),
694 const_iv (EVENT_READ), 715 const_iv (GrabModeSync),
695 const_iv (EVENT_WRITE), 716 const_iv (GrabModeAsync),
696 717
697 const_iv (NoEventMask), 718 const_iv (NoEventMask),
698 const_iv (KeyPressMask), 719 const_iv (KeyPressMask),
699 const_iv (KeyReleaseMask), 720 const_iv (KeyReleaseMask),
700 const_iv (ButtonPressMask), 721 const_iv (ButtonPressMask),
752 const_iv (SelectionRequest), 773 const_iv (SelectionRequest),
753 const_iv (SelectionNotify), 774 const_iv (SelectionNotify),
754 const_iv (ColormapNotify), 775 const_iv (ColormapNotify),
755 const_iv (ClientMessage), 776 const_iv (ClientMessage),
756 const_iv (MappingNotify), 777 const_iv (MappingNotify),
778# if ENABLE_XIM_ONTHESPOT
779 const_iv (XIMReverse),
780 const_iv (XIMUnderline),
781 const_iv (XIMHighlight),
782 const_iv (XIMPrimary),
783 const_iv (XIMSecondary),
784 const_iv (XIMTertiary),
785 const_iv (XIMVisibleToForward),
786 const_iv (XIMVisibleToBackword),
787 const_iv (XIMVisibleToCenter),
788# if 0
789 const_iv (XIMForwardChar),
790 const_iv (XIMBackwardChar),
791 const_iv (XIMForwardWord),
792 const_iv (XIMBackwardWord),
793 const_iv (XIMCaretUp),
794 const_iv (XIMCaretDown),
795 const_iv (XIMNextLine),
796 const_iv (XIMPreviousLine),
797 const_iv (XIMLineStart),
798 const_iv (XIMLineEnd),
799 const_iv (XIMAbsolutePosition),
800 const_iv (XIMDontChange),
801# endif
802# endif
757 }; 803 };
758 804
759 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 805 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
760 civ-- > const_iv; )
761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 806 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
762} 807}
763 808
764void 809void
765warn (const char *msg) 810warn (const char *msg)
766 CODE: 811 CODE:
769void 814void
770fatal (const char *msg) 815fatal (const char *msg)
771 CODE: 816 CODE:
772 rxvt_fatal ("%s", msg); 817 rxvt_fatal ("%s", msg);
773 818
774SV *
775untaint (SV *sv)
776 CODE:
777 RETVAL = newSVsv (sv);
778 SvTAINTED_off (RETVAL);
779 OUTPUT:
780 RETVAL
781
782void 819void
783_exit (int status) 820_exit (int status)
784
785bool
786safe ()
787 CODE:
788 RETVAL = !rxvt_tainted ();
789 OUTPUT:
790 RETVAL
791 821
792NV 822NV
793NOW () 823NOW ()
794 CODE: 824 CODE:
795 RETVAL = NOW; 825 RETVAL = ev::now ();
796 OUTPUT: 826 OUTPUT:
797 RETVAL 827 RETVAL
798 828
799int 829int
800GET_BASEFG (int rend) 830GET_BASEFG (int rend)
811 RETVAL 841 RETVAL
812 842
813int 843int
814SET_FGCOLOR (int rend, int new_color) 844SET_FGCOLOR (int rend, int new_color)
815 CODE: 845 CODE:
816 RETVAL = SET_FGCOLOR (rend, new_color); 846 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
817 OUTPUT: 847 OUTPUT:
818 RETVAL 848 RETVAL
819 849
820int 850int
821SET_BGCOLOR (int rend, int new_color) 851SET_BGCOLOR (int rend, int new_color)
822 CODE: 852 CODE:
823 RETVAL = SET_BGCOLOR (rend, new_color); 853 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
824 OUTPUT: 854 OUTPUT:
825 RETVAL 855 RETVAL
826 856
827int 857int
828GET_CUSTOM (int rend) 858GET_CUSTOM (int rend)
829 CODE: 859 CODE:
830 RETVAL = (rend && RS_customMask) >> RS_customShift; 860 RETVAL = (rend & RS_customMask) >> RS_customShift;
831 OUTPUT: 861 OUTPUT:
832 RETVAL 862 RETVAL
833 863
834int 864int
835SET_CUSTOM (int rend, int new_value) 865SET_CUSTOM (int rend, int new_value)
842 | ((new_value << RS_customShift) & RS_customMask); 872 | ((new_value << RS_customShift) & RS_customMask);
843} 873}
844 OUTPUT: 874 OUTPUT:
845 RETVAL 875 RETVAL
846 876
877void
878termlist ()
879 PPCODE:
880{
881 EXTEND (SP, rxvt_term::termlist.size ());
882
883 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
884 if ((*t)->perl.self)
885 PUSHs (sv_2mortal (newSVterm (*t)));
886}
887
888IV
889_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
890 CODE:
891 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
892 req->cb_sv = newSVsv (cb);
893 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
894 av_push (av, newSViv ((IV)req));
895 RETVAL = (IV)req;
896 OUTPUT:
897 RETVAL
898
899void
900_delete_selection_request (IV req_)
901 CODE:
902 rxvt_selection *req = (rxvt_selection *)req_;
903 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
904 int i;
905
906 for (i = AvFILL (av); i >= 0; i--)
907 if (SvIV (*av_fetch (av, i, 1)) == req_)
908 break;
909
910 for (; i < AvFILL (av); i++)
911 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
912
913 av_pop (av);
914
915 delete req;
916
847MODULE = urxvt PACKAGE = urxvt::term 917MODULE = urxvt PACKAGE = urxvt::term
848 918
849SV * 919SV *
850_new (...) 920_new (AV *env, AV *arg)
851 CODE: 921 CODE:
852{ 922{
853 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
854 croak ("first argument to urxvt::term->_new must be arrayref");
855
856 rxvt_term *term = new rxvt_term; 923 rxvt_term *term = new rxvt_term;
857 924
858 term->argv = new stringvec; 925 stringvec *argv = new stringvec;
859 term->envv = new stringvec; 926 for (int i = 0; i <= AvFILL (arg); i++)
860
861 for (int i = 1; i < items; i++)
862 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 927 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
863 928
864 AV *envv = (AV *)SvRV (ST (0)); 929 stringvec *envv = new stringvec;
865 for (int i = av_len (envv) + 1; i--; ) 930 for (int i = AvFILL (env) + 1; i--; )
866 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 931 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
867
868 term->envv->push_back (0);
869
870 bool success;
871 932
872 try 933 try
873 { 934 {
874 success = term->init (term->argv->size (), term->argv->begin ()); 935 term->init (argv, envv);
875 } 936 }
876 catch (const class rxvt_failure_exception &e) 937 catch (const class rxvt_failure_exception &e)
877 {
878 success = false;
879 }
880
881 if (!success)
882 { 938 {
883 term->destroy (); 939 term->destroy ();
884 croak ("error while initializing new terminal instance"); 940 croak ("error while initializing new terminal instance");
885 } 941 }
886 942
896void 952void
897rxvt_term::set_should_invoke (int htype, int inc) 953rxvt_term::set_should_invoke (int htype, int inc)
898 CODE: 954 CODE:
899 THIS->perl.should_invoke [htype] += inc; 955 THIS->perl.should_invoke [htype] += inc;
900 956
901void 957int
902rxvt_term::grab_button (int button, U32 modifiers) 958rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
903 CODE: 959 CODE:
904 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 960 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
905 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 961 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
906 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 962 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
963 OUTPUT: RETVAL
964
965int
966rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
967 CODE:
968 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
969 OUTPUT: RETVAL
970
971void
972rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
973 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
974 CODE:
975 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
976
977void
978rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
979 CODE:
980 XUngrabKey (THIS->dpy, keycode, modifiers, window);
907 981
908bool 982bool
909rxvt_term::grab (U32 eventtime, int sync = 0) 983rxvt_term::grab (Time eventtime, int sync = 0)
910 CODE: 984 CODE:
911{ 985{
912 int mode = sync ? GrabModeSync : GrabModeAsync; 986 int mode = sync ? GrabModeSync : GrabModeAsync;
913 987
914 THIS->perl.grabtime = 0; 988 THIS->perl.grabtime = 0;
915 989
916 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 990 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
917 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 991 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
918 mode, mode, None, GRAB_CURSOR, eventtime)) 992 mode, mode, None, GRAB_CURSOR, eventtime))
919 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 993 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
920 THIS->perl.grabtime = eventtime; 994 THIS->perl.grabtime = eventtime;
921 else 995 else
922 XUngrabPointer (THIS->display->display, eventtime); 996 XUngrabPointer (THIS->dpy, eventtime);
923 997
924 RETVAL = !!THIS->perl.grabtime; 998 RETVAL = !!THIS->perl.grabtime;
925} 999}
926 OUTPUT: 1000 OUTPUT:
927 RETVAL 1001 RETVAL
928 1002
929void 1003void
930rxvt_term::allow_events_async () 1004rxvt_term::allow_events_async ()
931 CODE: 1005 CODE:
932 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1006 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
933 1007
934void 1008void
935rxvt_term::allow_events_sync () 1009rxvt_term::allow_events_sync ()
936 CODE: 1010 CODE:
937 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1011 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
938 1012
939void 1013void
940rxvt_term::allow_events_replay () 1014rxvt_term::allow_events_replay ()
941 CODE: 1015 CODE:
942 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1016 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
943 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1017 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
944 1018
945void 1019void
946rxvt_term::ungrab () 1020rxvt_term::ungrab ()
947 CODE: 1021 CODE:
948 ungrab (THIS); 1022 ungrab (THIS);
1023
1024int
1025rxvt_term::XStringToKeysym (char *string)
1026 CODE:
1027 RETVAL = XStringToKeysym (string);
1028 OUTPUT: RETVAL
1029
1030char *
1031rxvt_term::XKeysymToString (int sym)
1032 CODE:
1033 RETVAL = XKeysymToString (sym);
1034 OUTPUT: RETVAL
1035
1036int
1037rxvt_term::XKeysymToKeycode (int sym)
1038 CODE:
1039 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
1040 OUTPUT: RETVAL
1041
1042int
1043rxvt_term::XKeycodeToKeysym (int code, int index)
1044 CODE:
1045 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
1046 OUTPUT: RETVAL
949 1047
950int 1048int
951rxvt_term::strwidth (SV *str) 1049rxvt_term::strwidth (SV *str)
952 CODE: 1050 CODE:
953{ 1051{
954 wchar_t *wstr = sv2wcs (str); 1052 wchar_t *wstr = sv2wcs (str);
955 1053
956 rxvt_push_locale (THIS->locale); 1054 rxvt_push_locale (THIS->locale);
957 RETVAL = wcswidth (wstr, wcslen (wstr)); 1055 RETVAL = 0;
1056 for (wchar_t *wc = wstr; *wc; wc++)
1057 {
1058 int w = WCWIDTH (*wc);
1059
1060 if (w)
1061 RETVAL += max (w, 1);
1062 }
958 rxvt_pop_locale (); 1063 rxvt_pop_locale ();
959 1064
960 free (wstr); 1065 free (wstr);
961} 1066}
962 OUTPUT: 1067 OUTPUT:
972 char *mbstr = rxvt_wcstombs (wstr); 1077 char *mbstr = rxvt_wcstombs (wstr);
973 rxvt_pop_locale (); 1078 rxvt_pop_locale ();
974 1079
975 free (wstr); 1080 free (wstr);
976 1081
977 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1082 RETVAL = newSVpv (mbstr, 0);
978 free (mbstr); 1083 free (mbstr);
979} 1084}
980 OUTPUT: 1085 OUTPUT:
981 RETVAL 1086 RETVAL
982 1087
989 1094
990 rxvt_push_locale (THIS->locale); 1095 rxvt_push_locale (THIS->locale);
991 wchar_t *wstr = rxvt_mbstowcs (data, len); 1096 wchar_t *wstr = rxvt_mbstowcs (data, len);
992 rxvt_pop_locale (); 1097 rxvt_pop_locale ();
993 1098
994 RETVAL = taint_if (wcs2sv (wstr), octets); 1099 RETVAL = wcs2sv (wstr);
995 free (wstr); 1100 free (wstr);
996} 1101}
997 OUTPUT: 1102 OUTPUT:
998 RETVAL 1103 RETVAL
999 1104
1000#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1105#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1001 1106
1002#define TERM_OFFSET_width TERM_OFFSET(width) 1107#define TERM_OFFSET_width TERM_OFFSET(width)
1003#define TERM_OFFSET_height TERM_OFFSET(height) 1108#define TERM_OFFSET_height TERM_OFFSET(height)
1004#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1109#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1005#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1110#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1006#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1111#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1007#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1112#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1008#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1113#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1009#define TERM_OFFSET_focus TERM_OFFSET(focus) 1114#define TERM_OFFSET_focus TERM_OFFSET(focus)
1010#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1115#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1116#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1117#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1118#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1119#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1011#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1120#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1012#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1121#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1013#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1122#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1014 1123
1015int 1124int
1016rxvt_term::width () 1125rxvt_term::width ()
1017 ALIAS: 1126 ALIAS:
1018 width = TERM_OFFSET_width 1127 width = TERM_OFFSET_width
1019 height = TERM_OFFSET_height 1128 height = TERM_OFFSET_height
1020 fwidth = TERM_OFFSET_fwidth 1129 fwidth = TERM_OFFSET_fwidth
1021 fheight = TERM_OFFSET_fheight 1130 fheight = TERM_OFFSET_fheight
1022 fbase = TERM_OFFSET_fbase 1131 fbase = TERM_OFFSET_fbase
1023 nrow = TERM_OFFSET_nrow 1132 nrow = TERM_OFFSET_nrow
1024 ncol = TERM_OFFSET_ncol 1133 ncol = TERM_OFFSET_ncol
1025 focus = TERM_OFFSET_focus 1134 focus = TERM_OFFSET_focus
1026 mapped = TERM_OFFSET_mapped 1135 mapped = TERM_OFFSET_mapped
1136 int_bwidth = TERM_OFFSET_int_bwidth
1137 ext_bwidth = TERM_OFFSET_ext_bwidth
1138 lineSpace = TERM_OFFSET_lineSpace
1139 letterSpace = TERM_OFFSET_letterSpace
1027 saveLines = TERM_OFFSET_saveLines 1140 saveLines = TERM_OFFSET_saveLines
1028 total_rows = TERM_OFFSET_total_rows 1141 total_rows = TERM_OFFSET_total_rows
1029 nsaved = TERM_OFFSET_nsaved 1142 top_row = TERM_OFFSET_top_row
1030 CODE: 1143 CODE:
1031 RETVAL = *(int *)((char *)THIS + ix); 1144 RETVAL = *(int *)((char *)THIS + ix);
1032 OUTPUT: 1145 OUTPUT:
1033 RETVAL 1146 RETVAL
1034 1147
1036rxvt_term::ModLevel3Mask () 1149rxvt_term::ModLevel3Mask ()
1037 ALIAS: 1150 ALIAS:
1038 ModLevel3Mask = 0 1151 ModLevel3Mask = 0
1039 ModMetaMask = 1 1152 ModMetaMask = 1
1040 ModNumLockMask = 2 1153 ModNumLockMask = 2
1154 current_screen = 3
1155 hidden_cursor = 4
1041 CODE: 1156 CODE:
1042 switch (ix) 1157 switch (ix)
1043 { 1158 {
1044 case 0: RETVAL = THIS->ModLevel3Mask; break; 1159 case 0: RETVAL = THIS->ModLevel3Mask; break;
1045 case 1: RETVAL = THIS->ModMetaMask; break; 1160 case 1: RETVAL = THIS->ModMetaMask; break;
1046 case 2: RETVAL = THIS->ModNumLockMask; break; 1161 case 2: RETVAL = THIS->ModNumLockMask; break;
1162 case 3: RETVAL = THIS->current_screen; break;
1163#ifdef CURSOR_BLINK
1164 case 4: RETVAL = THIS->hidden_cursor; break;
1165#endif
1047 } 1166 }
1048 OUTPUT: 1167 OUTPUT:
1049 RETVAL 1168 RETVAL
1050 1169
1051char * 1170char *
1061 } 1180 }
1062 OUTPUT: 1181 OUTPUT:
1063 RETVAL 1182 RETVAL
1064 1183
1065SV * 1184SV *
1066rxvt_term::_env () 1185rxvt_term::envv ()
1186 ALIAS:
1187 argv = 1
1067 CODE: 1188 PPCODE:
1068{ 1189{
1069 if (THIS->envv) 1190 stringvec *vec = ix ? THIS->argv : THIS->envv;
1070 {
1071 AV *av = newAV ();
1072 1191
1192 EXTEND (SP, vec->size ());
1193
1073 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1194 for (char **i = vec->begin (); i != vec->end (); ++i)
1074 if (*i) 1195 if (*i)
1075 av_push (av, newSVpv (*i, 0)); 1196 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1076
1077 RETVAL = newRV_noinc ((SV *)av);
1078 }
1079 else
1080 RETVAL = &PL_sv_undef;
1081} 1197}
1082 OUTPUT:
1083 RETVAL
1084 1198
1085int 1199int
1086rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1200rxvt_term::pty_ev_events (int events = ev::UNDEF)
1087 CODE: 1201 CODE:
1088 RETVAL = THIS->pty_ev.events; 1202 RETVAL = THIS->pty_ev.events;
1089 if (events != EVENT_UNDEF) 1203 if (events != ev::UNDEF)
1090 THIS->pty_ev.set (events); 1204 THIS->pty_ev.set (events);
1091 OUTPUT: 1205 OUTPUT:
1092 RETVAL 1206 RETVAL
1093 1207
1094U32 1208int
1209rxvt_term::pty_fd ()
1210 CODE:
1211 RETVAL = THIS->pty->pty;
1212 OUTPUT:
1213 RETVAL
1214
1215Window
1095rxvt_term::parent () 1216rxvt_term::parent ()
1096 CODE: 1217 CODE:
1097 RETVAL = (U32)THIS->parent [0]; 1218 RETVAL = THIS->parent;
1098 OUTPUT: 1219 OUTPUT:
1099 RETVAL 1220 RETVAL
1100 1221
1101U32 1222Window
1102rxvt_term::vt () 1223rxvt_term::vt ()
1103 CODE: 1224 CODE:
1104 RETVAL = (U32)THIS->vt; 1225 RETVAL = THIS->vt;
1105 OUTPUT: 1226 OUTPUT:
1106 RETVAL 1227 RETVAL
1107 1228
1108void 1229void
1109rxvt_term::vt_emask_add (U32 emask) 1230rxvt_term::vt_emask_add (U32 emask)
1118 THIS->rstyle = new_rstyle; 1239 THIS->rstyle = new_rstyle;
1119 OUTPUT: 1240 OUTPUT:
1120 RETVAL 1241 RETVAL
1121 1242
1122int 1243int
1123rxvt_term::view_start (int newval = -1) 1244rxvt_term::view_start (int newval = 1)
1124 PROTOTYPE: $;$ 1245 PROTOTYPE: $;$
1125 CODE: 1246 CODE:
1126{ 1247{
1127 RETVAL = THIS->view_start; 1248 RETVAL = THIS->view_start;
1128 1249
1129 if (newval >= 0) 1250 if (newval <= 0)
1130 { 1251 THIS->scr_changeview (max (newval, THIS->top_row));
1131 THIS->view_start = min (newval, THIS->nsaved);
1132 THIS->scr_changeview (RETVAL);
1133 }
1134} 1252}
1135 OUTPUT: 1253 OUTPUT:
1136 RETVAL 1254 RETVAL
1137 1255
1138void 1256void
1257rxvt_term::set_urgency (bool enable)
1258
1259void
1260rxvt_term::focus_in ()
1261
1262void
1263rxvt_term::focus_out ()
1264
1265void
1266rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1267 ALIAS:
1268 key_release = 1
1269 CODE:
1270{
1271 XKeyEvent xkey;
1272
1273 memset (&xkey, 0, sizeof (xkey));
1274
1275 xkey.time = time;
1276 xkey.state = state;
1277 xkey.keycode = keycode;
1278
1279 xkey.type = ix ? KeyRelease : KeyPress;
1280 xkey.display = THIS->dpy;
1281 xkey.window = THIS->vt;
1282 xkey.root = THIS->display->root;
1283 xkey.subwindow = THIS->vt;
1284
1285 if (ix)
1286 THIS->key_release (xkey);
1287 else
1288 THIS->key_press (xkey);
1289}
1290
1291void
1139rxvt_term::want_refresh () 1292rxvt_term::want_refresh ()
1140 CODE: 1293 CODE:
1141 THIS->want_refresh = 1; 1294 THIS->want_refresh = 1;
1295 THIS->refresh_check ();
1142 1296
1143void 1297void
1144rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1298rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1145 PPCODE: 1299 PPCODE:
1146{ 1300{
1147 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1301 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1148 XSRETURN_EMPTY; 1302 XSRETURN_EMPTY;
1149 1303
1150 line_t &l = ROW(row_number); 1304 line_t &l = ROW(row_number);
1151 1305
1152 if (GIMME_V != G_VOID) 1306 if (GIMME_V != G_VOID)
1153 { 1307 {
1154 wchar_t *wstr = new wchar_t [THIS->ncol]; 1308 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1155 1309
1156 for (int col = 0; col < THIS->ncol; col++) 1310 for (int col = 0; col < THIS->ncol; col++)
1157 wstr [col] = l.t [col]; 1311 wstr [col] = l.t [col];
1158 1312
1159 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1313 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1160
1161 delete [] wstr;
1162 } 1314 }
1163 1315
1164 if (new_text) 1316 if (new_text)
1165 { 1317 {
1166 wchar_t *wstr = sv2wcs (new_text); 1318 wchar_t *wstr = sv2wcs (new_text);
1167 1319
1168 int len = min (wcslen (wstr) - start_ofs, max_len); 1320 int len = min (wcslen (wstr) - start_ofs, max_len);
1169 1321
1170 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1322 if (start_col < 0 || start_col + len > THIS->ncol)
1171 { 1323 {
1172 free (wstr); 1324 free (wstr);
1173 croak ("new_text extends beyond horizontal margins"); 1325 croak ("new_text extends beyond horizontal margins");
1174 } 1326 }
1175 1327
1185 1337
1186void 1338void
1187rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1339rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1188 PPCODE: 1340 PPCODE:
1189{ 1341{
1190 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1342 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1191 XSRETURN_EMPTY; 1343 XSRETURN_EMPTY;
1192 1344
1193 line_t &l = ROW(row_number); 1345 line_t &l = ROW(row_number);
1194 1346
1195 if (GIMME_V != G_VOID) 1347 if (GIMME_V != G_VOID)
1207 { 1359 {
1208 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1360 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1209 croak ("new_rend must be arrayref"); 1361 croak ("new_rend must be arrayref");
1210 1362
1211 AV *av = (AV *)SvRV (new_rend); 1363 AV *av = (AV *)SvRV (new_rend);
1212 int len = min (av_len (av) + 1 - start_ofs, max_len); 1364 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1213 1365
1214 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1366 if (start_col < 0 || start_col + len > THIS->ncol)
1215 croak ("new_rend array extends beyond horizontal margins"); 1367 croak ("new_rend array extends beyond horizontal margins");
1216 1368
1217 for (int col = start_col; col < start_col + len; col++) 1369 for (int col = start_col; col < start_col + len; col++)
1218 { 1370 {
1219 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1371 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1225 1377
1226int 1378int
1227rxvt_term::ROW_l (int row_number, int new_length = -1) 1379rxvt_term::ROW_l (int row_number, int new_length = -1)
1228 CODE: 1380 CODE:
1229{ 1381{
1230 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1382 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1231 XSRETURN_EMPTY; 1383 XSRETURN_EMPTY;
1232 1384
1233 line_t &l = ROW(row_number); 1385 line_t &l = ROW(row_number);
1234 RETVAL = l.l; 1386 RETVAL = l.l;
1235 1387
1241 1393
1242bool 1394bool
1243rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1395rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1244 CODE: 1396 CODE:
1245{ 1397{
1246 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1398 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1247 XSRETURN_EMPTY; 1399 XSRETURN_EMPTY;
1248 1400
1249 line_t &l = ROW(row_number); 1401 line_t &l = ROW(row_number);
1250 RETVAL = l.is_longer (); 1402 RETVAL = l.is_longer ();
1251 1403
1259rxvt_term::special_encode (SV *string) 1411rxvt_term::special_encode (SV *string)
1260 CODE: 1412 CODE:
1261{ 1413{
1262 wchar_t *wstr = sv2wcs (string); 1414 wchar_t *wstr = sv2wcs (string);
1263 int wlen = wcslen (wstr); 1415 int wlen = wcslen (wstr);
1264 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1416 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1265 1417
1266 rxvt_push_locale (THIS->locale); 1418 rxvt_push_locale (THIS->locale);
1267 1419
1268 wchar_t *r = rstr; 1420 wchar_t *r = rstr;
1269 for (wchar_t *s = wstr; *s; s++) 1421 for (wchar_t *s = wstr; *s; s++)
1422 {
1423 int w = WCWIDTH (*s);
1424
1270 if (wcwidth (*s) == 0) 1425 if (w == 0)
1271 { 1426 {
1272 if (r == rstr) 1427 if (r == rstr)
1273 croak ("leading combining character unencodable"); 1428 croak ("leading combining character unencodable");
1274 1429
1275 unicode_t n = rxvt_compose (r[-1], *s); 1430 unicode_t n = rxvt_compose (r[-1], *s);
1276 if (n == NOCHAR) 1431 if (n == NOCHAR)
1277 n = rxvt_composite.compose (r[-1], *s); 1432 n = rxvt_composite.compose (r[-1], *s);
1278 1433
1279 r[-1] = n; 1434 r[-1] = n;
1280 } 1435 }
1281#if !UNICODE_3 1436#if !UNICODE_3
1282 else if (*s >= 0x10000) 1437 else if (*s >= 0x10000)
1283 *r++ = rxvt_composite.compose (*s); 1438 *r++ = rxvt_composite.compose (*s);
1284#endif 1439#endif
1285 else 1440 else
1286 *r++ = *s; 1441 *r++ = *s;
1442
1443 // the *2 above only allows wcwidth <= 2
1444 if (w > 1)
1445 *r++ = NOCHAR;
1446 }
1287 1447
1288 rxvt_pop_locale (); 1448 rxvt_pop_locale ();
1289 1449
1290 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1450 RETVAL = wcs2sv (rstr, r - rstr);
1291
1292 delete [] rstr;
1293} 1451}
1294 OUTPUT: 1452 OUTPUT:
1295 RETVAL 1453 RETVAL
1296 1454
1297SV * 1455SV *
1298rxvt_term::special_decode (SV *text) 1456rxvt_term::special_decode (SV *text)
1299 CODE: 1457 CODE:
1300{ 1458{
1301 wchar_t *wstr = sv2wcs (text); 1459 wchar_t *wstr = sv2wcs (text);
1302 int wlen = wcslen (wstr);
1303 int dlen = 0; 1460 int dlen = 0;
1304 1461
1305 // find length 1462 // find length
1306 for (wchar_t *s = wstr; *s; s++) 1463 for (wchar_t *s = wstr; *s; s++)
1307 if (*s == NOCHAR) 1464 if (*s == NOCHAR)
1309 else if (IS_COMPOSE (*s)) 1466 else if (IS_COMPOSE (*s))
1310 dlen += rxvt_composite.expand (*s, 0); 1467 dlen += rxvt_composite.expand (*s, 0);
1311 else 1468 else
1312 dlen++; 1469 dlen++;
1313 1470
1314 wchar_t *rstr = new wchar_t [dlen]; 1471 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1315 1472
1316 // decode 1473 // decode
1317 wchar_t *r = rstr; 1474 wchar_t *r = rstr;
1318 for (wchar_t *s = wstr; *s; s++) 1475 for (wchar_t *s = wstr; *s; s++)
1319 if (*s == NOCHAR) 1476 if (*s == NOCHAR)
1321 else if (IS_COMPOSE (*s)) 1478 else if (IS_COMPOSE (*s))
1322 r += rxvt_composite.expand (*s, r); 1479 r += rxvt_composite.expand (*s, r);
1323 else 1480 else
1324 *r++ = *s; 1481 *r++ = *s;
1325 1482
1326 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1483 RETVAL = wcs2sv (rstr, r - rstr);
1327
1328 delete [] rstr;
1329} 1484}
1330 OUTPUT: 1485 OUTPUT:
1331 RETVAL 1486 RETVAL
1332 1487
1333void 1488void
1334rxvt_term::_resource (char *name, int index, SV *newval = 0) 1489rxvt_term::_resource (char *name, int index, SV *newval = 0)
1335 PPCODE: 1490 PPCODE:
1336{ 1491{
1337 struct resval { const char *name; int value; } rslist [] = { 1492 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1338# define def(name) { # name, Rs_ ## name }, 1493# define def(name) { # name, Rs_ ## name },
1339# define reserve(name,count) 1494# define reserve(name,count)
1340# include "rsinc.h" 1495# include "rsinc.h"
1341# undef def 1496# undef def
1342# undef reserve 1497# undef reserve
1343 }; 1498 };
1344 1499
1345 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1500 rs = rslist + ecb_array_length (rslist);
1346 1501
1502 if (*name)
1347 do { 1503 {
1504 do {
1348 if (rs-- == rslist) 1505 if (rs-- == rslist)
1349 croak ("no such resource '%s', requested", name); 1506 croak ("no such resource '%s', requested", name);
1350 } while (strcmp (name, rs->name)); 1507 } while (strcmp (name, rs->name));
1351 1508
1352 index += rs->value; 1509 index += rs->value;
1510 }
1511 else
1512 {
1513 --rs;
1514 name = "";
1515 }
1353 1516
1354 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1517 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1355 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1518 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1356 1519
1357 if (GIMME_V != G_VOID) 1520 if (GIMME_V != G_VOID)
1358 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1521 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1359 1522
1360 if (newval) 1523 if (newval)
1361 { 1524 {
1362 if (SvOK (newval)) 1525 if (SvOK (newval))
1363 { 1526 {
1370 } 1533 }
1371} 1534}
1372 1535
1373const char * 1536const char *
1374rxvt_term::x_resource (const char *name) 1537rxvt_term::x_resource (const char *name)
1375 CLEANUP:
1376 SvTAINTED_on (ST (0));
1377 1538
1378bool 1539bool
1379rxvt_term::option (U32 optval, int set = -1) 1540rxvt_term::option (U8 optval, int set = -1)
1380 CODE: 1541 CODE:
1381{ 1542{
1382 RETVAL = THIS->options & optval; 1543 RETVAL = THIS->option (optval);
1383 1544
1384 if (set >= 0) 1545 if (set >= 0)
1385 { 1546 {
1386 if (set)
1387 THIS->options |= optval; 1547 THIS->set_option (optval, set);
1388 else
1389 THIS->options &= ~optval;
1390 1548
1549 if (THIS->init_done) // avoid doing this before START
1391 switch (optval) 1550 switch (optval)
1392 { 1551 {
1393 case Opt_skipBuiltinGlyphs: 1552 case Opt_skipBuiltinGlyphs:
1394 THIS->set_fonts (); 1553 THIS->set_fonts ();
1395 THIS->scr_remap_chars (); 1554 THIS->scr_remap_chars ();
1396 THIS->scr_touch (true); 1555 THIS->scr_touch (true);
1397 THIS->want_refresh = 1; 1556 THIS->want_refresh = 1;
1557 THIS->refresh_check ();
1398 break; 1558 break;
1399 1559
1560#ifdef CURSOR_BLINK
1561 case Opt_cursorBlink:
1562 THIS->cursor_blink_reset ();
1563 break;
1564#endif
1565
1400 case Opt_cursorUnderline: 1566 case Opt_cursorUnderline:
1401 THIS->want_refresh = 1; 1567 THIS->want_refresh = 1;
1568 THIS->refresh_check ();
1402 break; 1569 break;
1403 1570
1404# case Opt_scrollBar_floating: 1571# case Opt_scrollBar_floating:
1405# case Opt_scrollBar_right: 1572# case Opt_scrollBar_right:
1406# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1573# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1407# break; 1574# break;
1408 } 1575 }
1409 } 1576 }
1410} 1577}
1411 OUTPUT: 1578 OUTPUT:
1412 RETVAL 1579 RETVAL
1413 1580
1416 CODE: 1583 CODE:
1417 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1584 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1418 THIS->keyboard->register_done (); 1585 THIS->keyboard->register_done ();
1419 OUTPUT: 1586 OUTPUT:
1420 RETVAL 1587 RETVAL
1588
1589void
1590rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1591 CODE:
1592 wchar_t *wstr = sv2wcs (str);
1593 THIS->keyboard->register_user_translation (keysym, state, wstr);
1594 free (wstr);
1421 1595
1422void 1596void
1423rxvt_term::screen_cur (...) 1597rxvt_term::screen_cur (...)
1424 PROTOTYPE: $;$$ 1598 PROTOTYPE: $;$$
1425 ALIAS: 1599 ALIAS:
1439 EXTEND (SP, 2); 1613 EXTEND (SP, 2);
1440 PUSHs (sv_2mortal (newSViv (rc.row))); 1614 PUSHs (sv_2mortal (newSViv (rc.row)));
1441 PUSHs (sv_2mortal (newSViv (rc.col))); 1615 PUSHs (sv_2mortal (newSViv (rc.col)));
1442 } 1616 }
1443 1617
1444 if (items == 3) 1618 if (items >= 3)
1619 {
1620 rc.row = SvIV (ST (1));
1621 rc.col = SvIV (ST (2));
1622
1623 if (ix == 2)
1445 { 1624 {
1446 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1625 if (rc.col == 0)
1447 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1626 {
1627 // col == 0 means end of previous line
1628 rc.row--;
1629 rc.col = THIS->ncol;
1630 }
1631 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1632 && rc.col > ROW(rc.row).l)
1633 {
1634 // col >= length means while line and add newline
1635 rc.col = THIS->ncol;
1636 }
1637 }
1638
1639 clamp_it (rc.col, 0, THIS->ncol);
1640 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1448 1641
1449 if (ix) 1642 if (ix)
1643 {
1644 THIS->selection.screen = THIS->current_screen;
1645
1450 THIS->want_refresh = 1; 1646 THIS->want_refresh = 1;
1647 THIS->refresh_check ();
1451 } 1648 }
1649 }
1452} 1650}
1453 1651
1454char 1652int
1455rxvt_term::cur_charset () 1653rxvt_term::selection_screen (int screen = -1)
1456 CODE: 1654 CODE:
1457 RETVAL = THIS->charsets [THIS->screen.charset]; 1655 RETVAL = THIS->selection.screen;
1458 OUTPUT: 1656 if (screen >= 0)
1657 THIS->selection.screen = screen;
1658 OUTPUT:
1459 RETVAL 1659 RETVAL
1460 1660
1461#void 1661void
1462#rxvt_term::selection_clear () 1662rxvt_term::selection_clear (bool clipboard = false)
1463 1663
1464void 1664void
1465rxvt_term::selection_make (U32 eventtime, bool rect = false) 1665rxvt_term::selection_make (Time eventtime, bool rect = false)
1466 CODE: 1666 CODE:
1467 THIS->selection.op = SELECTION_CONT; 1667 THIS->selection.op = SELECTION_CONT;
1468 THIS->selection.rect = rect; 1668 THIS->selection.rect = rect;
1469 THIS->selection_make (eventtime); 1669 THIS->selection_make (eventtime);
1470 1670
1471int 1671int
1472rxvt_term::selection_grab (U32 eventtime) 1672rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1473 1673
1474void 1674void
1475rxvt_term::selection (SV *newtext = 0) 1675rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1476 PPCODE: 1676 PPCODE:
1477{ 1677{
1678 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1679 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1680
1478 if (GIMME_V != G_VOID) 1681 if (GIMME_V != G_VOID)
1479 XPUSHs (THIS->selection.text 1682 XPUSHs (text
1480 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1683 ? sv_2mortal (wcs2sv (text, len))
1481 : &PL_sv_undef); 1684 : &PL_sv_undef);
1482 1685
1483 if (newtext) 1686 if (newtext)
1484 { 1687 {
1485 free (THIS->selection.text); 1688 free (text);
1486 1689
1487 THIS->selection.text = sv2wcs (newtext); 1690 text = sv2wcs (newtext);
1488 THIS->selection.len = wcslen (THIS->selection.text); 1691 len = wcslen (text);
1489 } 1692 }
1490} 1693}
1694
1695char
1696rxvt_term::cur_charset ()
1697 CODE:
1698 RETVAL = THIS->charsets [THIS->screen.charset];
1699 OUTPUT:
1700 RETVAL
1491 1701
1492void 1702void
1493rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) 1703rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1494 1704
1495void 1705void
1496rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1706rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1497 1707
1498void 1708void
1499rxvt_term::scr_bell () 1709rxvt_term::scr_bell ()
1710
1711void
1712rxvt_term::scr_change_screen (int screen)
1500 1713
1501void 1714void
1502rxvt_term::scr_add_lines (SV *string) 1715rxvt_term::scr_add_lines (SV *string)
1503 CODE: 1716 CODE:
1504{ 1717{
1514 char *str = SvPVbyte (octets, len); 1727 char *str = SvPVbyte (octets, len);
1515 C_ARGS: 1728 C_ARGS:
1516 str, len 1729 str, len
1517 1730
1518void 1731void
1732rxvt_term::tt_paste (SV *octets)
1733 INIT:
1734 STRLEN len;
1735 char *str = SvPVbyte (octets, len);
1736 C_ARGS:
1737 str, len
1738
1739void
1519rxvt_term::cmd_parse (SV *octets) 1740rxvt_term::cmd_parse (SV *octets)
1520 CODE: 1741 CODE:
1521{ 1742{
1522 STRLEN len; 1743 STRLEN len;
1523 char *str = SvPVbyte (octets, len); 1744 char *str = SvPVbyte (octets, len);
1545 o->self = (HV *)SvRV (RETVAL); 1766 o->self = (HV *)SvRV (RETVAL);
1546} 1767}
1547 OUTPUT: 1768 OUTPUT:
1548 RETVAL 1769 RETVAL
1549 1770
1771#############################################################################
1772# Various X Utility Functions
1773#############################################################################
1774
1775void
1776rxvt_term::XListProperties (Window window)
1777 PPCODE:
1778{
1779 int count;
1780 Atom *props = XListProperties (THIS->dpy, window, &count);
1781
1782 EXTEND (SP, count);
1783 while (count--)
1784 PUSHs (newSVuv ((U32)props [count]));
1785
1786 XFree (props);
1787}
1788
1789void
1790rxvt_term::XGetWindowProperty (Window window, Atom property)
1791 PPCODE:
1792{
1793 Atom type;
1794 int format;
1795 unsigned long nitems;
1796 unsigned long bytes_after;
1797 unsigned char *prop;
1798
1799 XGetWindowProperty (THIS->dpy, window, property,
1800 0, 1<<24, 0, AnyPropertyType,
1801 &type, &format, &nitems, &bytes_after, &prop);
1802
1803 if (type != None)
1804 {
1805 int elemsize = format == 16 ? sizeof (short)
1806 : format == 32 ? sizeof (long)
1807 : 1;
1808
1809 EXTEND (SP, 3);
1810 PUSHs (newSVuv ((U32)type));
1811 PUSHs (newSViv (format));
1812 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1813 XFree (prop);
1814 }
1815}
1816
1817void
1818rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1819 CODE:
1820{
1821 STRLEN len;
1822 char *data_ = SvPVbyte (data, len);
1823
1824 int elemsize = format == 16 ? sizeof (short)
1825 : format == 32 ? sizeof (long)
1826 : 1;
1827
1828 XChangeProperty (THIS->dpy, window, property,
1829 type, format, PropModeReplace,
1830 (unsigned char *)data_, len / elemsize);
1831}
1832
1833Atom
1834XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1835 C_ARGS: term->dpy, atom_name, only_if_exists
1836
1837char *
1838XGetAtomName (rxvt_term *term, Atom atom)
1839 C_ARGS: term->dpy, atom
1840 CLEANUP:
1841 XFree (RETVAL);
1842
1843void
1844XDeleteProperty (rxvt_term *term, Window window, Atom property)
1845 C_ARGS: term->dpy, window, property
1846
1847Window
1848rxvt_term::DefaultRootWindow ()
1849 CODE:
1850 RETVAL = THIS->display->root;
1851 OUTPUT:
1852 RETVAL
1853
1854#if 0
1855
1856Window
1857XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1858 C_ARGS: term->dpy, (Window)parent,
1859 x, y, width, height, 0,
1860 term->pix_colors_focused[Color_border],
1861 term->pix_colors_focused[Color_border]
1862
1863#endif
1864
1865void
1866XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1867 C_ARGS: term->dpy, window, parent, x, y
1868
1869void
1870XMapWindow (rxvt_term *term, Window window)
1871 C_ARGS: term->dpy, window
1872
1873void
1874XUnmapWindow (rxvt_term *term, Window window)
1875 C_ARGS: term->dpy, window
1876
1877void
1878XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1879 C_ARGS: term->dpy, window, x, y, width, height
1880
1881void
1882rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1883 CODE:
1884{
1885 XWindowAttributes attr;
1886 XGetWindowAttributes (THIS->dpy, window, &attr);
1887 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1888}
1889
1890void
1891rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1892 PPCODE:
1893{
1894 int dx, dy;
1895 Window child;
1896
1897 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1898 {
1899 EXTEND (SP, 3);
1900 PUSHs (newSViv (dx));
1901 PUSHs (newSViv (dy));
1902 PUSHs (newSVuv (child));
1903 }
1904}
1905
1906#############################################################################
1907# urxvt::overlay
1908#############################################################################
1909
1550MODULE = urxvt PACKAGE = urxvt::overlay 1910MODULE = urxvt PACKAGE = urxvt::overlay
1551 1911
1552void 1912void
1553overlay::set (int x, int y, SV *text, SV *rend = 0) 1913overlay::set (int x, int y, SV *text, SV *rend = 0)
1554 1914
1559overlay::hide () 1919overlay::hide ()
1560 1920
1561void 1921void
1562overlay::DESTROY () 1922overlay::DESTROY ()
1563 1923
1564MODULE = urxvt PACKAGE = urxvt::timer 1924INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1565 1925
1566SV *
1567timer::new ()
1568 CODE:
1569 timer *w = new timer;
1570 w->start (NOW);
1571 RETVAL = newSVptr ((void *)w, "urxvt::timer");
1572 w->self = (HV *)SvRV (RETVAL);
1573 OUTPUT:
1574 RETVAL
1575
1576timer *
1577timer::cb (SV *cb)
1578 CODE:
1579 THIS->cb (cb);
1580 RETVAL = THIS;
1581 OUTPUT:
1582 RETVAL
1583
1584NV
1585timer::at ()
1586 CODE:
1587 RETVAL = THIS->at;
1588 OUTPUT:
1589 RETVAL
1590
1591timer *
1592timer::interval (NV interval)
1593 CODE:
1594 THIS->interval = interval;
1595 RETVAL = THIS;
1596 OUTPUT:
1597 RETVAL
1598
1599timer *
1600timer::set (NV tstamp)
1601 CODE:
1602 THIS->set (tstamp);
1603 RETVAL = THIS;
1604 OUTPUT:
1605 RETVAL
1606
1607timer *
1608timer::start (NV tstamp = THIS->at)
1609 CODE:
1610 THIS->start (tstamp);
1611 RETVAL = THIS;
1612 OUTPUT:
1613 RETVAL
1614
1615timer *
1616timer::stop ()
1617 CODE:
1618 THIS->stop ();
1619 RETVAL = THIS;
1620 OUTPUT:
1621 RETVAL
1622
1623void
1624timer::DESTROY ()
1625
1626MODULE = urxvt PACKAGE = urxvt::iow
1627
1628SV *
1629iow::new ()
1630 CODE:
1631 iow *w = new iow;
1632 RETVAL = newSVptr ((void *)w, "urxvt::iow");
1633 w->self = (HV *)SvRV (RETVAL);
1634 OUTPUT:
1635 RETVAL
1636
1637iow *
1638iow::cb (SV *cb)
1639 CODE:
1640 THIS->cb (cb);
1641 RETVAL = THIS;
1642 OUTPUT:
1643 RETVAL
1644
1645iow *
1646iow::fd (int fd)
1647 CODE:
1648 THIS->fd = fd;
1649 RETVAL = THIS;
1650 OUTPUT:
1651 RETVAL
1652
1653iow *
1654iow::events (short events)
1655 CODE:
1656 THIS->events = events;
1657 RETVAL = THIS;
1658 OUTPUT:
1659 RETVAL
1660
1661iow *
1662iow::start ()
1663 CODE:
1664 THIS->start ();
1665 RETVAL = THIS;
1666 OUTPUT:
1667 RETVAL
1668
1669iow *
1670iow::stop ()
1671 CODE:
1672 THIS->stop ();
1673 RETVAL = THIS;
1674 OUTPUT:
1675 RETVAL
1676
1677void
1678iow::DESTROY ()
1679
1680

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines