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.115 by ayin, Wed Oct 31 09:55:24 2007 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)]
… …
214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 210 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
215 )); 211 ));
216 av_push (overlay_av, newSViv ((long)this)); 212 av_push (overlay_av, newSViv ((long)this));
217 213
218 THIS->want_refresh = 1; 214 THIS->want_refresh = 1;
215 THIS->refresh_check ();
219} 216}
220 217
221void 218void
222overlay::hide () 219overlay::hide ()
223{ 220{
… …
237 234
238 SvREFCNT_dec (overlay_av); 235 SvREFCNT_dec (overlay_av);
239 overlay_av = 0; 236 overlay_av = 0;
240 237
241 THIS->want_refresh = 1; 238 THIS->want_refresh = 1;
239 THIS->refresh_check ();
242} 240}
243 241
244void overlay::swap () 242void overlay::swap ()
245{ 243{
246 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));
… …
291 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 289 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
292 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 290 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
293 } 291 }
294 292
295 THIS->want_refresh = 1; 293 THIS->want_refresh = 1;
294 THIS->refresh_check ();
296} 295}
297 296
298///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
299 298
300#define IOM_CLASS "urxvt" 299#define IOM_CLASS "urxvt"
301#define IOM_WARN rxvt_warn 300#define IOM_WARN rxvt_warn
302#include <iom_perl.h> 301#include "iom_perl.h"
303 302
304///////////////////////////////////////////////////////////////////////////// 303/////////////////////////////////////////////////////////////////////////////
305 304
306struct rxvt_perl_interp rxvt_perl; 305struct rxvt_perl_interp rxvt_perl;
307 306
… …
775_exit (int status) 774_exit (int status)
776 775
777NV 776NV
778NOW () 777NOW ()
779 CODE: 778 CODE:
780 RETVAL = NOW; 779 RETVAL = ev::now ();
781 OUTPUT: 780 OUTPUT:
782 RETVAL 781 RETVAL
783 782
784int 783int
785GET_BASEFG (int rend) 784GET_BASEFG (int rend)
… …
857 for (int i = AvFILL (env) + 1; i--; ) 856 for (int i = AvFILL (env) + 1; i--; )
858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 857 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
859 858
860 envv->push_back (0); 859 envv->push_back (0);
861 860
862 bool success;
863
864 try 861 try
865 { 862 {
866 success = term->init (argv, envv); 863 term->init (argv, envv);
867 } 864 }
868 catch (const class rxvt_failure_exception &e) 865 catch (const class rxvt_failure_exception &e)
869 {
870 success = false;
871 }
872
873 if (!success)
874 { 866 {
875 term->destroy (); 867 term->destroy ();
876 croak ("error while initializing new terminal instance"); 868 croak ("error while initializing new terminal instance");
877 } 869 }
878 870
… …
1139 if (*i) 1131 if (*i)
1140 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1132 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1141} 1133}
1142 1134
1143int 1135int
1144rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1136rxvt_term::pty_ev_events (int events = ev::UNDEF)
1145 CODE: 1137 CODE:
1146 RETVAL = THIS->pty_ev.events; 1138 RETVAL = THIS->pty_ev.events;
1147 if (events != EVENT_UNDEF) 1139 if (events != ev::UNDEF)
1148 THIS->pty_ev.set (events); 1140 THIS->pty_ev.set (events);
1149 OUTPUT: 1141 OUTPUT:
1150 RETVAL 1142 RETVAL
1151 1143
1152int 1144int
… …
1231 1223
1232void 1224void
1233rxvt_term::want_refresh () 1225rxvt_term::want_refresh ()
1234 CODE: 1226 CODE:
1235 THIS->want_refresh = 1; 1227 THIS->want_refresh = 1;
1228 THIS->refresh_check ();
1236 1229
1237void 1230void
1238rxvt_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)
1239 PPCODE: 1232 PPCODE:
1240{ 1233{
… …
1476 1469
1477 if (set >= 0) 1470 if (set >= 0)
1478 { 1471 {
1479 THIS->set_option (optval, set); 1472 THIS->set_option (optval, set);
1480 1473
1481 if (THIS->check_ev.is_active ()) // avoid doing this before START 1474 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1482 switch (optval) 1475 switch (optval)
1483 { 1476 {
1484 case Opt_skipBuiltinGlyphs: 1477 case Opt_skipBuiltinGlyphs:
1485 THIS->set_fonts (); 1478 THIS->set_fonts ();
1486 THIS->scr_remap_chars (); 1479 THIS->scr_remap_chars ();
1487 THIS->scr_touch (true); 1480 THIS->scr_touch (true);
1488 THIS->want_refresh = 1; 1481 THIS->want_refresh = 1;
1482 THIS->refresh_check ();
1489 break; 1483 break;
1490 1484
1491 case Opt_cursorUnderline: 1485 case Opt_cursorUnderline:
1492 THIS->want_refresh = 1; 1486 THIS->want_refresh = 1;
1487 THIS->refresh_check ();
1493 break; 1488 break;
1494 1489
1495# case Opt_scrollBar_floating: 1490# case Opt_scrollBar_floating:
1496# case Opt_scrollBar_right: 1491# case Opt_scrollBar_right:
1497# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1492# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1555 1550
1556 clamp_it (rc.col, 0, THIS->ncol); 1551 clamp_it (rc.col, 0, THIS->ncol);
1557 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1552 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1558 1553
1559 if (ix) 1554 if (ix)
1555 {
1560 THIS->want_refresh = 1; 1556 THIS->want_refresh = 1;
1557 THIS->refresh_check ();
1558 }
1561 } 1559 }
1562} 1560}
1563 1561
1564char 1562char
1565rxvt_term::cur_charset () 1563rxvt_term::cur_charset ()
… …
1705 XFree (prop); 1703 XFree (prop);
1706 } 1704 }
1707} 1705}
1708 1706
1709void 1707void
1710rxvt_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)
1711 CODE: 1709 CODE:
1712{ 1710{
1713 STRLEN len; 1711 STRLEN len;
1714 char *data_ = SvPVbyte (data, len); 1712 char *data_ = SvPVbyte (data, len);
1715 1713

Diff Legend

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