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.89 by root, Sun Jan 22 11:57:06 2006 UTC vs.
Revision 1.141 by sf-exg, Mon May 30 18:39:03 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,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.
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 = ecb_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
418 EXTEND (SP, 2);
536 XPUSHs (sv_2mortal (newSVterm (term))); 419 PUSHs (sv_2mortal (newSVterm (term)));
537 XPUSHs (sv_2mortal (newSViv (htype))); 420 PUSHs (sv_2mortal (newSViv (htype)));
538 421
539 for (;;) { 422 for (;;) {
540 data_type dt = (data_type)va_arg (ap, int); 423 data_type dt = (data_type)va_arg (ap, int);
541 424
542 switch (dt) 425 switch (dt)
543 { 426 {
544 case DT_INT: 427 case DT_INT:
545 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 428 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
546 break; 429 break;
547 430
548 case DT_LONG: 431 case DT_LONG:
549 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 432 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
550 break; 433 break;
551 434
552 case DT_STR: 435 case DT_STR:
553 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 436 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
554 break; 437 break;
555 438
556 case DT_STR_LEN: 439 case DT_STR_LEN:
557 { 440 {
558 char *str = va_arg (ap, char *); 441 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 442 int len = va_arg (ap, int);
560 443
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 444 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 445 }
563 break; 446 break;
564 447
565 case DT_WCS_LEN: 448 case DT_WCS_LEN:
566 { 449 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 450 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 451 int wlen = va_arg (ap, int);
569 452
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 453 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
571 } 454 }
572 break; 455 break;
573 456
457 case DT_LCS_LEN:
458 {
459 long *lstr = va_arg (ap, long *);
460 int llen = va_arg (ap, int);
461
462 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
463 }
464 break;
465
574 case DT_XEVENT: 466 case DT_XEVENT:
575 { 467 {
576 XEvent *xe = va_arg (ap, XEvent *); 468 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 469 HV *hv = newHV ();
578 470
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 471# 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) 472# 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) 473# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 474# undef set
583 475
584 setiv (type, xe->type); 476 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 477 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 478 setiv (serial, xe->xany.serial);
587 479
588 switch (xe->type) 480 switch (xe->type)
589 { 481 {
590 case KeyPress: 482 case KeyPress:
591 case KeyRelease: 483 case KeyRelease:
592 case ButtonPress: 484 case ButtonPress:
593 case ButtonRelease: 485 case ButtonRelease:
594 case MotionNotify: 486 case MotionNotify:
595 setuv (window, xe->xmotion.window); 487 setuv (window, xe->xmotion.window);
596 setuv (root, xe->xmotion.root); 488 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 489 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 490 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 491 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 492 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 493 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 494 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 495 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 496 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 497 setuv (state, xe->xmotion.state);
606 498
607 switch (xe->type) 499 switch (xe->type)
608 { 500 {
609 case KeyPress: 501 case KeyPress:
610 case KeyRelease: 502 case KeyRelease:
611 setuv (keycode, xe->xkey.keycode); 503 setuv (keycode, xe->xkey.keycode);
612 break; 504 break;
613 505
614 case ButtonPress: 506 case ButtonPress:
615 case ButtonRelease: 507 case ButtonRelease:
616 setuv (button, xe->xbutton.button); 508 setuv (button, xe->xbutton.button);
617 break; 509 break;
618 510
619 case MotionNotify: 511 case MotionNotify:
620 setiv (is_hint, xe->xmotion.is_hint); 512 setiv (is_hint, xe->xmotion.is_hint);
621 break; 513 break;
622 } 514 }
623 515
624 break; 516 break;
625 517
626 case MapNotify: 518 case MapNotify:
627 case UnmapNotify: 519 case UnmapNotify:
628 case ConfigureNotify: 520 case ConfigureNotify:
629 setuv (event, xe->xconfigure.event); 521 setuv (event, xe->xconfigure.event);
630 setuv (window, xe->xconfigure.window); 522 setuv (window, xe->xconfigure.window);
631 523
632 switch (xe->type) 524 switch (xe->type)
633 { 525 {
634 case ConfigureNotify: 526 case ConfigureNotify:
635 setiv (x, xe->xconfigure.x); 527 setiv (x, xe->xconfigure.x);
636 setiv (y, xe->xconfigure.y); 528 setiv (y, xe->xconfigure.y);
637 setiv (width, xe->xconfigure.width); 529 setiv (width, xe->xconfigure.width);
638 setiv (height, xe->xconfigure.height); 530 setiv (height, xe->xconfigure.height);
639 setuv (above, xe->xconfigure.above); 531 setuv (above, xe->xconfigure.above);
640 break; 532 break;
641 } 533 }
642 534
643 break; 535 break;
644 536
645 case PropertyNotify: 537 case PropertyNotify:
646 setuv (window, xe->xproperty.window); 538 setuv (window, xe->xproperty.window);
647 setuv (atom, xe->xproperty.atom); 539 setuv (atom, xe->xproperty.atom);
648 setuv (time, xe->xproperty.time); 540 setuv (time, xe->xproperty.time);
649 setiv (state, xe->xproperty.state); 541 setiv (state, xe->xproperty.state);
650 break; 542 break;
651 543
652 case ClientMessage: 544 case ClientMessage:
653 setuv (window, xe->xclient.window); 545 setuv (window, xe->xclient.window);
654 setuv (message_type, xe->xclient.message_type); 546 setuv (message_type, xe->xclient.message_type);
655 setuv (format, xe->xclient.format); 547 setuv (format, xe->xclient.format);
656 setuv (l0, xe->xclient.data.l[0]); 548 setuv (l0, xe->xclient.data.l[0]);
657 setuv (l1, xe->xclient.data.l[1]); 549 setuv (l1, xe->xclient.data.l[1]);
658 setuv (l2, xe->xclient.data.l[2]); 550 setuv (l2, xe->xclient.data.l[2]);
659 setuv (l3, xe->xclient.data.l[3]); 551 setuv (l3, xe->xclient.data.l[3]);
660 setuv (l4, xe->xclient.data.l[4]); 552 setuv (l4, xe->xclient.data.l[4]);
661 break; 553 break;
662 } 554 }
663 555
664 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 556 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
665 } 557 }
666 break; 558 break;
667 559
668 case DT_END: 560 case DT_END:
669 goto call; 561 goto call;
670 562
671 default: 563 default:
672 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 564 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
673 } 565 }
566 }
567
568 call:
569 va_end (ap);
570
571 PUTBACK;
572 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
573 SPAGAIN;
574
575 if (count)
576 {
577 SV *status = POPs;
578 count = SvTRUE (status);
674 } 579 }
675 580
676 call:
677 va_end (ap);
678
679 PUTBACK; 581 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; 582 FREETMPS;
691 LEAVE; 583 LEAVE;
692 584
693 if (SvTRUE (ERRSV)) 585 if (SvTRUE (ERRSV))
694 { 586 {
695 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 587 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
696 ungrab (term); // better lose the grab than the session 588 ungrab (term); // better lose the grab than the session
697 } 589 }
698 590
699 event_consumed = !!count; 591 event_consumed = !!count;
700 } 592 }
701 catch (...)
702 {
703 swap (perl_environ, environ);
704 throw;
705 }
706 else 593 else
707 event_consumed = false; 594 event_consumed = false;
708 595
709 // post-handling of some events 596 // post-handling of some events
710 if (htype == HOOK_REFRESH_BEGIN) 597 if (htype == HOOK_REFRESH_BEGIN)
711 { 598 {
712 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 599 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
713 600
714 for (int i = AvFILL (av); i >= 0; i--) 601 for (int i = AvFILL (av); i >= 0; i--)
715 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 602 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
716 } 603 }
717 else if (htype == HOOK_DESTROY) 604 else if (htype == HOOK_DESTROY)
718 { 605 {
719 clearSVptr ((SV *)term->perl.self); 606 clearSVptr ((SV *)term->perl.self);
720 SvREFCNT_dec ((SV *)term->perl.self); 607 SvREFCNT_dec ((SV *)term->perl.self);
608
609 // don't allow further calls
610 term->perl.self = 0;
721 } 611 }
722 612
723 swap (perl_environ, environ);
724
725 return event_consumed; 613 return event_consumed;
614}
615
616void
617rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
618{
619 localise_env set_environ (perl_environ);
620
621 ENTER;
622 SAVETMPS;
623
624 dSP;
625 XPUSHs (sv_2mortal (newSVpvn (data, len)));
626 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
627
628 if (SvTRUE (ERRSV))
629 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
630
631 FREETMPS;
632 LEAVE;
726} 633}
727 634
728///////////////////////////////////////////////////////////////////////////// 635/////////////////////////////////////////////////////////////////////////////
729 636
730MODULE = urxvt PACKAGE = urxvt 637MODULE = urxvt PACKAGE = urxvt
742# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 649# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
743# include "hookinc.h" 650# include "hookinc.h"
744# undef def 651# undef def
745 652
746 HV *option = get_hv ("urxvt::OPTION", 1); 653 HV *option = get_hv ("urxvt::OPTION", 1);
747# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 654# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
748# define nodef(name) 655# define nodef(name)
749# include "optinc.h" 656# include "optinc.h"
750# undef nodef 657# undef nodef
751# undef def 658# undef def
752 659
753 HV *stash = gv_stashpv ("urxvt", 1); 660 HV *stash = gv_stashpv ("urxvt", 1);
754 struct { 661 static const struct {
755 const char *name; 662 const char *name;
756 IV iv; 663 IV iv;
757 } *civ, const_iv[] = { 664 } *civ, const_iv[] = {
758# define const_iv(name) { # name, (IV)name } 665# define const_iv(name) { # name, (IV)name }
666 const_iv (NUM_RESOURCES),
759 const_iv (DEFAULT_RSTYLE), 667 const_iv (DEFAULT_RSTYLE),
760 const_iv (OVERLAY_RSTYLE), 668 const_iv (OVERLAY_RSTYLE),
669 const_iv (Color_Bits),
670 const_iv (RS_bgShift), const_iv (RS_bgMask),
671 const_iv (RS_fgShift), const_iv (RS_fgMask),
672 const_iv (RS_Careful),
673 const_iv (RS_fontCount),
674 const_iv (RS_fontShift),
675 const_iv (RS_fontMask),
676 const_iv (RS_baseattrMask),
677 const_iv (RS_attrMask),
678 const_iv (RS_redraw),
679 const_iv (RS_Sel),
761 const_iv (RS_Bold), 680 const_iv (RS_Bold),
762 const_iv (RS_Italic), 681 const_iv (RS_Italic),
763 const_iv (RS_Blink), 682 const_iv (RS_Blink),
764 const_iv (RS_RVid), 683 const_iv (RS_RVid),
765 const_iv (RS_Uline), 684 const_iv (RS_Uline),
778 const_iv (Button3Mask), 697 const_iv (Button3Mask),
779 const_iv (Button4Mask), 698 const_iv (Button4Mask),
780 const_iv (Button5Mask), 699 const_iv (Button5Mask),
781 const_iv (AnyModifier), 700 const_iv (AnyModifier),
782 701
783 const_iv (EVENT_NONE), 702 const_iv (NoSymbol),
784 const_iv (EVENT_READ), 703 const_iv (GrabModeSync),
785 const_iv (EVENT_WRITE), 704 const_iv (GrabModeAsync),
786 705
787 const_iv (NoEventMask), 706 const_iv (NoEventMask),
788 const_iv (KeyPressMask), 707 const_iv (KeyPressMask),
789 const_iv (KeyReleaseMask), 708 const_iv (KeyReleaseMask),
790 const_iv (ButtonPressMask), 709 const_iv (ButtonPressMask),
842 const_iv (SelectionRequest), 761 const_iv (SelectionRequest),
843 const_iv (SelectionNotify), 762 const_iv (SelectionNotify),
844 const_iv (ColormapNotify), 763 const_iv (ColormapNotify),
845 const_iv (ClientMessage), 764 const_iv (ClientMessage),
846 const_iv (MappingNotify), 765 const_iv (MappingNotify),
766# if ENABLE_XIM_ONTHESPOT
767 const_iv (XIMReverse),
768 const_iv (XIMUnderline),
769 const_iv (XIMHighlight),
770 const_iv (XIMPrimary),
771 const_iv (XIMSecondary),
772 const_iv (XIMTertiary),
773 const_iv (XIMVisibleToForward),
774 const_iv (XIMVisibleToBackword),
775 const_iv (XIMVisibleToCenter),
776# if 0
777 const_iv (XIMForwardChar),
778 const_iv (XIMBackwardChar),
779 const_iv (XIMForwardWord),
780 const_iv (XIMBackwardWord),
781 const_iv (XIMCaretUp),
782 const_iv (XIMCaretDown),
783 const_iv (XIMNextLine),
784 const_iv (XIMPreviousLine),
785 const_iv (XIMLineStart),
786 const_iv (XIMLineEnd),
787 const_iv (XIMAbsolutePosition),
788 const_iv (XIMDontChange),
789# endif
790# endif
847 }; 791 };
848 792
849 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 793 for (civ = const_iv + ecb_array_length (const_iv); civ-- > const_iv; )
850 civ-- > const_iv; )
851 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
852} 795}
853 796
854void 797void
855warn (const char *msg) 798warn (const char *msg)
865_exit (int status) 808_exit (int status)
866 809
867NV 810NV
868NOW () 811NOW ()
869 CODE: 812 CODE:
870 RETVAL = NOW; 813 RETVAL = ev::now ();
871 OUTPUT: 814 OUTPUT:
872 RETVAL 815 RETVAL
873 816
874int 817int
875GET_BASEFG (int rend) 818GET_BASEFG (int rend)
886 RETVAL 829 RETVAL
887 830
888int 831int
889SET_FGCOLOR (int rend, int new_color) 832SET_FGCOLOR (int rend, int new_color)
890 CODE: 833 CODE:
891 RETVAL = SET_FGCOLOR (rend, new_color); 834 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
892 OUTPUT: 835 OUTPUT:
893 RETVAL 836 RETVAL
894 837
895int 838int
896SET_BGCOLOR (int rend, int new_color) 839SET_BGCOLOR (int rend, int new_color)
897 CODE: 840 CODE:
898 RETVAL = SET_BGCOLOR (rend, new_color); 841 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
899 OUTPUT: 842 OUTPUT:
900 RETVAL 843 RETVAL
901 844
902int 845int
903GET_CUSTOM (int rend) 846GET_CUSTOM (int rend)
904 CODE: 847 CODE:
905 RETVAL = (rend && RS_customMask) >> RS_customShift; 848 RETVAL = (rend & RS_customMask) >> RS_customShift;
906 OUTPUT: 849 OUTPUT:
907 RETVAL 850 RETVAL
908 851
909int 852int
910SET_CUSTOM (int rend, int new_value) 853SET_CUSTOM (int rend, int new_value)
917 | ((new_value << RS_customShift) & RS_customMask); 860 | ((new_value << RS_customShift) & RS_customMask);
918} 861}
919 OUTPUT: 862 OUTPUT:
920 RETVAL 863 RETVAL
921 864
865void
866termlist ()
867 PPCODE:
868{
869 EXTEND (SP, rxvt_term::termlist.size ());
870
871 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
872 if ((*t)->perl.self)
873 PUSHs (sv_2mortal (newSVterm (*t)));
874}
875
876IV
877_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
878 CODE:
879 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
880 req->cb_sv = newSVsv (cb);
881 RETVAL = (IV)req;
882 OUTPUT:
883 RETVAL
884
885void
886_delete_selection_request (IV req_)
887 CODE:
888 rxvt_selection *req = (rxvt_selection *)req_;
889 delete req;
890
922MODULE = urxvt PACKAGE = urxvt::term 891MODULE = urxvt PACKAGE = urxvt::term
923 892
924SV * 893SV *
925_new (...) 894_new (AV *env, AV *arg)
926 CODE: 895 CODE:
927{ 896{
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; 897 rxvt_term *term = new rxvt_term;
932 898
933 stringvec *argv = new stringvec; 899 stringvec *argv = new stringvec;
934 stringvec *envv = new stringvec; 900 stringvec *envv = new stringvec;
935 901
936 for (int i = 1; i < items; i++) 902 for (int i = 0; i <= AvFILL (arg); i++)
937 argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 903 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
938 904
939 AV *env = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (env) + 1; i--; ) 905 for (int i = AvFILL (env) + 1; i--; )
941 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 906 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 907
943 envv->push_back (0); 908 envv->push_back (0);
944 909
945 bool success;
946
947 try 910 try
948 { 911 {
949 success = term->init (argv, envv); 912 term->init (argv, envv);
950 } 913 }
951 catch (const class rxvt_failure_exception &e) 914 catch (const class rxvt_failure_exception &e)
952 {
953 success = false;
954 }
955
956 if (!success)
957 { 915 {
958 term->destroy (); 916 term->destroy ();
959 croak ("error while initializing new terminal instance"); 917 croak ("error while initializing new terminal instance");
960 } 918 }
961 919
971void 929void
972rxvt_term::set_should_invoke (int htype, int inc) 930rxvt_term::set_should_invoke (int htype, int inc)
973 CODE: 931 CODE:
974 THIS->perl.should_invoke [htype] += inc; 932 THIS->perl.should_invoke [htype] += inc;
975 933
976void 934int
977rxvt_term::grab_button (int button, U32 modifiers) 935rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
978 CODE: 936 CODE:
979 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 937 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
980 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 938 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
981 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 939 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
940 OUTPUT: RETVAL
941
942int
943rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
944 CODE:
945 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
946 OUTPUT: RETVAL
947
948void
949rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
950 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
951 CODE:
952 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
953
954void
955rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
956 CODE:
957 XUngrabKey (THIS->dpy, keycode, modifiers, window);
958
959void
960rxvt_term::XUngrabKeyboard (Time eventtime)
961 CODE:
962 XUngrabKeyboard (THIS->dpy, eventtime);
982 963
983bool 964bool
984rxvt_term::grab (Time eventtime, int sync = 0) 965rxvt_term::grab (Time eventtime, int sync = 0)
985 CODE: 966 CODE:
986{ 967{
987 int mode = sync ? GrabModeSync : GrabModeAsync; 968 int mode = sync ? GrabModeSync : GrabModeAsync;
988 969
989 THIS->perl.grabtime = 0; 970 THIS->perl.grabtime = 0;
990 971
991 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 972 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
992 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 973 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
993 mode, mode, None, GRAB_CURSOR, eventtime)) 974 mode, mode, None, GRAB_CURSOR, eventtime))
994 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 975 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
995 THIS->perl.grabtime = eventtime; 976 THIS->perl.grabtime = eventtime;
996 else 977 else
997 XUngrabPointer (THIS->display->display, eventtime); 978 XUngrabPointer (THIS->dpy, eventtime);
998 979
999 RETVAL = !!THIS->perl.grabtime; 980 RETVAL = !!THIS->perl.grabtime;
1000} 981}
1001 OUTPUT: 982 OUTPUT:
1002 RETVAL 983 RETVAL
1003 984
1004void 985void
1005rxvt_term::allow_events_async () 986rxvt_term::allow_events_async ()
1006 CODE: 987 CODE:
1007 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 988 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1008 989
1009void 990void
1010rxvt_term::allow_events_sync () 991rxvt_term::allow_events_sync ()
1011 CODE: 992 CODE:
1012 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 993 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1013 994
1014void 995void
1015rxvt_term::allow_events_replay () 996rxvt_term::allow_events_replay ()
1016 CODE: 997 CODE:
1017 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 998 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1018 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 999 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1019 1000
1020void 1001void
1021rxvt_term::ungrab () 1002rxvt_term::ungrab ()
1022 CODE: 1003 CODE:
1023 ungrab (THIS); 1004 ungrab (THIS);
1005
1006int
1007rxvt_term::XStringToKeysym (char *string)
1008 CODE:
1009 RETVAL = XStringToKeysym (string);
1010 OUTPUT: RETVAL
1011
1012char *
1013rxvt_term::XKeysymToString (int sym)
1014 CODE:
1015 RETVAL = XKeysymToString (sym);
1016 OUTPUT: RETVAL
1017
1018int
1019rxvt_term::XKeysymToKeycode (int sym)
1020 CODE:
1021 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
1022 OUTPUT: RETVAL
1023
1024int
1025rxvt_term::XKeycodeToKeysym (int code, int index)
1026 CODE:
1027 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
1028 OUTPUT: RETVAL
1024 1029
1025int 1030int
1026rxvt_term::strwidth (SV *str) 1031rxvt_term::strwidth (SV *str)
1027 CODE: 1032 CODE:
1028{ 1033{
1029 wchar_t *wstr = sv2wcs (str); 1034 wchar_t *wstr = sv2wcs (str);
1030 1035
1031 rxvt_push_locale (THIS->locale); 1036 rxvt_push_locale (THIS->locale);
1032 RETVAL = wcswidth (wstr, wcslen (wstr)); 1037 RETVAL = 0;
1038 for (wchar_t *wc = wstr; *wc; wc++)
1039 {
1040 int w = WCWIDTH (*wc);
1041
1042 if (w)
1043 RETVAL += max (w, 1);
1044 }
1033 rxvt_pop_locale (); 1045 rxvt_pop_locale ();
1034 1046
1035 free (wstr); 1047 free (wstr);
1036} 1048}
1037 OUTPUT: 1049 OUTPUT:
1070 free (wstr); 1082 free (wstr);
1071} 1083}
1072 OUTPUT: 1084 OUTPUT:
1073 RETVAL 1085 RETVAL
1074 1086
1087char *
1088rxvt_term::locale ()
1089 CODE:
1090 RETVAL = THIS->locale;
1091 OUTPUT:
1092 RETVAL
1093
1075#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1094#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1076 1095
1077#define TERM_OFFSET_width TERM_OFFSET(width) 1096#define TERM_OFFSET_width TERM_OFFSET(width)
1078#define TERM_OFFSET_height TERM_OFFSET(height) 1097#define TERM_OFFSET_height TERM_OFFSET(height)
1079#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1098#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1080#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1099#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1081#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1100#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1082#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1101#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1083#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1102#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1084#define TERM_OFFSET_focus TERM_OFFSET(focus) 1103#define TERM_OFFSET_focus TERM_OFFSET(focus)
1085#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1104#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1086#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1105#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1087#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1106#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1088#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1107#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1108#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1089#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1109#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1090#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1110#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1091#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1111#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1092 1112
1093int 1113int
1094rxvt_term::width () 1114rxvt_term::width ()
1095 ALIAS: 1115 ALIAS:
1096 width = TERM_OFFSET_width 1116 width = TERM_OFFSET_width
1097 height = TERM_OFFSET_height 1117 height = TERM_OFFSET_height
1098 fwidth = TERM_OFFSET_fwidth 1118 fwidth = TERM_OFFSET_fwidth
1099 fheight = TERM_OFFSET_fheight 1119 fheight = TERM_OFFSET_fheight
1100 fbase = TERM_OFFSET_fbase 1120 fbase = TERM_OFFSET_fbase
1101 nrow = TERM_OFFSET_nrow 1121 nrow = TERM_OFFSET_nrow
1102 ncol = TERM_OFFSET_ncol 1122 ncol = TERM_OFFSET_ncol
1103 focus = TERM_OFFSET_focus 1123 focus = TERM_OFFSET_focus
1104 mapped = TERM_OFFSET_mapped 1124 mapped = TERM_OFFSET_mapped
1105 int_bwidth = TERM_OFFSET_int_bwidth 1125 int_bwidth = TERM_OFFSET_int_bwidth
1106 ext_bwidth = TERM_OFFSET_ext_bwidth 1126 ext_bwidth = TERM_OFFSET_ext_bwidth
1107 lineSpace = TERM_OFFSET_lineSpace 1127 lineSpace = TERM_OFFSET_lineSpace
1128 letterSpace = TERM_OFFSET_letterSpace
1108 saveLines = TERM_OFFSET_saveLines 1129 saveLines = TERM_OFFSET_saveLines
1109 total_rows = TERM_OFFSET_total_rows 1130 total_rows = TERM_OFFSET_total_rows
1110 top_row = TERM_OFFSET_top_row 1131 top_row = TERM_OFFSET_top_row
1111 CODE: 1132 CODE:
1112 RETVAL = *(int *)((char *)THIS + ix); 1133 RETVAL = *(int *)((char *)THIS + ix);
1113 OUTPUT: 1134 OUTPUT:
1114 RETVAL 1135 RETVAL
1115 1136
1126 { 1147 {
1127 case 0: RETVAL = THIS->ModLevel3Mask; break; 1148 case 0: RETVAL = THIS->ModLevel3Mask; break;
1128 case 1: RETVAL = THIS->ModMetaMask; break; 1149 case 1: RETVAL = THIS->ModMetaMask; break;
1129 case 2: RETVAL = THIS->ModNumLockMask; break; 1150 case 2: RETVAL = THIS->ModNumLockMask; break;
1130 case 3: RETVAL = THIS->current_screen; break; 1151 case 3: RETVAL = THIS->current_screen; break;
1152#ifdef CURSOR_BLINK
1131 case 4: RETVAL = THIS->hidden_cursor; break; 1153 case 4: RETVAL = THIS->hidden_cursor; break;
1154#endif
1132 } 1155 }
1133 OUTPUT: 1156 OUTPUT:
1134 RETVAL 1157 RETVAL
1135 1158
1136char * 1159char *
1146 } 1169 }
1147 OUTPUT: 1170 OUTPUT:
1148 RETVAL 1171 RETVAL
1149 1172
1150SV * 1173SV *
1151rxvt_term::_env () 1174rxvt_term::envv ()
1175 ALIAS:
1176 argv = 1
1152 CODE: 1177 PPCODE:
1153{ 1178{
1154 if (THIS->envv) 1179 stringvec *vec = ix ? THIS->argv : THIS->envv;
1155 {
1156 AV *av = newAV ();
1157 1180
1181 EXTEND (SP, vec->size ());
1182
1158 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1183 for (char **i = vec->begin (); i != vec->end (); ++i)
1159 if (*i) 1184 if (*i)
1160 av_push (av, newSVpv (*i, 0)); 1185 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1161
1162 RETVAL = newRV_noinc ((SV *)av);
1163 }
1164 else
1165 RETVAL = &PL_sv_undef;
1166} 1186}
1167 OUTPUT:
1168 RETVAL
1169 1187
1170int 1188int
1171rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1189rxvt_term::pty_ev_events (int events = ev::UNDEF)
1172 CODE: 1190 CODE:
1173 RETVAL = THIS->pty_ev.events; 1191 RETVAL = THIS->pty_ev.events;
1174 if (events != EVENT_UNDEF) 1192 if (events != ev::UNDEF)
1175 THIS->pty_ev.set (events); 1193 THIS->pty_ev.set (events);
1194 OUTPUT:
1195 RETVAL
1196
1197int
1198rxvt_term::pty_fd ()
1199 CODE:
1200 RETVAL = THIS->pty->pty;
1176 OUTPUT: 1201 OUTPUT:
1177 RETVAL 1202 RETVAL
1178 1203
1179Window 1204Window
1180rxvt_term::parent () 1205rxvt_term::parent ()
1181 CODE: 1206 CODE:
1182 RETVAL = THIS->parent [0]; 1207 RETVAL = THIS->parent;
1183 OUTPUT: 1208 OUTPUT:
1184 RETVAL 1209 RETVAL
1185 1210
1186Window 1211Window
1187rxvt_term::vt () 1212rxvt_term::vt ()
1222 1247
1223void 1248void
1224rxvt_term::focus_out () 1249rxvt_term::focus_out ()
1225 1250
1226void 1251void
1252rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1253 ALIAS:
1254 key_release = 1
1255 CODE:
1256{
1257 XKeyEvent xkey;
1258
1259 memset (&xkey, 0, sizeof (xkey));
1260
1261 xkey.time = time;
1262 xkey.state = state;
1263 xkey.keycode = keycode;
1264
1265 xkey.type = ix ? KeyRelease : KeyPress;
1266 xkey.display = THIS->dpy;
1267 xkey.window = THIS->vt;
1268 xkey.root = THIS->display->root;
1269 xkey.subwindow = THIS->vt;
1270
1271 if (ix)
1272 THIS->key_release (xkey);
1273 else
1274 THIS->key_press (xkey);
1275}
1276
1277void
1227rxvt_term::want_refresh () 1278rxvt_term::want_refresh ()
1228 CODE: 1279 CODE:
1229 THIS->want_refresh = 1; 1280 THIS->want_refresh = 1;
1281 THIS->refresh_check ();
1230 1282
1231void 1283void
1232rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1284rxvt_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: 1285 PPCODE:
1234{ 1286{
1237 1289
1238 line_t &l = ROW(row_number); 1290 line_t &l = ROW(row_number);
1239 1291
1240 if (GIMME_V != G_VOID) 1292 if (GIMME_V != G_VOID)
1241 { 1293 {
1242 wchar_t *wstr = new wchar_t [THIS->ncol]; 1294 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1243 1295
1244 for (int col = 0; col < THIS->ncol; col++) 1296 for (int col = 0; col < THIS->ncol; col++)
1245 wstr [col] = l.t [col]; 1297 wstr [col] = l.t [col];
1246 1298
1247 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1299 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1248
1249 delete [] wstr;
1250 } 1300 }
1251 1301
1252 if (new_text) 1302 if (new_text)
1253 { 1303 {
1254 wchar_t *wstr = sv2wcs (new_text); 1304 wchar_t *wstr = sv2wcs (new_text);
1347rxvt_term::special_encode (SV *string) 1397rxvt_term::special_encode (SV *string)
1348 CODE: 1398 CODE:
1349{ 1399{
1350 wchar_t *wstr = sv2wcs (string); 1400 wchar_t *wstr = sv2wcs (string);
1351 int wlen = wcslen (wstr); 1401 int wlen = wcslen (wstr);
1352 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1402 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1353 1403
1354 rxvt_push_locale (THIS->locale); 1404 rxvt_push_locale (THIS->locale);
1355 1405
1356 wchar_t *r = rstr; 1406 wchar_t *r = rstr;
1357 for (wchar_t *s = wstr; *s; s++) 1407 for (wchar_t *s = wstr; *s; s++)
1408 {
1409 int w = WCWIDTH (*s);
1410
1358 if (wcwidth (*s) == 0) 1411 if (w == 0)
1359 { 1412 {
1360 if (r == rstr) 1413 if (r == rstr)
1361 croak ("leading combining character unencodable"); 1414 croak ("leading combining character unencodable");
1362 1415
1363 unicode_t n = rxvt_compose (r[-1], *s); 1416 unicode_t n = rxvt_compose (r[-1], *s);
1364 if (n == NOCHAR) 1417 if (n == NOCHAR)
1365 n = rxvt_composite.compose (r[-1], *s); 1418 n = rxvt_composite.compose (r[-1], *s);
1366 1419
1367 r[-1] = n; 1420 r[-1] = n;
1368 } 1421 }
1369#if !UNICODE_3 1422#if !UNICODE_3
1370 else if (*s >= 0x10000) 1423 else if (*s >= 0x10000)
1371 *r++ = rxvt_composite.compose (*s); 1424 *r++ = rxvt_composite.compose (*s);
1372#endif 1425#endif
1373 else 1426 else
1374 *r++ = *s; 1427 *r++ = *s;
1428
1429 // the *2 above only allows wcwidth <= 2
1430 if (w > 1)
1431 *r++ = NOCHAR;
1432 }
1375 1433
1376 rxvt_pop_locale (); 1434 rxvt_pop_locale ();
1377 1435
1378 RETVAL = wcs2sv (rstr, r - rstr); 1436 RETVAL = wcs2sv (rstr, r - rstr);
1379
1380 delete [] rstr;
1381} 1437}
1382 OUTPUT: 1438 OUTPUT:
1383 RETVAL 1439 RETVAL
1384 1440
1385SV * 1441SV *
1386rxvt_term::special_decode (SV *text) 1442rxvt_term::special_decode (SV *text)
1387 CODE: 1443 CODE:
1388{ 1444{
1389 wchar_t *wstr = sv2wcs (text); 1445 wchar_t *wstr = sv2wcs (text);
1390 int wlen = wcslen (wstr);
1391 int dlen = 0; 1446 int dlen = 0;
1392 1447
1393 // find length 1448 // find length
1394 for (wchar_t *s = wstr; *s; s++) 1449 for (wchar_t *s = wstr; *s; s++)
1395 if (*s == NOCHAR) 1450 if (*s == NOCHAR)
1397 else if (IS_COMPOSE (*s)) 1452 else if (IS_COMPOSE (*s))
1398 dlen += rxvt_composite.expand (*s, 0); 1453 dlen += rxvt_composite.expand (*s, 0);
1399 else 1454 else
1400 dlen++; 1455 dlen++;
1401 1456
1402 wchar_t *rstr = new wchar_t [dlen]; 1457 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1403 1458
1404 // decode 1459 // decode
1405 wchar_t *r = rstr; 1460 wchar_t *r = rstr;
1406 for (wchar_t *s = wstr; *s; s++) 1461 for (wchar_t *s = wstr; *s; s++)
1407 if (*s == NOCHAR) 1462 if (*s == NOCHAR)
1410 r += rxvt_composite.expand (*s, r); 1465 r += rxvt_composite.expand (*s, r);
1411 else 1466 else
1412 *r++ = *s; 1467 *r++ = *s;
1413 1468
1414 RETVAL = wcs2sv (rstr, r - rstr); 1469 RETVAL = wcs2sv (rstr, r - rstr);
1415
1416 delete [] rstr;
1417} 1470}
1418 OUTPUT: 1471 OUTPUT:
1419 RETVAL 1472 RETVAL
1420 1473
1421void 1474void
1422rxvt_term::_resource (char *name, int index, SV *newval = 0) 1475rxvt_term::_resource (char *name, int index, SV *newval = 0)
1423 PPCODE: 1476 PPCODE:
1424{ 1477{
1425 struct resval { const char *name; int value; } rslist [] = { 1478 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1426# define def(name) { # name, Rs_ ## name }, 1479# define def(name) { # name, Rs_ ## name },
1427# define reserve(name,count) 1480# define reserve(name,count)
1428# include "rsinc.h" 1481# include "rsinc.h"
1429# undef def 1482# undef def
1430# undef reserve 1483# undef reserve
1431 }; 1484 };
1432 1485
1433 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1486 rs = rslist + ecb_array_length (rslist);
1434 1487
1488 if (*name)
1435 do { 1489 {
1490 do {
1436 if (rs-- == rslist) 1491 if (rs-- == rslist)
1437 croak ("no such resource '%s', requested", name); 1492 croak ("no such resource '%s', requested", name);
1438 } while (strcmp (name, rs->name)); 1493 } while (strcmp (name, rs->name));
1439 1494
1440 index += rs->value; 1495 index += rs->value;
1496 }
1497 else
1498 {
1499 --rs;
1500 name = "";
1501 }
1441 1502
1442 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1503 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1443 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1504 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1444 1505
1445 if (GIMME_V != G_VOID) 1506 if (GIMME_V != G_VOID)
1460 1521
1461const char * 1522const char *
1462rxvt_term::x_resource (const char *name) 1523rxvt_term::x_resource (const char *name)
1463 1524
1464bool 1525bool
1465rxvt_term::option (U32 optval, int set = -1) 1526rxvt_term::option (U8 optval, int set = -1)
1466 CODE: 1527 CODE:
1467{ 1528{
1468 RETVAL = THIS->options & optval; 1529 RETVAL = THIS->option (optval);
1469 1530
1470 if (set >= 0) 1531 if (set >= 0)
1471 { 1532 {
1472 if (set)
1473 THIS->options |= optval; 1533 THIS->set_option (optval, set);
1474 else
1475 THIS->options &= ~optval;
1476 1534
1477 if (THIS->check_ev.is_active ()) // avoid doing this before START 1535 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1478 switch (optval) 1536 switch (optval)
1479 { 1537 {
1480 case Opt_skipBuiltinGlyphs: 1538 case Opt_skipBuiltinGlyphs:
1481 THIS->set_fonts (); 1539 THIS->set_fonts ();
1482 THIS->scr_remap_chars (); 1540 THIS->scr_remap_chars ();
1483 THIS->scr_touch (true); 1541 THIS->scr_touch (true);
1484 THIS->want_refresh = 1; 1542 THIS->want_refresh = 1;
1543 THIS->refresh_check ();
1485 break; 1544 break;
1486 1545
1487 case Opt_cursorUnderline: 1546 case Opt_cursorUnderline:
1488 THIS->want_refresh = 1; 1547 THIS->want_refresh = 1;
1548 THIS->refresh_check ();
1489 break; 1549 break;
1490 1550
1491# case Opt_scrollBar_floating: 1551# case Opt_scrollBar_floating:
1492# case Opt_scrollBar_right: 1552# case Opt_scrollBar_right:
1493# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1553# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1526 EXTEND (SP, 2); 1586 EXTEND (SP, 2);
1527 PUSHs (sv_2mortal (newSViv (rc.row))); 1587 PUSHs (sv_2mortal (newSViv (rc.row)));
1528 PUSHs (sv_2mortal (newSViv (rc.col))); 1588 PUSHs (sv_2mortal (newSViv (rc.col)));
1529 } 1589 }
1530 1590
1531 if (items == 3) 1591 if (items >= 3)
1532 { 1592 {
1533 rc.row = SvIV (ST (1)); 1593 rc.row = SvIV (ST (1));
1534 rc.col = SvIV (ST (2)); 1594 rc.col = SvIV (ST (2));
1535 1595
1536 if (ix == 2) 1596 if (ix == 2)
1551 1611
1552 clamp_it (rc.col, 0, THIS->ncol); 1612 clamp_it (rc.col, 0, THIS->ncol);
1553 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1613 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1554 1614
1555 if (ix) 1615 if (ix)
1616 {
1617 THIS->selection.screen = THIS->current_screen;
1618
1556 THIS->want_refresh = 1; 1619 THIS->want_refresh = 1;
1620 THIS->refresh_check ();
1557 } 1621 }
1622 }
1558} 1623}
1559 1624
1560char 1625int
1561rxvt_term::cur_charset () 1626rxvt_term::selection_screen (int screen = -1)
1562 CODE: 1627 CODE:
1563 RETVAL = THIS->charsets [THIS->screen.charset]; 1628 RETVAL = THIS->selection.screen;
1564 OUTPUT: 1629 if (screen >= 0)
1630 THIS->selection.screen = screen;
1631 OUTPUT:
1565 RETVAL 1632 RETVAL
1566 1633
1567#void 1634void
1568#rxvt_term::selection_clear () 1635rxvt_term::selection_clear (bool clipboard = false)
1569 1636
1570void 1637void
1571rxvt_term::selection_make (Time eventtime, bool rect = false) 1638rxvt_term::selection_make (Time eventtime, bool rect = false)
1572 CODE: 1639 CODE:
1573 THIS->selection.op = SELECTION_CONT; 1640 THIS->selection.op = SELECTION_CONT;
1574 THIS->selection.rect = rect; 1641 THIS->selection.rect = rect;
1575 THIS->selection_make (eventtime); 1642 THIS->selection_make (eventtime);
1576 1643
1577int 1644int
1578rxvt_term::selection_grab (Time eventtime) 1645rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1579 1646
1580void 1647void
1581rxvt_term::selection (SV *newtext = 0) 1648rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1582 PPCODE: 1649 PPCODE:
1583{ 1650{
1651 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1652 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1653
1584 if (GIMME_V != G_VOID) 1654 if (GIMME_V != G_VOID)
1585 XPUSHs (THIS->selection.text 1655 XPUSHs (text
1586 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1656 ? sv_2mortal (wcs2sv (text, len))
1587 : &PL_sv_undef); 1657 : &PL_sv_undef);
1588 1658
1589 if (newtext) 1659 if (newtext)
1590 { 1660 {
1591 free (THIS->selection.text); 1661 free (text);
1592 1662
1593 THIS->selection.text = sv2wcs (newtext); 1663 text = sv2wcs (newtext);
1594 THIS->selection.len = wcslen (THIS->selection.text); 1664 len = wcslen (text);
1595 } 1665 }
1596} 1666}
1667
1668char
1669rxvt_term::cur_charset ()
1670 CODE:
1671 RETVAL = THIS->charsets [THIS->screen.charset];
1672 OUTPUT:
1673 RETVAL
1597 1674
1598void 1675void
1599rxvt_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) 1676rxvt_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)
1600 1677
1601void 1678void
1623 char *str = SvPVbyte (octets, len); 1700 char *str = SvPVbyte (octets, len);
1624 C_ARGS: 1701 C_ARGS:
1625 str, len 1702 str, len
1626 1703
1627void 1704void
1705rxvt_term::tt_paste (SV *octets)
1706 INIT:
1707 STRLEN len;
1708 char *str = SvPVbyte (octets, len);
1709 C_ARGS:
1710 str, len
1711
1712void
1628rxvt_term::cmd_parse (SV *octets) 1713rxvt_term::cmd_parse (SV *octets)
1629 CODE: 1714 CODE:
1630{ 1715{
1631 STRLEN len; 1716 STRLEN len;
1632 char *str = SvPVbyte (octets, len); 1717 char *str = SvPVbyte (octets, len);
1663void 1748void
1664rxvt_term::XListProperties (Window window) 1749rxvt_term::XListProperties (Window window)
1665 PPCODE: 1750 PPCODE:
1666{ 1751{
1667 int count; 1752 int count;
1668 Atom *props = XListProperties (THIS->display->display, window, &count); 1753 Atom *props = XListProperties (THIS->dpy, window, &count);
1669 1754
1670 EXTEND (SP, count); 1755 EXTEND (SP, count);
1671 while (count--) 1756 while (count--)
1672 PUSHs (newSVuv ((U32)props [count])); 1757 PUSHs (newSVuv ((U32)props [count]));
1673 1758
1674 XFree (props); 1759 XFree (props);
1675} 1760}
1676 1761
1677void 1762void
1678rxvt_term::XGetWindowProperty (Window window, Atom property) 1763rxvt_term::XGetWindowProperty (Window window, Atom property)
1682 int format; 1767 int format;
1683 unsigned long nitems; 1768 unsigned long nitems;
1684 unsigned long bytes_after; 1769 unsigned long bytes_after;
1685 unsigned char *prop; 1770 unsigned char *prop;
1686 1771
1687 XGetWindowProperty (THIS->display->display, window, property, 1772 XGetWindowProperty (THIS->dpy, window, property,
1688 0, 1<<24, 0, AnyPropertyType, 1773 0, 1<<24, 0, AnyPropertyType,
1689 &type, &format, &nitems, &bytes_after, &prop); 1774 &type, &format, &nitems, &bytes_after, &prop);
1690 1775
1691 if (type != None) 1776 if (type != None)
1692 { 1777 {
1701 XFree (prop); 1786 XFree (prop);
1702 } 1787 }
1703} 1788}
1704 1789
1705void 1790void
1706rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1791rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1707 CODE: 1792 CODE:
1708{ 1793{
1709 STRLEN len; 1794 STRLEN len;
1710 char *data_ = SvPVbyte (data, len); 1795 char *data_ = SvPVbyte (data, len);
1711 1796
1712 int elemsize = format == 16 ? sizeof (short) 1797 int elemsize = format == 16 ? sizeof (short)
1713 : format == 32 ? sizeof (long) 1798 : format == 32 ? sizeof (long)
1714 : 1; 1799 : 1;
1715 1800
1716 XChangeProperty (THIS->display->display, window, property, 1801 XChangeProperty (THIS->dpy, window, property,
1717 type, format, PropModeReplace, 1802 type, format, PropModeReplace,
1718 (unsigned char *)data_, len / elemsize); 1803 (unsigned char *)data_, len / elemsize);
1719 XSync (THIS->display->display, 0);
1720} 1804}
1721 1805
1722Atom 1806Atom
1723XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1807XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1724 C_ARGS: term->display->display, atom_name, only_if_exists 1808 C_ARGS: term->dpy, atom_name, only_if_exists
1725 1809
1726char * 1810char *
1727XGetAtomName (rxvt_term *term, Atom atom) 1811XGetAtomName (rxvt_term *term, Atom atom)
1728 C_ARGS: term->display->display, atom 1812 C_ARGS: term->dpy, atom
1729 CLEANUP: 1813 CLEANUP:
1730 XFree (RETVAL); 1814 XFree (RETVAL);
1731 1815
1732void 1816void
1733XDeleteProperty (rxvt_term *term, Window window, Atom property) 1817XDeleteProperty (rxvt_term *term, Window window, Atom property)
1734 C_ARGS: term->display->display, window, property 1818 C_ARGS: term->dpy, window, property
1735 1819
1736Window 1820Window
1737rxvt_term::DefaultRootWindow () 1821rxvt_term::DefaultRootWindow ()
1738 CODE: 1822 CODE:
1739 RETVAL = THIS->display->root; 1823 RETVAL = THIS->display->root;
1742 1826
1743#if 0 1827#if 0
1744 1828
1745Window 1829Window
1746XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1830XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1747 C_ARGS: term->display->display, (Window)parent, 1831 C_ARGS: term->dpy, (Window)parent,
1748 x, y, width, height, 0, 1832 x, y, width, height, 0,
1749 term->pix_colors_focused[Color_border], 1833 term->pix_colors_focused[Color_border],
1750 term->pix_colors_focused[Color_border] 1834 term->pix_colors_focused[Color_border]
1751 1835
1752#endif 1836#endif
1753 1837
1754void 1838void
1755XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1839XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1756 C_ARGS: term->display->display, window, parent, x, y 1840 C_ARGS: term->dpy, window, parent, x, y
1757 1841
1758void 1842void
1759XMapWindow (rxvt_term *term, Window window) 1843XMapWindow (rxvt_term *term, Window window)
1760 C_ARGS: term->display->display, window 1844 C_ARGS: term->dpy, window
1761 1845
1762void 1846void
1763XUnmapWindow (rxvt_term *term, Window window) 1847XUnmapWindow (rxvt_term *term, Window window)
1764 C_ARGS: term->display->display, window 1848 C_ARGS: term->dpy, window
1765 1849
1766void 1850void
1767XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1851XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1768 C_ARGS: term->display->display, window, x, y, width, height 1852 C_ARGS: term->dpy, window, x, y, width, height
1769 1853
1770void 1854void
1771rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1855rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1772 CODE: 1856 CODE:
1773{ 1857{
1774 XWindowAttributes attr; 1858 XWindowAttributes attr;
1775 XGetWindowAttributes (THIS->display->display, window, &attr); 1859 XGetWindowAttributes (THIS->dpy, window, &attr);
1776 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); 1860 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1777} 1861}
1778 1862
1779void 1863void
1780rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1864rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1781 PPCODE: 1865 PPCODE:
1782{ 1866{
1783 int dx, dy; 1867 int dx, dy;
1784 Window child; 1868 Window child;
1785 1869
1786 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1870 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1787 { 1871 {
1788 EXTEND (SP, 3); 1872 EXTEND (SP, 3);
1789 PUSHs (newSViv (dx)); 1873 PUSHs (newSViv (dx));
1790 PUSHs (newSViv (dy)); 1874 PUSHs (newSViv (dy));
1791 PUSHs (newSVuv (child)); 1875 PUSHs (newSVuv (child));
1808overlay::hide () 1892overlay::hide ()
1809 1893
1810void 1894void
1811overlay::DESTROY () 1895overlay::DESTROY ()
1812 1896
1813############################################################################# 1897INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1814# urxvt::watcher
1815#############################################################################
1816 1898
1817MODULE = urxvt PACKAGE = urxvt::watcher
1818
1819CHAINED
1820perl_watcher::cb (SV *cb)
1821 CODE:
1822 THIS->cb (cb);
1823 OUTPUT:
1824 RETVAL
1825
1826#############################################################################
1827# urxvt::timer
1828#############################################################################
1829
1830MODULE = urxvt PACKAGE = urxvt::timer
1831
1832SV *
1833timer::new ()
1834 CODE:
1835 timer *w = new timer;
1836 w->start (NOW);
1837 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1838 w->self = (HV *)SvRV (RETVAL);
1839 OUTPUT:
1840 RETVAL
1841
1842NV
1843timer::at ()
1844 CODE:
1845 RETVAL = THIS->at;
1846 OUTPUT:
1847 RETVAL
1848
1849CHAINED
1850timer::interval (NV interval)
1851 CODE:
1852 THIS->interval = interval;
1853 OUTPUT:
1854 RETVAL
1855
1856CHAINED
1857timer::set (NV tstamp)
1858 CODE:
1859 THIS->set (tstamp);
1860 OUTPUT:
1861 RETVAL
1862
1863CHAINED
1864timer::start (NV tstamp = THIS->at)
1865 CODE:
1866 THIS->start (tstamp);
1867 OUTPUT:
1868 RETVAL
1869
1870CHAINED
1871timer::after (NV delay)
1872 CODE:
1873 THIS->start (NOW + delay);
1874 OUTPUT:
1875 RETVAL
1876
1877CHAINED
1878timer::stop ()
1879 CODE:
1880 THIS->stop ();
1881 OUTPUT:
1882 RETVAL
1883
1884void
1885timer::DESTROY ()
1886
1887#############################################################################
1888# urxvt::iow
1889#############################################################################
1890
1891MODULE = urxvt PACKAGE = urxvt::iow
1892
1893SV *
1894iow::new ()
1895 CODE:
1896 iow *w = new iow;
1897 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1898 w->self = (HV *)SvRV (RETVAL);
1899 OUTPUT:
1900 RETVAL
1901
1902CHAINED
1903iow::fd (int fd)
1904 CODE:
1905 THIS->fd = fd;
1906 OUTPUT:
1907 RETVAL
1908
1909CHAINED
1910iow::events (short events)
1911 CODE:
1912 THIS->events = events;
1913 OUTPUT:
1914 RETVAL
1915
1916CHAINED
1917iow::start ()
1918 CODE:
1919 THIS->start ();
1920 OUTPUT:
1921 RETVAL
1922
1923CHAINED
1924iow::stop ()
1925 CODE:
1926 THIS->stop ();
1927 OUTPUT:
1928 RETVAL
1929
1930void
1931iow::DESTROY ()
1932
1933#############################################################################
1934# urxvt::iw
1935#############################################################################
1936
1937MODULE = urxvt PACKAGE = urxvt::iw
1938
1939SV *
1940iw::new ()
1941 CODE:
1942 iw *w = new iw;
1943 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1944 w->self = (HV *)SvRV (RETVAL);
1945 OUTPUT:
1946 RETVAL
1947
1948CHAINED
1949iw::start ()
1950 CODE:
1951 THIS->start ();
1952 OUTPUT:
1953 RETVAL
1954
1955CHAINED
1956iw::stop ()
1957 CODE:
1958 THIS->stop ();
1959 OUTPUT:
1960 RETVAL
1961
1962void
1963iw::DESTROY ()
1964
1965#############################################################################
1966# urxvt::pw
1967#############################################################################
1968
1969MODULE = urxvt PACKAGE = urxvt::pw
1970
1971SV *
1972pw::new ()
1973 CODE:
1974 pw *w = new pw;
1975 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1976 w->self = (HV *)SvRV (RETVAL);
1977 OUTPUT:
1978 RETVAL
1979
1980CHAINED
1981pw::start (int pid)
1982 CODE:
1983 THIS->start (pid);
1984 OUTPUT:
1985 RETVAL
1986
1987CHAINED
1988pw::stop ()
1989 CODE:
1990 THIS->stop ();
1991 OUTPUT:
1992 RETVAL
1993
1994void
1995pw::DESTROY ()
1996
1997

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines