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.95 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.129 by sf-exg, Sun Jan 24 21:53:13 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));
… …
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")
124
125struct perl_watcher
126{
127 SV *cbsv;
128 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") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 111
249class overlay { 112class overlay : overlay_base
113{
250 rxvt_term *THIS; 114 rxvt_term *THIS;
251 AV *overlay_av; 115 AV *overlay_av;
252 int x, y, w, h;
253 int border; 116 int border;
254 text_t **text;
255 rend_t **rend;
256 117
257public: 118public:
258 HV *self; 119 HV *self;
259 120
260 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);
… …
267 128
268 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
269}; 130};
270 131
271overlay::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)
272: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 133: THIS(THIS), border(border == 2), overlay_av (0)
273{ 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
274 if (border == 2) 143 if (border == 2)
275 { 144 {
276 w += 2; 145 w += 2;
277 h += 2; 146 h += 2;
278 } 147 }
… …
344 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
345 )); 214 ));
346 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
347 216
348 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
349} 219}
350 220
351void 221void
352overlay::hide () 222overlay::hide ()
353{ 223{
… …
356 226
357 int i; 227 int i;
358 228
359 for (i = AvFILL (overlay_av); i >= 0; i--) 229 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) 230 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361 {
362 av_delete (overlay_av, i, G_DISCARD);
363 break; 231 break;
364 }
365 232
366 for (; i < AvFILL (overlay_av); i++) 233 for (; i < AvFILL (overlay_av); i++)
367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 234 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368 235
369 av_pop (overlay_av); 236 av_pop (overlay_av);
370 237
371 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
372 overlay_av = 0; 239 overlay_av = 0;
373 240
374 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
375} 243}
376 244
377void overlay::swap () 245void overlay::swap ()
378{ 246{
379 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));
380 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));
381 249
382 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
383 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;
384 257
385 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
386 { 259 {
387 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
388 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
424 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
425 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
426 } 299 }
427 300
428 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
429} 303}
430 304
305/////////////////////////////////////////////////////////////////////////////
306
307#define IOM_CLASS "urxvt"
308#define IOM_WARN rxvt_warn
309#include "iom_perl.h"
431 310
432///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
433 312
434struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
435 314
… …
439{ 318{
440 if (perl) 319 if (perl)
441 { 320 {
442 perl_destruct (perl); 321 perl_destruct (perl);
443 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
444 } 324 }
445} 325}
446 326
447void 327void
448rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
452 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
453 333
454 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
455 swap (perl_environ, environ); 335 swap (perl_environ, environ);
456 336
457 char *argv[] = { 337 char *args[] = {
458 "", 338 "",
459 "-e" 339 "-e"
460 "BEGIN {" 340 "BEGIN {"
461 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
462 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
463 "}" 343 "}"
464 "" 344 ""
465 "use urxvt;" 345 "use urxvt;"
466 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
467 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
468 perl = perl_alloc (); 351 perl = perl_alloc ();
469 perl_construct (perl); 352 perl_construct (perl);
470 353
471 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
472 || perl_run (perl)) 355 || perl_run (perl))
473 { 356 {
474 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
475 358
476 perl_destruct (perl); 359 perl_destruct (perl);
… …
494static void 377static void
495ungrab (rxvt_term *THIS) 378ungrab (rxvt_term *THIS)
496{ 379{
497 if (THIS->perl.grabtime) 380 if (THIS->perl.grabtime)
498 { 381 {
499 XUngrabKeyboard (THIS->xdisp, THIS->perl.grabtime); 382 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
500 XUngrabPointer (THIS->xdisp, THIS->perl.grabtime); 383 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
501 THIS->perl.grabtime = 0; 384 THIS->perl.grabtime = 0;
502 } 385 }
503} 386}
504 387
505bool 388bool
… …
510 393
511 // pre-handling of some events 394 // pre-handling of some events
512 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
513 { 396 {
514 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));
515 398
516 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
517 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
518 } 401 }
519 402
520 swap (perl_environ, environ); 403 swap (perl_environ, environ);
… …
719 602
720 // post-handling of some events 603 // post-handling of some events
721 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
722 { 605 {
723 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 606 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
724 607
725 for (int i = AvFILL (av); i >= 0; i--) 608 for (int i = AvFILL (av); i >= 0; i--)
726 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
727 } 610 }
728 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
729 { 612 {
730 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
731 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
732 615
733 // don't allow further calls 616 // don't allow further calls
734 term->perl.self = 0; 617 term->perl.self = 0;
735 } 618 }
736 619
737 swap (perl_environ, environ); 620 swap (perl_environ, environ);
… …
763# include "optinc.h" 646# include "optinc.h"
764# undef nodef 647# undef nodef
765# undef def 648# undef def
766 649
767 HV *stash = gv_stashpv ("urxvt", 1); 650 HV *stash = gv_stashpv ("urxvt", 1);
768 struct { 651 static const struct {
769 const char *name; 652 const char *name;
770 IV iv; 653 IV iv;
771 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
772# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
773 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
774 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
775 const_iv (RS_Bold), 659 const_iv (RS_Bold),
776 const_iv (RS_Italic), 660 const_iv (RS_Italic),
777 const_iv (RS_Blink), 661 const_iv (RS_Blink),
… …
792 const_iv (Button3Mask), 676 const_iv (Button3Mask),
793 const_iv (Button4Mask), 677 const_iv (Button4Mask),
794 const_iv (Button5Mask), 678 const_iv (Button5Mask),
795 const_iv (AnyModifier), 679 const_iv (AnyModifier),
796 680
797 const_iv (EVENT_NONE), 681 const_iv (NoSymbol),
798 const_iv (EVENT_READ), 682 const_iv (GrabModeSync),
799 const_iv (EVENT_WRITE), 683 const_iv (GrabModeAsync),
800 684
801 const_iv (NoEventMask), 685 const_iv (NoEventMask),
802 const_iv (KeyPressMask), 686 const_iv (KeyPressMask),
803 const_iv (KeyReleaseMask), 687 const_iv (KeyReleaseMask),
804 const_iv (ButtonPressMask), 688 const_iv (ButtonPressMask),
… …
883 const_iv (XIMDontChange), 767 const_iv (XIMDontChange),
884# endif 768# endif
885# endif 769# endif
886 }; 770 };
887 771
888 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 772 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
889 civ-- > const_iv; )
890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 773 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
891} 774}
892 775
893void 776void
894warn (const char *msg) 777warn (const char *msg)
… …
904_exit (int status) 787_exit (int status)
905 788
906NV 789NV
907NOW () 790NOW ()
908 CODE: 791 CODE:
909 RETVAL = NOW; 792 RETVAL = ev::now ();
910 OUTPUT: 793 OUTPUT:
911 RETVAL 794 RETVAL
912 795
913int 796int
914GET_BASEFG (int rend) 797GET_BASEFG (int rend)
… …
925 RETVAL 808 RETVAL
926 809
927int 810int
928SET_FGCOLOR (int rend, int new_color) 811SET_FGCOLOR (int rend, int new_color)
929 CODE: 812 CODE:
930 RETVAL = SET_FGCOLOR (rend, new_color); 813 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
931 OUTPUT: 814 OUTPUT:
932 RETVAL 815 RETVAL
933 816
934int 817int
935SET_BGCOLOR (int rend, int new_color) 818SET_BGCOLOR (int rend, int new_color)
936 CODE: 819 CODE:
937 RETVAL = SET_BGCOLOR (rend, new_color); 820 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
938 OUTPUT: 821 OUTPUT:
939 RETVAL 822 RETVAL
940 823
941int 824int
942GET_CUSTOM (int rend) 825GET_CUSTOM (int rend)
943 CODE: 826 CODE:
944 RETVAL = (rend && RS_customMask) >> RS_customShift; 827 RETVAL = (rend & RS_customMask) >> RS_customShift;
945 OUTPUT: 828 OUTPUT:
946 RETVAL 829 RETVAL
947 830
948int 831int
949SET_CUSTOM (int rend, int new_value) 832SET_CUSTOM (int rend, int new_value)
… …
986 for (int i = AvFILL (env) + 1; i--; ) 869 for (int i = AvFILL (env) + 1; i--; )
987 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 870 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
988 871
989 envv->push_back (0); 872 envv->push_back (0);
990 873
991 bool success;
992
993 try 874 try
994 { 875 {
995 success = term->init (argv, envv); 876 term->init (argv, envv);
996 } 877 }
997 catch (const class rxvt_failure_exception &e) 878 catch (const class rxvt_failure_exception &e)
998 {
999 success = false;
1000 }
1001
1002 if (!success)
1003 { 879 {
1004 term->destroy (); 880 term->destroy ();
1005 croak ("error while initializing new terminal instance"); 881 croak ("error while initializing new terminal instance");
1006 } 882 }
1007 883
… …
1017void 893void
1018rxvt_term::set_should_invoke (int htype, int inc) 894rxvt_term::set_should_invoke (int htype, int inc)
1019 CODE: 895 CODE:
1020 THIS->perl.should_invoke [htype] += inc; 896 THIS->perl.should_invoke [htype] += inc;
1021 897
1022void 898int
1023rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 899rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1024 CODE: 900 CODE:
1025 XGrabButton (THIS->xdisp, button, modifiers, window, 1, 901 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1026 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 902 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1027 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 903 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
904 OUTPUT: RETVAL
1028 905
1029void 906int
1030rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt) 907rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1031 CODE: 908 CODE:
1032 XUngrabButton (THIS->xdisp, button, modifiers, window); 909 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
910 OUTPUT: RETVAL
1033 911
1034#if 0
1035
1036void 912void
1037XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 913rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1038 C_ARGS: 914 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1039 THIS->xdisp, keycode, modifiers, window, 1, 915 CODE:
1040 GrabModeSync, GrabModeSync 916 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1041 917
1042void 918void
1043XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 919rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
1044 C_ARGS: THIS->xdisp, keycode, modifiers, window 920 CODE:
921 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1045 922
1046#endif 923void
924rxvt_term::XUngrabKeyboard (Time eventtime)
925 CODE:
926 XUngrabKeyboard (THIS->dpy, eventtime);
1047 927
1048bool 928bool
1049rxvt_term::grab (Time eventtime, int sync = 0) 929rxvt_term::grab (Time eventtime, int sync = 0)
1050 CODE: 930 CODE:
1051{ 931{
1052 int mode = sync ? GrabModeSync : GrabModeAsync; 932 int mode = sync ? GrabModeSync : GrabModeAsync;
1053 933
1054 THIS->perl.grabtime = 0; 934 THIS->perl.grabtime = 0;
1055 935
1056 if (!XGrabPointer (THIS->xdisp, THIS->vt, 0, 936 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1057 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 937 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1058 mode, mode, None, GRAB_CURSOR, eventtime)) 938 mode, mode, None, GRAB_CURSOR, eventtime))
1059 if (!XGrabKeyboard (THIS->xdisp, THIS->vt, 0, mode, mode, eventtime)) 939 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1060 THIS->perl.grabtime = eventtime; 940 THIS->perl.grabtime = eventtime;
1061 else 941 else
1062 XUngrabPointer (THIS->xdisp, eventtime); 942 XUngrabPointer (THIS->dpy, eventtime);
1063 943
1064 RETVAL = !!THIS->perl.grabtime; 944 RETVAL = !!THIS->perl.grabtime;
1065} 945}
1066 OUTPUT: 946 OUTPUT:
1067 RETVAL 947 RETVAL
1068 948
1069void 949void
1070rxvt_term::allow_events_async () 950rxvt_term::allow_events_async ()
1071 CODE: 951 CODE:
1072 XAllowEvents (THIS->xdisp, AsyncBoth, THIS->perl.grabtime); 952 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1073 953
1074void 954void
1075rxvt_term::allow_events_sync () 955rxvt_term::allow_events_sync ()
1076 CODE: 956 CODE:
1077 XAllowEvents (THIS->xdisp, SyncBoth, THIS->perl.grabtime); 957 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1078 958
1079void 959void
1080rxvt_term::allow_events_replay () 960rxvt_term::allow_events_replay ()
1081 CODE: 961 CODE:
1082 XAllowEvents (THIS->xdisp, ReplayPointer, THIS->perl.grabtime); 962 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1083 XAllowEvents (THIS->xdisp, ReplayKeyboard, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1084 964
1085void 965void
1086rxvt_term::ungrab () 966rxvt_term::ungrab ()
1087 CODE: 967 CODE:
1088 ungrab (THIS); 968 ungrab (THIS);
969
970int
971rxvt_term::XStringToKeysym (char *string)
972 CODE:
973 RETVAL = XStringToKeysym (string);
974 OUTPUT: RETVAL
975
976char *
977rxvt_term::XKeysymToString (int sym)
978 CODE:
979 RETVAL = XKeysymToString (sym);
980 OUTPUT: RETVAL
981
982int
983rxvt_term::XKeysymToKeycode (int sym)
984 CODE:
985 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
986 OUTPUT: RETVAL
987
988int
989rxvt_term::XKeycodeToKeysym (int code, int index)
990 CODE:
991 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
992 OUTPUT: RETVAL
1089 993
1090int 994int
1091rxvt_term::strwidth (SV *str) 995rxvt_term::strwidth (SV *str)
1092 CODE: 996 CODE:
1093{ 997{
1094 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1095 999
1096 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1097 RETVAL = wcswidth (wstr, wcslen (wstr)); 1001 RETVAL = 0;
1002 for (wchar_t *wc = wstr; *wc; wc++)
1003 {
1004 int w = WCWIDTH (*wc);
1005
1006 if (w)
1007 RETVAL += max (w, 1);
1008 }
1098 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1099 1010
1100 free (wstr); 1011 free (wstr);
1101} 1012}
1102 OUTPUT: 1013 OUTPUT:
… …
1135 free (wstr); 1046 free (wstr);
1136} 1047}
1137 OUTPUT: 1048 OUTPUT:
1138 RETVAL 1049 RETVAL
1139 1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1055 OUTPUT:
1056 RETVAL
1057
1140#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1141 1059
1142#define TERM_OFFSET_width TERM_OFFSET(width) 1060#define TERM_OFFSET_width TERM_OFFSET(width)
1143#define TERM_OFFSET_height TERM_OFFSET(height) 1061#define TERM_OFFSET_height TERM_OFFSET(height)
1144#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1145#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1146#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1147#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1148#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1149#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1150#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1151#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1152#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1153#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1072#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1154#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1155#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1156#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1157 1076
1158int 1077int
1159rxvt_term::width () 1078rxvt_term::width ()
1160 ALIAS: 1079 ALIAS:
1161 width = TERM_OFFSET_width 1080 width = TERM_OFFSET_width
1162 height = TERM_OFFSET_height 1081 height = TERM_OFFSET_height
1163 fwidth = TERM_OFFSET_fwidth 1082 fwidth = TERM_OFFSET_fwidth
1164 fheight = TERM_OFFSET_fheight 1083 fheight = TERM_OFFSET_fheight
1165 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1166 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1167 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1168 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1169 mapped = TERM_OFFSET_mapped 1088 mapped = TERM_OFFSET_mapped
1170 int_bwidth = TERM_OFFSET_int_bwidth 1089 int_bwidth = TERM_OFFSET_int_bwidth
1171 ext_bwidth = TERM_OFFSET_ext_bwidth 1090 ext_bwidth = TERM_OFFSET_ext_bwidth
1172 lineSpace = TERM_OFFSET_lineSpace 1091 lineSpace = TERM_OFFSET_lineSpace
1092 letterSpace = TERM_OFFSET_letterSpace
1173 saveLines = TERM_OFFSET_saveLines 1093 saveLines = TERM_OFFSET_saveLines
1174 total_rows = TERM_OFFSET_total_rows 1094 total_rows = TERM_OFFSET_total_rows
1175 top_row = TERM_OFFSET_top_row 1095 top_row = TERM_OFFSET_top_row
1176 CODE: 1096 CODE:
1177 RETVAL = *(int *)((char *)THIS + ix); 1097 RETVAL = *(int *)((char *)THIS + ix);
1178 OUTPUT: 1098 OUTPUT:
1179 RETVAL 1099 RETVAL
1180 1100
… …
1191 { 1111 {
1192 case 0: RETVAL = THIS->ModLevel3Mask; break; 1112 case 0: RETVAL = THIS->ModLevel3Mask; break;
1193 case 1: RETVAL = THIS->ModMetaMask; break; 1113 case 1: RETVAL = THIS->ModMetaMask; break;
1194 case 2: RETVAL = THIS->ModNumLockMask; break; 1114 case 2: RETVAL = THIS->ModNumLockMask; break;
1195 case 3: RETVAL = THIS->current_screen; break; 1115 case 3: RETVAL = THIS->current_screen; break;
1116#ifdef CURSOR_BLINK
1196 case 4: RETVAL = THIS->hidden_cursor; break; 1117 case 4: RETVAL = THIS->hidden_cursor; break;
1118#endif
1197 } 1119 }
1198 OUTPUT: 1120 OUTPUT:
1199 RETVAL 1121 RETVAL
1200 1122
1201char * 1123char *
… …
1211 } 1133 }
1212 OUTPUT: 1134 OUTPUT:
1213 RETVAL 1135 RETVAL
1214 1136
1215SV * 1137SV *
1216rxvt_term::_env () 1138rxvt_term::envv ()
1139 ALIAS:
1140 argv = 1
1217 CODE: 1141 PPCODE:
1218{ 1142{
1219 if (THIS->envv) 1143 stringvec *vec = ix ? THIS->argv : THIS->envv;
1220 {
1221 AV *av = newAV ();
1222 1144
1145 EXTEND (SP, vec->size ());
1146
1223 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1147 for (char **i = vec->begin (); i != vec->end (); ++i)
1224 if (*i) 1148 if (*i)
1225 av_push (av, newSVpv (*i, 0)); 1149 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1226
1227 RETVAL = newRV_noinc ((SV *)av);
1228 }
1229 else
1230 RETVAL = &PL_sv_undef;
1231} 1150}
1232 OUTPUT:
1233 RETVAL
1234 1151
1235int 1152int
1236rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1153rxvt_term::pty_ev_events (int events = ev::UNDEF)
1237 CODE: 1154 CODE:
1238 RETVAL = THIS->pty_ev.events; 1155 RETVAL = THIS->pty_ev.events;
1239 if (events != EVENT_UNDEF) 1156 if (events != ev::UNDEF)
1240 THIS->pty_ev.set (events); 1157 THIS->pty_ev.set (events);
1241 OUTPUT: 1158 OUTPUT:
1242 RETVAL 1159 RETVAL
1243 1160
1244int 1161int
… …
1294 1211
1295void 1212void
1296rxvt_term::focus_out () 1213rxvt_term::focus_out ()
1297 1214
1298void 1215void
1216rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1217 ALIAS:
1218 key_release = 1
1219 CODE:
1220{
1221 XKeyEvent xkey;
1222
1223 memset (&xkey, 0, sizeof (xkey));
1224
1225 xkey.time = time;
1226 xkey.state = state;
1227 xkey.keycode = keycode;
1228
1229 xkey.type = ix ? KeyRelease : KeyPress;
1230 xkey.display = THIS->dpy;
1231 xkey.window = THIS->vt;
1232 xkey.root = THIS->display->root;
1233 xkey.subwindow = THIS->vt;
1234
1235 if (ix)
1236 THIS->key_release (xkey);
1237 else
1238 THIS->key_press (xkey);
1239}
1240
1241void
1299rxvt_term::want_refresh () 1242rxvt_term::want_refresh ()
1300 CODE: 1243 CODE:
1301 THIS->want_refresh = 1; 1244 THIS->want_refresh = 1;
1245 THIS->refresh_check ();
1302 1246
1303void 1247void
1304rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1248rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1305 PPCODE: 1249 PPCODE:
1306{ 1250{
… …
1461SV * 1405SV *
1462rxvt_term::special_decode (SV *text) 1406rxvt_term::special_decode (SV *text)
1463 CODE: 1407 CODE:
1464{ 1408{
1465 wchar_t *wstr = sv2wcs (text); 1409 wchar_t *wstr = sv2wcs (text);
1466 int wlen = wcslen (wstr);
1467 int dlen = 0; 1410 int dlen = 0;
1468 1411
1469 // find length 1412 // find length
1470 for (wchar_t *s = wstr; *s; s++) 1413 for (wchar_t *s = wstr; *s; s++)
1471 if (*s == NOCHAR) 1414 if (*s == NOCHAR)
… …
1494 1437
1495void 1438void
1496rxvt_term::_resource (char *name, int index, SV *newval = 0) 1439rxvt_term::_resource (char *name, int index, SV *newval = 0)
1497 PPCODE: 1440 PPCODE:
1498{ 1441{
1499 struct resval { const char *name; int value; } rslist [] = { 1442 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1500# define def(name) { # name, Rs_ ## name }, 1443# define def(name) { # name, Rs_ ## name },
1501# define reserve(name,count) 1444# define reserve(name,count)
1502# include "rsinc.h" 1445# include "rsinc.h"
1503# undef def 1446# undef def
1504# undef reserve 1447# undef reserve
1505 }; 1448 };
1506 1449
1507 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1450 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1508 1451
1452 if (*name)
1509 do { 1453 {
1454 do {
1510 if (rs-- == rslist) 1455 if (rs-- == rslist)
1511 croak ("no such resource '%s', requested", name); 1456 croak ("no such resource '%s', requested", name);
1512 } while (strcmp (name, rs->name)); 1457 } while (strcmp (name, rs->name));
1513 1458
1514 index += rs->value; 1459 index += rs->value;
1460 }
1461 else
1462 {
1463 --rs;
1464 name = "";
1465 }
1515 1466
1516 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1467 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1517 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1468 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1518 1469
1519 if (GIMME_V != G_VOID) 1470 if (GIMME_V != G_VOID)
… …
1534 1485
1535const char * 1486const char *
1536rxvt_term::x_resource (const char *name) 1487rxvt_term::x_resource (const char *name)
1537 1488
1538bool 1489bool
1539rxvt_term::option (U32 optval, int set = -1) 1490rxvt_term::option (U8 optval, int set = -1)
1540 CODE: 1491 CODE:
1541{ 1492{
1542 RETVAL = THIS->options & optval; 1493 RETVAL = THIS->option (optval);
1543 1494
1544 if (set >= 0) 1495 if (set >= 0)
1545 { 1496 {
1546 if (set)
1547 THIS->options |= optval; 1497 THIS->set_option (optval, set);
1548 else
1549 THIS->options &= ~optval;
1550 1498
1551 if (THIS->check_ev.is_active ()) // avoid doing this before START 1499 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1552 switch (optval) 1500 switch (optval)
1553 { 1501 {
1554 case Opt_skipBuiltinGlyphs: 1502 case Opt_skipBuiltinGlyphs:
1555 THIS->set_fonts (); 1503 THIS->set_fonts ();
1556 THIS->scr_remap_chars (); 1504 THIS->scr_remap_chars ();
1557 THIS->scr_touch (true); 1505 THIS->scr_touch (true);
1558 THIS->want_refresh = 1; 1506 THIS->want_refresh = 1;
1507 THIS->refresh_check ();
1559 break; 1508 break;
1560 1509
1561 case Opt_cursorUnderline: 1510 case Opt_cursorUnderline:
1562 THIS->want_refresh = 1; 1511 THIS->want_refresh = 1;
1512 THIS->refresh_check ();
1563 break; 1513 break;
1564 1514
1565# case Opt_scrollBar_floating: 1515# case Opt_scrollBar_floating:
1566# case Opt_scrollBar_right: 1516# case Opt_scrollBar_right:
1567# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1517# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1600 EXTEND (SP, 2); 1550 EXTEND (SP, 2);
1601 PUSHs (sv_2mortal (newSViv (rc.row))); 1551 PUSHs (sv_2mortal (newSViv (rc.row)));
1602 PUSHs (sv_2mortal (newSViv (rc.col))); 1552 PUSHs (sv_2mortal (newSViv (rc.col)));
1603 } 1553 }
1604 1554
1605 if (items == 3) 1555 if (items >= 3)
1606 { 1556 {
1607 rc.row = SvIV (ST (1)); 1557 rc.row = SvIV (ST (1));
1608 rc.col = SvIV (ST (2)); 1558 rc.col = SvIV (ST (2));
1609 1559
1610 if (ix == 2) 1560 if (ix == 2)
… …
1625 1575
1626 clamp_it (rc.col, 0, THIS->ncol); 1576 clamp_it (rc.col, 0, THIS->ncol);
1627 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1577 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1628 1578
1629 if (ix) 1579 if (ix)
1580 {
1581 THIS->selection.screen = THIS->current_screen;
1582
1630 THIS->want_refresh = 1; 1583 THIS->want_refresh = 1;
1584 THIS->refresh_check ();
1631 } 1585 }
1586 }
1632} 1587}
1633 1588
1634char 1589int
1635rxvt_term::cur_charset () 1590rxvt_term::selection_screen (int screen = -1)
1636 CODE: 1591 CODE:
1637 RETVAL = THIS->charsets [THIS->screen.charset]; 1592 RETVAL = THIS->selection.screen;
1638 OUTPUT: 1593 if (screen >= 0)
1594 THIS->selection.screen = screen;
1595 OUTPUT:
1639 RETVAL 1596 RETVAL
1640 1597
1641void 1598void
1642rxvt_term::selection_clear () 1599rxvt_term::selection_clear (bool clipboard = false)
1600
1601void
1602rxvt_term::clipboard_copy (Time eventtime)
1643 1603
1644void 1604void
1645rxvt_term::selection_make (Time eventtime, bool rect = false) 1605rxvt_term::selection_make (Time eventtime, bool rect = false)
1646 CODE: 1606 CODE:
1647 THIS->selection.op = SELECTION_CONT; 1607 THIS->selection.op = SELECTION_CONT;
1648 THIS->selection.rect = rect; 1608 THIS->selection.rect = rect;
1649 THIS->selection_make (eventtime); 1609 THIS->selection_make (eventtime);
1650 1610
1651int 1611int
1652rxvt_term::selection_grab (Time eventtime) 1612rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1653 1613
1654void 1614void
1655rxvt_term::selection (SV *newtext = 0) 1615rxvt_term::selection (SV *newtext = 0)
1656 PPCODE: 1616 PPCODE:
1657{ 1617{
… …
1666 1626
1667 THIS->selection.text = sv2wcs (newtext); 1627 THIS->selection.text = sv2wcs (newtext);
1668 THIS->selection.len = wcslen (THIS->selection.text); 1628 THIS->selection.len = wcslen (THIS->selection.text);
1669 } 1629 }
1670} 1630}
1631
1632char
1633rxvt_term::cur_charset ()
1634 CODE:
1635 RETVAL = THIS->charsets [THIS->screen.charset];
1636 OUTPUT:
1637 RETVAL
1671 1638
1672void 1639void
1673rxvt_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) 1640rxvt_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)
1674 1641
1675void 1642void
… …
1737void 1704void
1738rxvt_term::XListProperties (Window window) 1705rxvt_term::XListProperties (Window window)
1739 PPCODE: 1706 PPCODE:
1740{ 1707{
1741 int count; 1708 int count;
1742 Atom *props = XListProperties (THIS->xdisp, window, &count); 1709 Atom *props = XListProperties (THIS->dpy, window, &count);
1743 1710
1744 EXTEND (SP, count); 1711 EXTEND (SP, count);
1745 while (count--) 1712 while (count--)
1746 PUSHs (newSVuv ((U32)props [count])); 1713 PUSHs (newSVuv ((U32)props [count]));
1747 1714
1748 XFree (props); 1715 XFree (props);
1749} 1716}
1750 1717
1751void 1718void
1752rxvt_term::XGetWindowProperty (Window window, Atom property) 1719rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1756 int format; 1723 int format;
1757 unsigned long nitems; 1724 unsigned long nitems;
1758 unsigned long bytes_after; 1725 unsigned long bytes_after;
1759 unsigned char *prop; 1726 unsigned char *prop;
1760 1727
1761 XGetWindowProperty (THIS->xdisp, window, property, 1728 XGetWindowProperty (THIS->dpy, window, property,
1762 0, 1<<24, 0, AnyPropertyType, 1729 0, 1<<24, 0, AnyPropertyType,
1763 &type, &format, &nitems, &bytes_after, &prop); 1730 &type, &format, &nitems, &bytes_after, &prop);
1764 1731
1765 if (type != None) 1732 if (type != None)
1766 { 1733 {
… …
1775 XFree (prop); 1742 XFree (prop);
1776 } 1743 }
1777} 1744}
1778 1745
1779void 1746void
1780rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1747rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1781 CODE: 1748 CODE:
1782{ 1749{
1783 STRLEN len; 1750 STRLEN len;
1784 char *data_ = SvPVbyte (data, len); 1751 char *data_ = SvPVbyte (data, len);
1785 1752
1786 int elemsize = format == 16 ? sizeof (short) 1753 int elemsize = format == 16 ? sizeof (short)
1787 : format == 32 ? sizeof (long) 1754 : format == 32 ? sizeof (long)
1788 : 1; 1755 : 1;
1789 1756
1790 XChangeProperty (THIS->xdisp, window, property, 1757 XChangeProperty (THIS->dpy, window, property,
1791 type, format, PropModeReplace, 1758 type, format, PropModeReplace,
1792 (unsigned char *)data_, len / elemsize); 1759 (unsigned char *)data_, len / elemsize);
1793 XSync (THIS->xdisp, 0);
1794} 1760}
1795 1761
1796Atom 1762Atom
1797XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1763XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1798 C_ARGS: term->xdisp, atom_name, only_if_exists 1764 C_ARGS: term->dpy, atom_name, only_if_exists
1799 1765
1800char * 1766char *
1801XGetAtomName (rxvt_term *term, Atom atom) 1767XGetAtomName (rxvt_term *term, Atom atom)
1802 C_ARGS: term->xdisp, atom 1768 C_ARGS: term->dpy, atom
1803 CLEANUP: 1769 CLEANUP:
1804 XFree (RETVAL); 1770 XFree (RETVAL);
1805 1771
1806void 1772void
1807XDeleteProperty (rxvt_term *term, Window window, Atom property) 1773XDeleteProperty (rxvt_term *term, Window window, Atom property)
1808 C_ARGS: term->xdisp, window, property 1774 C_ARGS: term->dpy, window, property
1809 1775
1810Window 1776Window
1811rxvt_term::DefaultRootWindow () 1777rxvt_term::DefaultRootWindow ()
1812 CODE: 1778 CODE:
1813 RETVAL = THIS->display->root; 1779 RETVAL = THIS->display->root;
… …
1816 1782
1817#if 0 1783#if 0
1818 1784
1819Window 1785Window
1820XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1786XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1821 C_ARGS: term->xdisp, (Window)parent, 1787 C_ARGS: term->dpy, (Window)parent,
1822 x, y, width, height, 0, 1788 x, y, width, height, 0,
1823 term->pix_colors_focused[Color_border], 1789 term->pix_colors_focused[Color_border],
1824 term->pix_colors_focused[Color_border] 1790 term->pix_colors_focused[Color_border]
1825 1791
1826#endif 1792#endif
1827 1793
1828void 1794void
1829XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1795XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1830 C_ARGS: term->xdisp, window, parent, x, y 1796 C_ARGS: term->dpy, window, parent, x, y
1831 1797
1832void 1798void
1833XMapWindow (rxvt_term *term, Window window) 1799XMapWindow (rxvt_term *term, Window window)
1834 C_ARGS: term->xdisp, window 1800 C_ARGS: term->dpy, window
1835 1801
1836void 1802void
1837XUnmapWindow (rxvt_term *term, Window window) 1803XUnmapWindow (rxvt_term *term, Window window)
1838 C_ARGS: term->xdisp, window 1804 C_ARGS: term->dpy, window
1839 1805
1840void 1806void
1841XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1807XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1842 C_ARGS: term->xdisp, window, x, y, width, height 1808 C_ARGS: term->dpy, window, x, y, width, height
1843 1809
1844void 1810void
1845rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1811rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1846 CODE: 1812 CODE:
1847{ 1813{
1848 XWindowAttributes attr; 1814 XWindowAttributes attr;
1849 XGetWindowAttributes (THIS->xdisp, window, &attr); 1815 XGetWindowAttributes (THIS->dpy, window, &attr);
1850 XSelectInput (THIS->xdisp, window, attr.your_event_mask | add_events & ~del_events); 1816 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1851} 1817}
1852 1818
1853void 1819void
1854rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1820rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1855 PPCODE: 1821 PPCODE:
1856{ 1822{
1857 int dx, dy; 1823 int dx, dy;
1858 Window child; 1824 Window child;
1859 1825
1860 if (XTranslateCoordinates (THIS->xdisp, src, dst, x, y, &dx, &dy, &child)) 1826 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1861 { 1827 {
1862 EXTEND (SP, 3); 1828 EXTEND (SP, 3);
1863 PUSHs (newSViv (dx)); 1829 PUSHs (newSViv (dx));
1864 PUSHs (newSViv (dy)); 1830 PUSHs (newSViv (dy));
1865 PUSHs (newSVuv (child)); 1831 PUSHs (newSVuv (child));
… …
1882overlay::hide () 1848overlay::hide ()
1883 1849
1884void 1850void
1885overlay::DESTROY () 1851overlay::DESTROY ()
1886 1852
1887############################################################################# 1853INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1888# urxvt::watcher
1889#############################################################################
1890 1854
1891MODULE = urxvt PACKAGE = urxvt::watcher
1892
1893CHAINED
1894perl_watcher::cb (SV *cb)
1895 CODE:
1896 THIS->cb (cb);
1897 OUTPUT:
1898 RETVAL
1899
1900#############################################################################
1901# urxvt::timer
1902#############################################################################
1903
1904MODULE = urxvt PACKAGE = urxvt::timer
1905
1906SV *
1907timer::new ()
1908 CODE:
1909 timer *w = new timer;
1910 w->start (NOW);
1911 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1912 w->self = (HV *)SvRV (RETVAL);
1913 OUTPUT:
1914 RETVAL
1915
1916NV
1917timer::at ()
1918 CODE:
1919 RETVAL = THIS->at;
1920 OUTPUT:
1921 RETVAL
1922
1923CHAINED
1924timer::interval (NV interval)
1925 CODE:
1926 THIS->interval = interval;
1927 OUTPUT:
1928 RETVAL
1929
1930CHAINED
1931timer::set (NV tstamp)
1932 CODE:
1933 THIS->set (tstamp);
1934 OUTPUT:
1935 RETVAL
1936
1937CHAINED
1938timer::start (NV tstamp = THIS->at)
1939 CODE:
1940 THIS->start (tstamp);
1941 OUTPUT:
1942 RETVAL
1943
1944CHAINED
1945timer::after (NV delay)
1946 CODE:
1947 THIS->start (NOW + delay);
1948 OUTPUT:
1949 RETVAL
1950
1951CHAINED
1952timer::stop ()
1953 CODE:
1954 THIS->stop ();
1955 OUTPUT:
1956 RETVAL
1957
1958void
1959timer::DESTROY ()
1960
1961#############################################################################
1962# urxvt::iow
1963#############################################################################
1964
1965MODULE = urxvt PACKAGE = urxvt::iow
1966
1967SV *
1968iow::new ()
1969 CODE:
1970 iow *w = new iow;
1971 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1972 w->self = (HV *)SvRV (RETVAL);
1973 OUTPUT:
1974 RETVAL
1975
1976CHAINED
1977iow::fd (int fd)
1978 CODE:
1979 THIS->fd = fd;
1980 OUTPUT:
1981 RETVAL
1982
1983CHAINED
1984iow::events (short events)
1985 CODE:
1986 THIS->events = events;
1987 OUTPUT:
1988 RETVAL
1989
1990CHAINED
1991iow::start ()
1992 CODE:
1993 THIS->start ();
1994 OUTPUT:
1995 RETVAL
1996
1997CHAINED
1998iow::stop ()
1999 CODE:
2000 THIS->stop ();
2001 OUTPUT:
2002 RETVAL
2003
2004void
2005iow::DESTROY ()
2006
2007#############################################################################
2008# urxvt::iw
2009#############################################################################
2010
2011MODULE = urxvt PACKAGE = urxvt::iw
2012
2013SV *
2014iw::new ()
2015 CODE:
2016 iw *w = new iw;
2017 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2018 w->self = (HV *)SvRV (RETVAL);
2019 OUTPUT:
2020 RETVAL
2021
2022CHAINED
2023iw::start ()
2024 CODE:
2025 THIS->start ();
2026 OUTPUT:
2027 RETVAL
2028
2029CHAINED
2030iw::stop ()
2031 CODE:
2032 THIS->stop ();
2033 OUTPUT:
2034 RETVAL
2035
2036void
2037iw::DESTROY ()
2038
2039#############################################################################
2040# urxvt::pw
2041#############################################################################
2042
2043MODULE = urxvt PACKAGE = urxvt::pw
2044
2045SV *
2046pw::new ()
2047 CODE:
2048 pw *w = new pw;
2049 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2050 w->self = (HV *)SvRV (RETVAL);
2051 OUTPUT:
2052 RETVAL
2053
2054CHAINED
2055pw::start (int pid)
2056 CODE:
2057 THIS->start (pid);
2058 OUTPUT:
2059 RETVAL
2060
2061CHAINED
2062pw::stop ()
2063 CODE:
2064 THIS->stop ();
2065 OUTPUT:
2066 RETVAL
2067
2068void
2069pw::DESTROY ()
2070
2071

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines