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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines