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.109 by root, Thu Dec 14 15:19:31 2006 UTC vs.
Revision 1.122 by root, Sun Jun 15 14:07:58 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)]
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{
… …
72 SV *sv = newSVpv (str, 0); 66 SV *sv = newSVpv (str, 0);
73 SvUTF8_on (sv); 67 SvUTF8_on (sv);
74 free (str); 68 free (str);
75 69
76 return sv; 70 return sv;
77}
78
79static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83} 71}
84 72
85static SV * 73static SV *
86newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
87{ 75{
… …
222 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 210 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
223 )); 211 ));
224 av_push (overlay_av, newSViv ((long)this)); 212 av_push (overlay_av, newSViv ((long)this));
225 213
226 THIS->want_refresh = 1; 214 THIS->want_refresh = 1;
215 THIS->refresh_check ();
227} 216}
228 217
229void 218void
230overlay::hide () 219overlay::hide ()
231{ 220{
… …
245 234
246 SvREFCNT_dec (overlay_av); 235 SvREFCNT_dec (overlay_av);
247 overlay_av = 0; 236 overlay_av = 0;
248 237
249 THIS->want_refresh = 1; 238 THIS->want_refresh = 1;
239 THIS->refresh_check ();
250} 240}
251 241
252void overlay::swap () 242void overlay::swap ()
253{ 243{
254 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));
… …
299 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 289 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
300 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 290 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
301 } 291 }
302 292
303 THIS->want_refresh = 1; 293 THIS->want_refresh = 1;
294 THIS->refresh_check ();
304} 295}
305 296
306///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
307 298
308#define IOM_CLASS "urxvt" 299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
309#include <iom_perl.h> 301#include "iom_perl.h"
310 302
311///////////////////////////////////////////////////////////////////////////// 303/////////////////////////////////////////////////////////////////////////////
312 304
313struct rxvt_perl_interp rxvt_perl; 305struct rxvt_perl_interp rxvt_perl;
314 306
… …
389 381
390 // pre-handling of some events 382 // pre-handling of some events
391 if (htype == HOOK_REFRESH_END) 383 if (htype == HOOK_REFRESH_END)
392 { 384 {
393 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 385 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
394 386
395 for (int i = 0; i <= AvFILL (av); i++) 387 for (int i = 0; i <= AvFILL (av); i++)
396 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 388 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
397 } 389 }
398 390
399 swap (perl_environ, environ); 391 swap (perl_environ, environ);
… …
598 590
599 // post-handling of some events 591 // post-handling of some events
600 if (htype == HOOK_REFRESH_BEGIN) 592 if (htype == HOOK_REFRESH_BEGIN)
601 { 593 {
602 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 594 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
603 595
604 for (int i = AvFILL (av); i >= 0; i--) 596 for (int i = AvFILL (av); i >= 0; i--)
605 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 597 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
606 } 598 }
607 else if (htype == HOOK_DESTROY) 599 else if (htype == HOOK_DESTROY)
608 { 600 {
609 clearSVptr ((SV *)term->perl.self); 601 clearSVptr ((SV *)term->perl.self);
610 SvREFCNT_dec ((SV *)term->perl.self); 602 SvREFCNT_dec ((SV *)term->perl.self);
611 603
612 // don't allow further calls 604 // don't allow further calls
613 term->perl.self = 0; 605 term->perl.self = 0;
614 } 606 }
615 607
616 swap (perl_environ, environ); 608 swap (perl_environ, environ);
… …
674 const_iv (AnyModifier), 666 const_iv (AnyModifier),
675 667
676 const_iv (NoSymbol), 668 const_iv (NoSymbol),
677 const_iv (GrabModeSync), 669 const_iv (GrabModeSync),
678 const_iv (GrabModeAsync), 670 const_iv (GrabModeAsync),
679
680 const_iv (EVENT_NONE),
681 const_iv (EVENT_READ),
682 const_iv (EVENT_WRITE),
683 671
684 const_iv (NoEventMask), 672 const_iv (NoEventMask),
685 const_iv (KeyPressMask), 673 const_iv (KeyPressMask),
686 const_iv (KeyReleaseMask), 674 const_iv (KeyReleaseMask),
687 const_iv (ButtonPressMask), 675 const_iv (ButtonPressMask),
… …
786_exit (int status) 774_exit (int status)
787 775
788NV 776NV
789NOW () 777NOW ()
790 CODE: 778 CODE:
791 RETVAL = NOW; 779 RETVAL = ev::now ();
792 OUTPUT: 780 OUTPUT:
793 RETVAL 781 RETVAL
794 782
795int 783int
796GET_BASEFG (int rend) 784GET_BASEFG (int rend)
… …
868 for (int i = AvFILL (env) + 1; i--; ) 856 for (int i = AvFILL (env) + 1; i--; )
869 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 857 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
870 858
871 envv->push_back (0); 859 envv->push_back (0);
872 860
873 bool success;
874
875 try 861 try
876 { 862 {
877 success = term->init (argv, envv); 863 term->init (argv, envv);
878 } 864 }
879 catch (const class rxvt_failure_exception &e) 865 catch (const class rxvt_failure_exception &e)
880 {
881 success = false;
882 }
883
884 if (!success)
885 { 866 {
886 term->destroy (); 867 term->destroy ();
887 croak ("error while initializing new terminal instance"); 868 croak ("error while initializing new terminal instance");
888 } 869 }
889 870
… …
1150 if (*i) 1131 if (*i)
1151 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1132 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1152} 1133}
1153 1134
1154int 1135int
1155rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1136rxvt_term::pty_ev_events (int events = ev::UNDEF)
1156 CODE: 1137 CODE:
1157 RETVAL = THIS->pty_ev.events; 1138 RETVAL = THIS->pty_ev.events;
1158 if (events != EVENT_UNDEF) 1139 if (events != ev::UNDEF)
1159 THIS->pty_ev.set (events); 1140 THIS->pty_ev.set (events);
1160 OUTPUT: 1141 OUTPUT:
1161 RETVAL 1142 RETVAL
1162 1143
1163int 1144int
… …
1242 1223
1243void 1224void
1244rxvt_term::want_refresh () 1225rxvt_term::want_refresh ()
1245 CODE: 1226 CODE:
1246 THIS->want_refresh = 1; 1227 THIS->want_refresh = 1;
1228 THIS->refresh_check ();
1247 1229
1248void 1230void
1249rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1231rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1250 PPCODE: 1232 PPCODE:
1251{ 1233{
… …
1406SV * 1388SV *
1407rxvt_term::special_decode (SV *text) 1389rxvt_term::special_decode (SV *text)
1408 CODE: 1390 CODE:
1409{ 1391{
1410 wchar_t *wstr = sv2wcs (text); 1392 wchar_t *wstr = sv2wcs (text);
1411 int wlen = wcslen (wstr);
1412 int dlen = 0; 1393 int dlen = 0;
1413 1394
1414 // find length 1395 // find length
1415 for (wchar_t *s = wstr; *s; s++) 1396 for (wchar_t *s = wstr; *s; s++)
1416 if (*s == NOCHAR) 1397 if (*s == NOCHAR)
… …
1479 1460
1480const char * 1461const char *
1481rxvt_term::x_resource (const char *name) 1462rxvt_term::x_resource (const char *name)
1482 1463
1483bool 1464bool
1484rxvt_term::option (U32 optval, int set = -1) 1465rxvt_term::option (U8 optval, int set = -1)
1485 CODE: 1466 CODE:
1486{ 1467{
1487 RETVAL = THIS->options & optval; 1468 RETVAL = THIS->option (optval);
1488 1469
1489 if (set >= 0) 1470 if (set >= 0)
1490 { 1471 {
1491 if (set)
1492 THIS->options |= optval; 1472 THIS->set_option (optval, set);
1493 else
1494 THIS->options &= ~optval;
1495 1473
1496 if (THIS->check_ev.is_active ()) // avoid doing this before START 1474 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1497 switch (optval) 1475 switch (optval)
1498 { 1476 {
1499 case Opt_skipBuiltinGlyphs: 1477 case Opt_skipBuiltinGlyphs:
1500 THIS->set_fonts (); 1478 THIS->set_fonts ();
1501 THIS->scr_remap_chars (); 1479 THIS->scr_remap_chars ();
1502 THIS->scr_touch (true); 1480 THIS->scr_touch (true);
1503 THIS->want_refresh = 1; 1481 THIS->want_refresh = 1;
1482 THIS->refresh_check ();
1504 break; 1483 break;
1505 1484
1506 case Opt_cursorUnderline: 1485 case Opt_cursorUnderline:
1507 THIS->want_refresh = 1; 1486 THIS->want_refresh = 1;
1487 THIS->refresh_check ();
1508 break; 1488 break;
1509 1489
1510# case Opt_scrollBar_floating: 1490# case Opt_scrollBar_floating:
1511# case Opt_scrollBar_right: 1491# case Opt_scrollBar_right:
1512# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1492# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1570 1550
1571 clamp_it (rc.col, 0, THIS->ncol); 1551 clamp_it (rc.col, 0, THIS->ncol);
1572 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1552 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1573 1553
1574 if (ix) 1554 if (ix)
1555 {
1575 THIS->want_refresh = 1; 1556 THIS->want_refresh = 1;
1557 THIS->refresh_check ();
1558 }
1576 } 1559 }
1577} 1560}
1578 1561
1579char 1562char
1580rxvt_term::cur_charset () 1563rxvt_term::cur_charset ()
… …
1687 Atom *props = XListProperties (THIS->dpy, window, &count); 1670 Atom *props = XListProperties (THIS->dpy, window, &count);
1688 1671
1689 EXTEND (SP, count); 1672 EXTEND (SP, count);
1690 while (count--) 1673 while (count--)
1691 PUSHs (newSVuv ((U32)props [count])); 1674 PUSHs (newSVuv ((U32)props [count]));
1692 1675
1693 XFree (props); 1676 XFree (props);
1694} 1677}
1695 1678
1696void 1679void
1697rxvt_term::XGetWindowProperty (Window window, Atom property) 1680rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1720 XFree (prop); 1703 XFree (prop);
1721 } 1704 }
1722} 1705}
1723 1706
1724void 1707void
1725rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1708rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1726 CODE: 1709 CODE:
1727{ 1710{
1728 STRLEN len; 1711 STRLEN len;
1729 char *data_ = SvPVbyte (data, len); 1712 char *data_ = SvPVbyte (data, len);
1730 1713

Diff Legend

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