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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines