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.89 by root, Sun Jan 22 11:57:06 2006 UTC

… …
596 setuv (root, xe->xmotion.root); 596 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 597 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 598 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 599 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 600 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight); 601 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 602 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 603 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 604 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 605 setuv (state, xe->xmotion.state);
606 606
… …
928 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 928 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
929 croak ("first argument to urxvt::term->_new must be arrayref"); 929 croak ("first argument to urxvt::term->_new must be arrayref");
930 930
931 rxvt_term *term = new rxvt_term; 931 rxvt_term *term = new rxvt_term;
932 932
933 term->argv = new stringvec; 933 stringvec *argv = new stringvec;
934 term->envv = new stringvec; 934 stringvec *envv = new stringvec;
935 935
936 for (int i = 1; i < items; i++) 936 for (int i = 1; i < items; i++)
937 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 937 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
938 938
939 AV *envv = (AV *)SvRV (ST (0)); 939 AV *env = (AV *)SvRV (ST (0));
940 for (int i = AvFILL (envv) + 1; i--; ) 940 for (int i = AvFILL (env) + 1; i--; )
941 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 941 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
942 942
943 term->envv->push_back (0); 943 envv->push_back (0);
944 944
945 bool success; 945 bool success;
946 946
947 try 947 try
948 { 948 {
949 success = term->init (term->argv->size (), term->argv->begin ()); 949 success = term->init (argv, envv);
950 } 950 }
951 catch (const class rxvt_failure_exception &e) 951 catch (const class rxvt_failure_exception &e)
952 { 952 {
953 success = false; 953 success = false;
954 } 954 }
… …
1117rxvt_term::ModLevel3Mask () 1117rxvt_term::ModLevel3Mask ()
1118 ALIAS: 1118 ALIAS:
1119 ModLevel3Mask = 0 1119 ModLevel3Mask = 0
1120 ModMetaMask = 1 1120 ModMetaMask = 1
1121 ModNumLockMask = 2 1121 ModNumLockMask = 2
1122 current_screen = 3
1123 hidden_cursor = 4
1122 CODE: 1124 CODE:
1123 switch (ix) 1125 switch (ix)
1124 { 1126 {
1125 case 0: RETVAL = THIS->ModLevel3Mask; break; 1127 case 0: RETVAL = THIS->ModLevel3Mask; break;
1126 case 1: RETVAL = THIS->ModMetaMask; break; 1128 case 1: RETVAL = THIS->ModMetaMask; break;
1127 case 2: RETVAL = THIS->ModNumLockMask; break; 1129 case 2: RETVAL = THIS->ModNumLockMask; break;
1130 case 3: RETVAL = THIS->current_screen; break;
1131 case 4: RETVAL = THIS->hidden_cursor; break;
1128 } 1132 }
1129 OUTPUT: 1133 OUTPUT:
1130 RETVAL 1134 RETVAL
1131 1135
1132char * 1136char *
… …
1527 if (items == 3) 1531 if (items == 3)
1528 { 1532 {
1529 rc.row = SvIV (ST (1)); 1533 rc.row = SvIV (ST (1));
1530 rc.col = SvIV (ST (2)); 1534 rc.col = SvIV (ST (2));
1531 1535
1532 if (ix == 2 && rc.col == 0) 1536 if (ix == 2)
1533 { 1537 {
1538 if (rc.col == 0)
1539 {
1540 // col == 0 means end of previous line
1534 rc.row--; 1541 rc.row--;
1535 rc.col = THIS->ncol; 1542 rc.col = THIS->ncol;
1543 }
1544 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1545 && rc.col > ROW(rc.row).l)
1546 {
1547 // col >= length means while line and add newline
1548 rc.col = THIS->ncol;
1549 }
1536 } 1550 }
1537 1551
1538 clamp_it (rc.col, 0, THIS->ncol); 1552 clamp_it (rc.col, 0, THIS->ncol);
1539 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1553 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1540 1554
… …
1587void 1601void
1588rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1602rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1589 1603
1590void 1604void
1591rxvt_term::scr_bell () 1605rxvt_term::scr_bell ()
1606
1607void
1608rxvt_term::scr_change_screen (int screen)
1592 1609
1593void 1610void
1594rxvt_term::scr_add_lines (SV *string) 1611rxvt_term::scr_add_lines (SV *string)
1595 CODE: 1612 CODE:
1596{ 1613{

Diff Legend

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