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.118 by root, Fri Dec 14 05:25:25 2007 UTC

… …
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
… …
70 SV *sv = newSVpv (str, 0); 70 SV *sv = newSVpv (str, 0);
71 SvUTF8_on (sv); 71 SvUTF8_on (sv);
72 free (str); 72 free (str);
73 73
74 return sv; 74 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} 75}
82 76
83static SV * 77static SV *
84newSVptr (void *ptr, const char *klass) 78newSVptr (void *ptr, const char *klass)
85{ 79{
… …
220 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
221 )); 215 ));
222 av_push (overlay_av, newSViv ((long)this)); 216 av_push (overlay_av, newSViv ((long)this));
223 217
224 THIS->want_refresh = 1; 218 THIS->want_refresh = 1;
219 THIS->refresh_check ();
225} 220}
226 221
227void 222void
228overlay::hide () 223overlay::hide ()
229{ 224{
… …
243 238
244 SvREFCNT_dec (overlay_av); 239 SvREFCNT_dec (overlay_av);
245 overlay_av = 0; 240 overlay_av = 0;
246 241
247 THIS->want_refresh = 1; 242 THIS->want_refresh = 1;
243 THIS->refresh_check ();
248} 244}
249 245
250void overlay::swap () 246void overlay::swap ()
251{ 247{
252 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 248 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--; ) 293 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 294 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
299 } 295 }
300 296
301 THIS->want_refresh = 1; 297 THIS->want_refresh = 1;
298 THIS->refresh_check ();
302} 299}
303 300
304///////////////////////////////////////////////////////////////////////////// 301/////////////////////////////////////////////////////////////////////////////
305 302
306#define IOM_CLASS "urxvt" 303#define IOM_CLASS "urxvt"
304#define IOM_WARN rxvt_warn
307#include <iom_perl.h> 305#include <iom_perl.h>
308 306
309///////////////////////////////////////////////////////////////////////////// 307/////////////////////////////////////////////////////////////////////////////
310 308
311struct rxvt_perl_interp rxvt_perl; 309struct rxvt_perl_interp rxvt_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);
… …
780_exit (int status) 778_exit (int status)
781 779
782NV 780NV
783NOW () 781NOW ()
784 CODE: 782 CODE:
785 RETVAL = NOW; 783 RETVAL = ev::now ();
786 OUTPUT: 784 OUTPUT:
787 RETVAL 785 RETVAL
788 786
789int 787int
790GET_BASEFG (int rend) 788GET_BASEFG (int rend)
… …
862 for (int i = AvFILL (env) + 1; i--; ) 860 for (int i = AvFILL (env) + 1; i--; )
863 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 861 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
864 862
865 envv->push_back (0); 863 envv->push_back (0);
866 864
867 bool success;
868
869 try 865 try
870 { 866 {
871 success = term->init (argv, envv); 867 term->init (argv, envv);
872 } 868 }
873 catch (const class rxvt_failure_exception &e) 869 catch (const class rxvt_failure_exception &e)
874 {
875 success = false;
876 }
877
878 if (!success)
879 { 870 {
880 term->destroy (); 871 term->destroy ();
881 croak ("error while initializing new terminal instance"); 872 croak ("error while initializing new terminal instance");
882 } 873 }
883 874
… …
1144 if (*i) 1135 if (*i)
1145 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1136 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1146} 1137}
1147 1138
1148int 1139int
1149rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1140rxvt_term::pty_ev_events (int events = ev::UNDEF)
1150 CODE: 1141 CODE:
1151 RETVAL = THIS->pty_ev.events; 1142 RETVAL = THIS->pty_ev.events;
1152 if (events != EVENT_UNDEF) 1143 if (events != ev::UNDEF)
1153 THIS->pty_ev.set (events); 1144 THIS->pty_ev.set (events);
1154 OUTPUT: 1145 OUTPUT:
1155 RETVAL 1146 RETVAL
1156 1147
1157int 1148int
… …
1236 1227
1237void 1228void
1238rxvt_term::want_refresh () 1229rxvt_term::want_refresh ()
1239 CODE: 1230 CODE:
1240 THIS->want_refresh = 1; 1231 THIS->want_refresh = 1;
1232 THIS->refresh_check ();
1241 1233
1242void 1234void
1243rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1235rxvt_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: 1236 PPCODE:
1245{ 1237{
… …
1400SV * 1392SV *
1401rxvt_term::special_decode (SV *text) 1393rxvt_term::special_decode (SV *text)
1402 CODE: 1394 CODE:
1403{ 1395{
1404 wchar_t *wstr = sv2wcs (text); 1396 wchar_t *wstr = sv2wcs (text);
1405 int wlen = wcslen (wstr);
1406 int dlen = 0; 1397 int dlen = 0;
1407 1398
1408 // find length 1399 // find length
1409 for (wchar_t *s = wstr; *s; s++) 1400 for (wchar_t *s = wstr; *s; s++)
1410 if (*s == NOCHAR) 1401 if (*s == NOCHAR)
… …
1473 1464
1474const char * 1465const char *
1475rxvt_term::x_resource (const char *name) 1466rxvt_term::x_resource (const char *name)
1476 1467
1477bool 1468bool
1478rxvt_term::option (U32 optval, int set = -1) 1469rxvt_term::option (U8 optval, int set = -1)
1479 CODE: 1470 CODE:
1480{ 1471{
1481 RETVAL = THIS->options & optval; 1472 RETVAL = THIS->option (optval);
1482 1473
1483 if (set >= 0) 1474 if (set >= 0)
1484 { 1475 {
1485 if (set)
1486 THIS->options |= optval; 1476 THIS->set_option (optval, set);
1487 else
1488 THIS->options &= ~optval;
1489 1477
1490 if (THIS->check_ev.is_active ()) // avoid doing this before START 1478 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1491 switch (optval) 1479 switch (optval)
1492 { 1480 {
1493 case Opt_skipBuiltinGlyphs: 1481 case Opt_skipBuiltinGlyphs:
1494 THIS->set_fonts (); 1482 THIS->set_fonts ();
1495 THIS->scr_remap_chars (); 1483 THIS->scr_remap_chars ();
1496 THIS->scr_touch (true); 1484 THIS->scr_touch (true);
1497 THIS->want_refresh = 1; 1485 THIS->want_refresh = 1;
1486 THIS->refresh_check ();
1498 break; 1487 break;
1499 1488
1500 case Opt_cursorUnderline: 1489 case Opt_cursorUnderline:
1501 THIS->want_refresh = 1; 1490 THIS->want_refresh = 1;
1491 THIS->refresh_check ();
1502 break; 1492 break;
1503 1493
1504# case Opt_scrollBar_floating: 1494# case Opt_scrollBar_floating:
1505# case Opt_scrollBar_right: 1495# case Opt_scrollBar_right:
1506# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1496# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1564 1554
1565 clamp_it (rc.col, 0, THIS->ncol); 1555 clamp_it (rc.col, 0, THIS->ncol);
1566 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1556 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1567 1557
1568 if (ix) 1558 if (ix)
1559 {
1569 THIS->want_refresh = 1; 1560 THIS->want_refresh = 1;
1561 THIS->refresh_check ();
1562 }
1570 } 1563 }
1571} 1564}
1572 1565
1573char 1566char
1574rxvt_term::cur_charset () 1567rxvt_term::cur_charset ()
… …
1681 Atom *props = XListProperties (THIS->dpy, window, &count); 1674 Atom *props = XListProperties (THIS->dpy, window, &count);
1682 1675
1683 EXTEND (SP, count); 1676 EXTEND (SP, count);
1684 while (count--) 1677 while (count--)
1685 PUSHs (newSVuv ((U32)props [count])); 1678 PUSHs (newSVuv ((U32)props [count]));
1686 1679
1687 XFree (props); 1680 XFree (props);
1688} 1681}
1689 1682
1690void 1683void
1691rxvt_term::XGetWindowProperty (Window window, Atom property) 1684rxvt_term::XGetWindowProperty (Window window, Atom property)

Diff Legend

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