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.111 by root, Thu Dec 14 17:33:53 2006 UTC vs.
Revision 1.125 by root, Fri Aug 22 15:36:45 2008 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)]
… …
70 SV *sv = newSVpv (str, 0); 66 SV *sv = newSVpv (str, 0);
71 SvUTF8_on (sv); 67 SvUTF8_on (sv);
72 free (str); 68 free (str);
73 69
74 return sv; 70 return sv;
75}
76
77static SV *
78new_ref (HV *hv, const char *klass)
79{
80 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
81} 71}
82 72
83static SV * 73static SV *
84newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
85{ 75{
… …
220 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 210 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
221 )); 211 ));
222 av_push (overlay_av, newSViv ((long)this)); 212 av_push (overlay_av, newSViv ((long)this));
223 213
224 THIS->want_refresh = 1; 214 THIS->want_refresh = 1;
215 THIS->refresh_check ();
225} 216}
226 217
227void 218void
228overlay::hide () 219overlay::hide ()
229{ 220{
… …
243 234
244 SvREFCNT_dec (overlay_av); 235 SvREFCNT_dec (overlay_av);
245 overlay_av = 0; 236 overlay_av = 0;
246 237
247 THIS->want_refresh = 1; 238 THIS->want_refresh = 1;
239 THIS->refresh_check ();
248} 240}
249 241
250void overlay::swap () 242void overlay::swap ()
251{ 243{
252 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 244 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 289 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 290 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
299 } 291 }
300 292
301 THIS->want_refresh = 1; 293 THIS->want_refresh = 1;
294 THIS->refresh_check ();
302} 295}
303 296
304///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
305 298
306#define IOM_CLASS "urxvt" 299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
307#include <iom_perl.h> 301#include "iom_perl.h"
308 302
309///////////////////////////////////////////////////////////////////////////// 303/////////////////////////////////////////////////////////////////////////////
310 304
311struct rxvt_perl_interp rxvt_perl; 305struct rxvt_perl_interp rxvt_perl;
312 306
… …
316{ 310{
317 if (perl) 311 if (perl)
318 { 312 {
319 perl_destruct (perl); 313 perl_destruct (perl);
320 perl_free (perl); 314 perl_free (perl);
315 PERL_SYS_TERM ();
321 } 316 }
322} 317}
323 318
324void 319void
325rxvt_perl_interp::init (rxvt_term *term) 320rxvt_perl_interp::init (rxvt_term *term)
… …
329 rxvt_push_locale (""); // perl init destroys current locale 324 rxvt_push_locale (""); // perl init destroys current locale
330 325
331 perl_environ = rxvt_environ; 326 perl_environ = rxvt_environ;
332 swap (perl_environ, environ); 327 swap (perl_environ, environ);
333 328
334 char *argv[] = { 329 char *args[] = {
335 "", 330 "",
336 "-e" 331 "-e"
337 "BEGIN {" 332 "BEGIN {"
338 " urxvt->bootstrap;" 333 " urxvt->bootstrap;"
339 " unshift @INC, '" LIBDIR "';" 334 " unshift @INC, '" LIBDIR "';"
340 "}" 335 "}"
341 "" 336 ""
342 "use urxvt;" 337 "use urxvt;"
343 }; 338 };
339 int argc = sizeof (args) / sizeof (args[0]);
340 char **argv = args;
344 341
342 PERL_SYS_INIT3 (&argc, &argv, &environ);
345 perl = perl_alloc (); 343 perl = perl_alloc ();
346 perl_construct (perl); 344 perl_construct (perl);
347 345
348 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 346 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
349 || perl_run (perl)) 347 || perl_run (perl))
350 { 348 {
351 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 349 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
352 350
353 perl_destruct (perl); 351 perl_destruct (perl);
… …
387 385
388 // pre-handling of some events 386 // pre-handling of some events
389 if (htype == HOOK_REFRESH_END) 387 if (htype == HOOK_REFRESH_END)
390 { 388 {
391 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 389 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
392 390
393 for (int i = 0; i <= AvFILL (av); i++) 391 for (int i = 0; i <= AvFILL (av); i++)
394 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 392 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
395 } 393 }
396 394
397 swap (perl_environ, environ); 395 swap (perl_environ, environ);
… …
596 594
597 // post-handling of some events 595 // post-handling of some events
598 if (htype == HOOK_REFRESH_BEGIN) 596 if (htype == HOOK_REFRESH_BEGIN)
599 { 597 {
600 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 598 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
601 599
602 for (int i = AvFILL (av); i >= 0; i--) 600 for (int i = AvFILL (av); i >= 0; i--)
603 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 601 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
604 } 602 }
605 else if (htype == HOOK_DESTROY) 603 else if (htype == HOOK_DESTROY)
606 { 604 {
607 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
608 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
609 607
610 // don't allow further calls 608 // don't allow further calls
611 term->perl.self = 0; 609 term->perl.self = 0;
612 } 610 }
613 611
614 swap (perl_environ, environ); 612 swap (perl_environ, environ);
… …
645 static const struct { 643 static const struct {
646 const char *name; 644 const char *name;
647 IV iv; 645 IV iv;
648 } *civ, const_iv[] = { 646 } *civ, const_iv[] = {
649# define const_iv(name) { # name, (IV)name } 647# define const_iv(name) { # name, (IV)name }
648 const_iv (NUM_RESOURCES),
650 const_iv (DEFAULT_RSTYLE), 649 const_iv (DEFAULT_RSTYLE),
651 const_iv (OVERLAY_RSTYLE), 650 const_iv (OVERLAY_RSTYLE),
652 const_iv (RS_Bold), 651 const_iv (RS_Bold),
653 const_iv (RS_Italic), 652 const_iv (RS_Italic),
654 const_iv (RS_Blink), 653 const_iv (RS_Blink),
… …
780_exit (int status) 779_exit (int status)
781 780
782NV 781NV
783NOW () 782NOW ()
784 CODE: 783 CODE:
785 RETVAL = NOW; 784 RETVAL = ev::now ();
786 OUTPUT: 785 OUTPUT:
787 RETVAL 786 RETVAL
788 787
789int 788int
790GET_BASEFG (int rend) 789GET_BASEFG (int rend)
… …
862 for (int i = AvFILL (env) + 1; i--; ) 861 for (int i = AvFILL (env) + 1; i--; )
863 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 862 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
864 863
865 envv->push_back (0); 864 envv->push_back (0);
866 865
867 bool success;
868
869 try 866 try
870 { 867 {
871 success = term->init (argv, envv); 868 term->init (argv, envv);
872 } 869 }
873 catch (const class rxvt_failure_exception &e) 870 catch (const class rxvt_failure_exception &e)
874 {
875 success = false;
876 }
877
878 if (!success)
879 { 871 {
880 term->destroy (); 872 term->destroy ();
881 croak ("error while initializing new terminal instance"); 873 croak ("error while initializing new terminal instance");
882 } 874 }
883 875
… …
1109 { 1101 {
1110 case 0: RETVAL = THIS->ModLevel3Mask; break; 1102 case 0: RETVAL = THIS->ModLevel3Mask; break;
1111 case 1: RETVAL = THIS->ModMetaMask; break; 1103 case 1: RETVAL = THIS->ModMetaMask; break;
1112 case 2: RETVAL = THIS->ModNumLockMask; break; 1104 case 2: RETVAL = THIS->ModNumLockMask; break;
1113 case 3: RETVAL = THIS->current_screen; break; 1105 case 3: RETVAL = THIS->current_screen; break;
1106#ifdef CURSOR_BLINK
1114 case 4: RETVAL = THIS->hidden_cursor; break; 1107 case 4: RETVAL = THIS->hidden_cursor; break;
1108#endif
1115 } 1109 }
1116 OUTPUT: 1110 OUTPUT:
1117 RETVAL 1111 RETVAL
1118 1112
1119char * 1113char *
… …
1144 if (*i) 1138 if (*i)
1145 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1139 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1146} 1140}
1147 1141
1148int 1142int
1149rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1143rxvt_term::pty_ev_events (int events = ev::UNDEF)
1150 CODE: 1144 CODE:
1151 RETVAL = THIS->pty_ev.events; 1145 RETVAL = THIS->pty_ev.events;
1152 if (events != EVENT_UNDEF) 1146 if (events != ev::UNDEF)
1153 THIS->pty_ev.set (events); 1147 THIS->pty_ev.set (events);
1154 OUTPUT: 1148 OUTPUT:
1155 RETVAL 1149 RETVAL
1156 1150
1157int 1151int
… …
1236 1230
1237void 1231void
1238rxvt_term::want_refresh () 1232rxvt_term::want_refresh ()
1239 CODE: 1233 CODE:
1240 THIS->want_refresh = 1; 1234 THIS->want_refresh = 1;
1235 THIS->refresh_check ();
1241 1236
1242void 1237void
1243rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1238rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1244 PPCODE: 1239 PPCODE:
1245{ 1240{
… …
1400SV * 1395SV *
1401rxvt_term::special_decode (SV *text) 1396rxvt_term::special_decode (SV *text)
1402 CODE: 1397 CODE:
1403{ 1398{
1404 wchar_t *wstr = sv2wcs (text); 1399 wchar_t *wstr = sv2wcs (text);
1405 int wlen = wcslen (wstr);
1406 int dlen = 0; 1400 int dlen = 0;
1407 1401
1408 // find length 1402 // find length
1409 for (wchar_t *s = wstr; *s; s++) 1403 for (wchar_t *s = wstr; *s; s++)
1410 if (*s == NOCHAR) 1404 if (*s == NOCHAR)
… …
1443# undef reserve 1437# undef reserve
1444 }; 1438 };
1445 1439
1446 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1440 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1447 1441
1442 if (*name)
1448 do { 1443 {
1444 do {
1449 if (rs-- == rslist) 1445 if (rs-- == rslist)
1450 croak ("no such resource '%s', requested", name); 1446 croak ("no such resource '%s', requested", name);
1451 } while (strcmp (name, rs->name)); 1447 } while (strcmp (name, rs->name));
1452 1448
1453 index += rs->value; 1449 index += rs->value;
1450 }
1451 else
1452 {
1453 --rs;
1454 name = "";
1455 }
1454 1456
1455 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1457 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1456 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1458 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1457 1459
1458 if (GIMME_V != G_VOID) 1460 if (GIMME_V != G_VOID)
… …
1473 1475
1474const char * 1476const char *
1475rxvt_term::x_resource (const char *name) 1477rxvt_term::x_resource (const char *name)
1476 1478
1477bool 1479bool
1478rxvt_term::option (U32 optval, int set = -1) 1480rxvt_term::option (U8 optval, int set = -1)
1479 CODE: 1481 CODE:
1480{ 1482{
1481 RETVAL = THIS->options & optval; 1483 RETVAL = THIS->option (optval);
1482 1484
1483 if (set >= 0) 1485 if (set >= 0)
1484 { 1486 {
1485 if (set)
1486 THIS->options |= optval; 1487 THIS->set_option (optval, set);
1487 else
1488 THIS->options &= ~optval;
1489 1488
1490 if (THIS->check_ev.is_active ()) // avoid doing this before START 1489 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1491 switch (optval) 1490 switch (optval)
1492 { 1491 {
1493 case Opt_skipBuiltinGlyphs: 1492 case Opt_skipBuiltinGlyphs:
1494 THIS->set_fonts (); 1493 THIS->set_fonts ();
1495 THIS->scr_remap_chars (); 1494 THIS->scr_remap_chars ();
1496 THIS->scr_touch (true); 1495 THIS->scr_touch (true);
1497 THIS->want_refresh = 1; 1496 THIS->want_refresh = 1;
1497 THIS->refresh_check ();
1498 break; 1498 break;
1499 1499
1500 case Opt_cursorUnderline: 1500 case Opt_cursorUnderline:
1501 THIS->want_refresh = 1; 1501 THIS->want_refresh = 1;
1502 THIS->refresh_check ();
1502 break; 1503 break;
1503 1504
1504# case Opt_scrollBar_floating: 1505# case Opt_scrollBar_floating:
1505# case Opt_scrollBar_right: 1506# case Opt_scrollBar_right:
1506# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1507# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1564 1565
1565 clamp_it (rc.col, 0, THIS->ncol); 1566 clamp_it (rc.col, 0, THIS->ncol);
1566 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1567 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1567 1568
1568 if (ix) 1569 if (ix)
1570 {
1569 THIS->want_refresh = 1; 1571 THIS->want_refresh = 1;
1572 THIS->refresh_check ();
1573 }
1570 } 1574 }
1571} 1575}
1572 1576
1573char 1577char
1574rxvt_term::cur_charset () 1578rxvt_term::cur_charset ()
… …
1681 Atom *props = XListProperties (THIS->dpy, window, &count); 1685 Atom *props = XListProperties (THIS->dpy, window, &count);
1682 1686
1683 EXTEND (SP, count); 1687 EXTEND (SP, count);
1684 while (count--) 1688 while (count--)
1685 PUSHs (newSVuv ((U32)props [count])); 1689 PUSHs (newSVuv ((U32)props [count]));
1686 1690
1687 XFree (props); 1691 XFree (props);
1688} 1692}
1689 1693
1690void 1694void
1691rxvt_term::XGetWindowProperty (Window window, Atom property) 1695rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1714 XFree (prop); 1718 XFree (prop);
1715 } 1719 }
1716} 1720}
1717 1721
1718void 1722void
1719rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1723rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1720 CODE: 1724 CODE:
1721{ 1725{
1722 STRLEN len; 1726 STRLEN len;
1723 char *data_ = SvPVbyte (data, len); 1727 char *data_ = SvPVbyte (data, len);
1724 1728

Diff Legend

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