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.87 by root, Sat Jan 21 08:07:38 2006 UTC vs.
Revision 1.136 by root, Fri Jan 7 21:17:08 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines