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.84 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.91 by root, Wed Jan 25 00:42:21 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
… …
596 setuv (root, xe->xmotion.root); 606 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 607 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 608 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 609 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 610 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight); 611 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 612 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 613 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 614 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 615 setuv (state, xe->xmotion.state);
606 616
… …
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
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
847 }; 884 };
848 885
849 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 886 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
850 civ-- > const_iv; ) 887 civ-- > const_iv; )
851 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
928 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 965 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
929 croak ("first argument to urxvt::term->_new must be arrayref"); 966 croak ("first argument to urxvt::term->_new must be arrayref");
930 967
931 rxvt_term *term = new rxvt_term; 968 rxvt_term *term = new rxvt_term;
932 969
933 term->argv = new stringvec; 970 stringvec *argv = new stringvec;
934 term->envv = new stringvec; 971 stringvec *envv = new stringvec;
935 972
936 for (int i = 1; i < items; i++) 973 for (int i = 1; i < items; i++)
937 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 974 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
938 975
939 AV *envv = (AV *)SvRV (ST (0)); 976 AV *env = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (envv) + 1; i--; ) 977 for (int i = AvFILL (env) + 1; i--; )
941 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 978 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 979
943 term->envv->push_back (0); 980 envv->push_back (0);
944 981
945 bool success; 982 bool success;
946 983
947 try 984 try
948 { 985 {
949 success = term->init (term->argv->size (), term->argv->begin ()); 986 success = term->init (argv, envv);
950 } 987 }
951 catch (const class rxvt_failure_exception &e) 988 catch (const class rxvt_failure_exception &e)
952 { 989 {
953 success = false; 990 success = false;
954 } 991 }
… …
1117rxvt_term::ModLevel3Mask () 1154rxvt_term::ModLevel3Mask ()
1118 ALIAS: 1155 ALIAS:
1119 ModLevel3Mask = 0 1156 ModLevel3Mask = 0
1120 ModMetaMask = 1 1157 ModMetaMask = 1
1121 ModNumLockMask = 2 1158 ModNumLockMask = 2
1159 current_screen = 3
1160 hidden_cursor = 4
1122 CODE: 1161 CODE:
1123 switch (ix) 1162 switch (ix)
1124 { 1163 {
1125 case 0: RETVAL = THIS->ModLevel3Mask; break; 1164 case 0: RETVAL = THIS->ModLevel3Mask; break;
1126 case 1: RETVAL = THIS->ModMetaMask; break; 1165 case 1: RETVAL = THIS->ModMetaMask; break;
1127 case 2: RETVAL = THIS->ModNumLockMask; break; 1166 case 2: RETVAL = THIS->ModNumLockMask; break;
1167 case 3: RETVAL = THIS->current_screen; break;
1168 case 4: RETVAL = THIS->hidden_cursor; break;
1128 } 1169 }
1129 OUTPUT: 1170 OUTPUT:
1130 RETVAL 1171 RETVAL
1131 1172
1132char * 1173char *
… …
1170 if (events != EVENT_UNDEF) 1211 if (events != EVENT_UNDEF)
1171 THIS->pty_ev.set (events); 1212 THIS->pty_ev.set (events);
1172 OUTPUT: 1213 OUTPUT:
1173 RETVAL 1214 RETVAL
1174 1215
1216int
1217rxvt_term::pty_fd ()
1218 CODE:
1219 RETVAL = THIS->pty->pty;
1220 OUTPUT:
1221 RETVAL
1222
1175Window 1223Window
1176rxvt_term::parent () 1224rxvt_term::parent ()
1177 CODE: 1225 CODE:
1178 RETVAL = THIS->parent [0]; 1226 RETVAL = THIS->parent [0];
1179 OUTPUT: 1227 OUTPUT:
… …
1233 1281
1234 line_t &l = ROW(row_number); 1282 line_t &l = ROW(row_number);
1235 1283
1236 if (GIMME_V != G_VOID) 1284 if (GIMME_V != G_VOID)
1237 { 1285 {
1238 wchar_t *wstr = new wchar_t [THIS->ncol]; 1286 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1239 1287
1240 for (int col = 0; col < THIS->ncol; col++) 1288 for (int col = 0; col < THIS->ncol; col++)
1241 wstr [col] = l.t [col]; 1289 wstr [col] = l.t [col];
1242 1290
1243 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1291 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1244
1245 delete [] wstr;
1246 } 1292 }
1247 1293
1248 if (new_text) 1294 if (new_text)
1249 { 1295 {
1250 wchar_t *wstr = sv2wcs (new_text); 1296 wchar_t *wstr = sv2wcs (new_text);
… …
1343rxvt_term::special_encode (SV *string) 1389rxvt_term::special_encode (SV *string)
1344 CODE: 1390 CODE:
1345{ 1391{
1346 wchar_t *wstr = sv2wcs (string); 1392 wchar_t *wstr = sv2wcs (string);
1347 int wlen = wcslen (wstr); 1393 int wlen = wcslen (wstr);
1348 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1394 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1349 1395
1350 rxvt_push_locale (THIS->locale); 1396 rxvt_push_locale (THIS->locale);
1351 1397
1352 wchar_t *r = rstr; 1398 wchar_t *r = rstr;
1353 for (wchar_t *s = wstr; *s; s++) 1399 for (wchar_t *s = wstr; *s; s++)
1400 {
1401 int w = WCWIDTH (*s);
1402
1354 if (wcwidth (*s) == 0) 1403 if (w == 0)
1355 { 1404 {
1356 if (r == rstr) 1405 if (r == rstr)
1357 croak ("leading combining character unencodable"); 1406 croak ("leading combining character unencodable");
1358 1407
1359 unicode_t n = rxvt_compose (r[-1], *s); 1408 unicode_t n = rxvt_compose (r[-1], *s);
1360 if (n == NOCHAR) 1409 if (n == NOCHAR)
1361 n = rxvt_composite.compose (r[-1], *s); 1410 n = rxvt_composite.compose (r[-1], *s);
1362 1411
1363 r[-1] = n; 1412 r[-1] = n;
1364 } 1413 }
1365#if !UNICODE_3 1414#if !UNICODE_3
1366 else if (*s >= 0x10000) 1415 else if (*s >= 0x10000)
1367 *r++ = rxvt_composite.compose (*s); 1416 *r++ = rxvt_composite.compose (*s);
1368#endif 1417#endif
1369 else 1418 else
1370 *r++ = *s; 1419 *r++ = *s;
1420
1421 // the *2 above only allows wcwidth <= 2
1422 if (w > 1)
1423 *r++ = NOCHAR;
1424 }
1371 1425
1372 rxvt_pop_locale (); 1426 rxvt_pop_locale ();
1373 1427
1374 RETVAL = wcs2sv (rstr, r - rstr); 1428 RETVAL = wcs2sv (rstr, r - rstr);
1375
1376 delete [] rstr;
1377} 1429}
1378 OUTPUT: 1430 OUTPUT:
1379 RETVAL 1431 RETVAL
1380 1432
1381SV * 1433SV *
… …
1393 else if (IS_COMPOSE (*s)) 1445 else if (IS_COMPOSE (*s))
1394 dlen += rxvt_composite.expand (*s, 0); 1446 dlen += rxvt_composite.expand (*s, 0);
1395 else 1447 else
1396 dlen++; 1448 dlen++;
1397 1449
1398 wchar_t *rstr = new wchar_t [dlen]; 1450 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1399 1451
1400 // decode 1452 // decode
1401 wchar_t *r = rstr; 1453 wchar_t *r = rstr;
1402 for (wchar_t *s = wstr; *s; s++) 1454 for (wchar_t *s = wstr; *s; s++)
1403 if (*s == NOCHAR) 1455 if (*s == NOCHAR)
… …
1406 r += rxvt_composite.expand (*s, r); 1458 r += rxvt_composite.expand (*s, r);
1407 else 1459 else
1408 *r++ = *s; 1460 *r++ = *s;
1409 1461
1410 RETVAL = wcs2sv (rstr, r - rstr); 1462 RETVAL = wcs2sv (rstr, r - rstr);
1411
1412 delete [] rstr;
1413} 1463}
1414 OUTPUT: 1464 OUTPUT:
1415 RETVAL 1465 RETVAL
1416 1466
1417void 1467void
… …
1527 if (items == 3) 1577 if (items == 3)
1528 { 1578 {
1529 rc.row = SvIV (ST (1)); 1579 rc.row = SvIV (ST (1));
1530 rc.col = SvIV (ST (2)); 1580 rc.col = SvIV (ST (2));
1531 1581
1532 if (ix == 2 && rc.col == 0) 1582 if (ix == 2)
1533 { 1583 {
1584 if (rc.col == 0)
1585 {
1586 // col == 0 means end of previous line
1534 rc.row--; 1587 rc.row--;
1535 rc.col = THIS->ncol; 1588 rc.col = THIS->ncol;
1589 }
1590 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1591 && rc.col > ROW(rc.row).l)
1592 {
1593 // col >= length means while line and add newline
1594 rc.col = THIS->ncol;
1595 }
1536 } 1596 }
1537 1597
1538 clamp_it (rc.col, 0, THIS->ncol); 1598 clamp_it (rc.col, 0, THIS->ncol);
1539 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1599 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1540 1600
… …
1587void 1647void
1588rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1648rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1589 1649
1590void 1650void
1591rxvt_term::scr_bell () 1651rxvt_term::scr_bell ()
1652
1653void
1654rxvt_term::scr_change_screen (int screen)
1592 1655
1593void 1656void
1594rxvt_term::scr_add_lines (SV *string) 1657rxvt_term::scr_add_lines (SV *string)
1595 CODE: 1658 CODE:
1596{ 1659{

Diff Legend

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