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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines