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.87 by root, Sat Jan 21 08:07:38 2006 UTC vs.
Revision 1.92 by root, Wed Jan 25 00:57:57 2006 UTC

… …
554 break; 554 break;
555 555
556 case DT_STR_LEN: 556 case DT_STR_LEN:
557 { 557 {
558 char *str = va_arg (ap, char *); 558 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 559 int len = va_arg (ap, int);
560 560
561 printf ("pushing str %p:%d\n", str,len);//D
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 563 }
563 break; 564 break;
564 565
565 case DT_WCS_LEN: 566 case DT_WCS_LEN:
566 { 567 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 568 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 569 int wlen = va_arg (ap, int);
569 570
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 571 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
572 }
573 break;
574
575 case DT_LCS_LEN:
576 {
577 long *lstr = va_arg (ap, long *);
578 int llen = va_arg (ap, int);
579
580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 581 }
572 break; 582 break;
573 583
574 case DT_XEVENT: 584 case DT_XEVENT:
575 { 585 {
576 XEvent *xe = va_arg (ap, XEvent *); 586 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 587 HV *hv = newHV ();
578 588
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 589# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
580# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 590# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
581# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 591# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 592# undef set
583 593
584 setiv (type, xe->type); 594 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 595 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 596 setiv (serial, xe->xany.serial);
587 597
… …
716 } 726 }
717 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
718 { 728 {
719 clearSVptr ((SV *)term->perl.self); 729 clearSVptr ((SV *)term->perl.self);
720 SvREFCNT_dec ((SV *)term->perl.self); 730 SvREFCNT_dec ((SV *)term->perl.self);
731
732 // don't allow further calls
733 term->perl.self = 0;
721 } 734 }
722 735
723 swap (perl_environ, environ); 736 swap (perl_environ, environ);
724 737
725 return event_consumed; 738 return event_consumed;
… …
842 const_iv (SelectionRequest), 855 const_iv (SelectionRequest),
843 const_iv (SelectionNotify), 856 const_iv (SelectionNotify),
844 const_iv (ColormapNotify), 857 const_iv (ColormapNotify),
845 const_iv (ClientMessage), 858 const_iv (ClientMessage),
846 const_iv (MappingNotify), 859 const_iv (MappingNotify),
860# if ENABLE_XIM_ONTHESPOT
861 const_iv (XIMReverse),
862 const_iv (XIMUnderline),
863 const_iv (XIMHighlight),
864 const_iv (XIMPrimary),
865 const_iv (XIMSecondary),
866 const_iv (XIMTertiary),
867 const_iv (XIMVisibleToForward),
868 const_iv (XIMVisibleToBackword),
869 const_iv (XIMVisibleToCenter),
870# if 0
871 const_iv (XIMForwardChar),
872 const_iv (XIMBackwardChar),
873 const_iv (XIMForwardWord),
874 const_iv (XIMBackwardWord),
875 const_iv (XIMCaretUp),
876 const_iv (XIMCaretDown),
877 const_iv (XIMNextLine),
878 const_iv (XIMPreviousLine),
879 const_iv (XIMLineStart),
880 const_iv (XIMLineEnd),
881 const_iv (XIMAbsolutePosition),
882 const_iv (XIMDontChange),
883# endif
884# endif
847 }; 885 };
848 886
849 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
850 civ-- > const_iv; ) 888 civ-- > const_iv; )
851 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
928 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 966 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
929 croak ("first argument to urxvt::term->_new must be arrayref"); 967 croak ("first argument to urxvt::term->_new must be arrayref");
930 968
931 rxvt_term *term = new rxvt_term; 969 rxvt_term *term = new rxvt_term;
932 970
933 term->argv = new stringvec; 971 stringvec *argv = new stringvec;
934 term->envv = new stringvec; 972 stringvec *envv = new stringvec;
935 973
936 for (int i = 1; i < items; i++) 974 for (int i = 1; i < items; i++)
937 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 975 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
938 976
939 AV *envv = (AV *)SvRV (ST (0)); 977 AV *env = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (envv) + 1; i--; ) 978 for (int i = AvFILL (env) + 1; i--; )
941 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 979 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 980
943 term->envv->push_back (0); 981 envv->push_back (0);
944 982
945 bool success; 983 bool success;
946 984
947 try 985 try
948 { 986 {
949 success = term->init (term->argv->size (), term->argv->begin ()); 987 success = term->init (argv, envv);
950 } 988 }
951 catch (const class rxvt_failure_exception &e) 989 catch (const class rxvt_failure_exception &e)
952 { 990 {
953 success = false; 991 success = false;
954 } 992 }
… …
1174 if (events != EVENT_UNDEF) 1212 if (events != EVENT_UNDEF)
1175 THIS->pty_ev.set (events); 1213 THIS->pty_ev.set (events);
1176 OUTPUT: 1214 OUTPUT:
1177 RETVAL 1215 RETVAL
1178 1216
1217int
1218rxvt_term::pty_fd ()
1219 CODE:
1220 RETVAL = THIS->pty->pty;
1221 OUTPUT:
1222 RETVAL
1223
1179Window 1224Window
1180rxvt_term::parent () 1225rxvt_term::parent ()
1181 CODE: 1226 CODE:
1182 RETVAL = THIS->parent [0]; 1227 RETVAL = THIS->parent [0];
1183 OUTPUT: 1228 OUTPUT:
… …
1237 1282
1238 line_t &l = ROW(row_number); 1283 line_t &l = ROW(row_number);
1239 1284
1240 if (GIMME_V != G_VOID) 1285 if (GIMME_V != G_VOID)
1241 { 1286 {
1242 wchar_t *wstr = new wchar_t [THIS->ncol]; 1287 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1243 1288
1244 for (int col = 0; col < THIS->ncol; col++) 1289 for (int col = 0; col < THIS->ncol; col++)
1245 wstr [col] = l.t [col]; 1290 wstr [col] = l.t [col];
1246 1291
1247 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1292 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1248
1249 delete [] wstr;
1250 } 1293 }
1251 1294
1252 if (new_text) 1295 if (new_text)
1253 { 1296 {
1254 wchar_t *wstr = sv2wcs (new_text); 1297 wchar_t *wstr = sv2wcs (new_text);
… …
1347rxvt_term::special_encode (SV *string) 1390rxvt_term::special_encode (SV *string)
1348 CODE: 1391 CODE:
1349{ 1392{
1350 wchar_t *wstr = sv2wcs (string); 1393 wchar_t *wstr = sv2wcs (string);
1351 int wlen = wcslen (wstr); 1394 int wlen = wcslen (wstr);
1352 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1395 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1353 1396
1354 rxvt_push_locale (THIS->locale); 1397 rxvt_push_locale (THIS->locale);
1355 1398
1356 wchar_t *r = rstr; 1399 wchar_t *r = rstr;
1357 for (wchar_t *s = wstr; *s; s++) 1400 for (wchar_t *s = wstr; *s; s++)
1401 {
1402 int w = WCWIDTH (*s);
1403
1358 if (wcwidth (*s) == 0) 1404 if (w == 0)
1359 { 1405 {
1360 if (r == rstr) 1406 if (r == rstr)
1361 croak ("leading combining character unencodable"); 1407 croak ("leading combining character unencodable");
1362 1408
1363 unicode_t n = rxvt_compose (r[-1], *s); 1409 unicode_t n = rxvt_compose (r[-1], *s);
1364 if (n == NOCHAR) 1410 if (n == NOCHAR)
1365 n = rxvt_composite.compose (r[-1], *s); 1411 n = rxvt_composite.compose (r[-1], *s);
1366 1412
1367 r[-1] = n; 1413 r[-1] = n;
1368 } 1414 }
1369#if !UNICODE_3 1415#if !UNICODE_3
1370 else if (*s >= 0x10000) 1416 else if (*s >= 0x10000)
1371 *r++ = rxvt_composite.compose (*s); 1417 *r++ = rxvt_composite.compose (*s);
1372#endif 1418#endif
1373 else 1419 else
1374 *r++ = *s; 1420 *r++ = *s;
1421
1422 // the *2 above only allows wcwidth <= 2
1423 if (w > 1)
1424 *r++ = NOCHAR;
1425 }
1375 1426
1376 rxvt_pop_locale (); 1427 rxvt_pop_locale ();
1377 1428
1378 RETVAL = wcs2sv (rstr, r - rstr); 1429 RETVAL = wcs2sv (rstr, r - rstr);
1379
1380 delete [] rstr;
1381} 1430}
1382 OUTPUT: 1431 OUTPUT:
1383 RETVAL 1432 RETVAL
1384 1433
1385SV * 1434SV *
… …
1397 else if (IS_COMPOSE (*s)) 1446 else if (IS_COMPOSE (*s))
1398 dlen += rxvt_composite.expand (*s, 0); 1447 dlen += rxvt_composite.expand (*s, 0);
1399 else 1448 else
1400 dlen++; 1449 dlen++;
1401 1450
1402 wchar_t *rstr = new wchar_t [dlen]; 1451 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1403 1452
1404 // decode 1453 // decode
1405 wchar_t *r = rstr; 1454 wchar_t *r = rstr;
1406 for (wchar_t *s = wstr; *s; s++) 1455 for (wchar_t *s = wstr; *s; s++)
1407 if (*s == NOCHAR) 1456 if (*s == NOCHAR)
… …
1410 r += rxvt_composite.expand (*s, r); 1459 r += rxvt_composite.expand (*s, r);
1411 else 1460 else
1412 *r++ = *s; 1461 *r++ = *s;
1413 1462
1414 RETVAL = wcs2sv (rstr, r - rstr); 1463 RETVAL = wcs2sv (rstr, r - rstr);
1415
1416 delete [] rstr;
1417} 1464}
1418 OUTPUT: 1465 OUTPUT:
1419 RETVAL 1466 RETVAL
1420 1467
1421void 1468void
… …
1531 if (items == 3) 1578 if (items == 3)
1532 { 1579 {
1533 rc.row = SvIV (ST (1)); 1580 rc.row = SvIV (ST (1));
1534 rc.col = SvIV (ST (2)); 1581 rc.col = SvIV (ST (2));
1535 1582
1536 if (ix == 2 && rc.col == 0) 1583 if (ix == 2)
1537 { 1584 {
1585 if (rc.col == 0)
1586 {
1587 // col == 0 means end of previous line
1538 rc.row--; 1588 rc.row--;
1539 rc.col = THIS->ncol; 1589 rc.col = THIS->ncol;
1590 }
1591 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1592 && rc.col > ROW(rc.row).l)
1593 {
1594 // col >= length means while line and add newline
1595 rc.col = THIS->ncol;
1596 }
1540 } 1597 }
1541 1598
1542 clamp_it (rc.col, 0, THIS->ncol); 1599 clamp_it (rc.col, 0, THIS->ncol);
1543 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1600 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1544 1601

Diff Legend

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