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.79 by root, Fri Jan 20 10:27:08 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
… …
638 setiv (height, xe->xconfigure.height); 638 setiv (height, xe->xconfigure.height);
639 setuv (above, xe->xconfigure.above); 639 setuv (above, xe->xconfigure.above);
640 break; 640 break;
641 } 641 }
642 642
643 break;
644
645 case PropertyNotify:
646 setuv (window, xe->xproperty.window);
647 setuv (atom, xe->xproperty.atom);
648 setuv (time, xe->xproperty.time);
649 setiv (state, xe->xproperty.state);
650 break;
651
652 case ClientMessage:
653 setuv (window, xe->xclient.window);
654 setuv (message_type, xe->xclient.message_type);
655 setuv (format, xe->xclient.format);
656 setuv (l0, xe->xclient.data.l[0]);
657 setuv (l1, xe->xclient.data.l[1]);
658 setuv (l2, xe->xclient.data.l[2]);
659 setuv (l3, xe->xclient.data.l[3]);
660 setuv (l4, xe->xclient.data.l[4]);
643 break; 661 break;
644 } 662 }
645 663
646 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 664 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
647 } 665 }
… …
910 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)
911 croak ("first argument to urxvt::term->_new must be arrayref"); 929 croak ("first argument to urxvt::term->_new must be arrayref");
912 930
913 rxvt_term *term = new rxvt_term; 931 rxvt_term *term = new rxvt_term;
914 932
915 term->argv = new stringvec; 933 stringvec *argv = new stringvec;
916 term->envv = new stringvec; 934 stringvec *envv = new stringvec;
917 935
918 for (int i = 1; i < items; i++) 936 for (int i = 1; i < items; i++)
919 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 937 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
920 938
921 AV *envv = (AV *)SvRV (ST (0)); 939 AV *env = (AV *)SvRV (ST (0));
922 for (int i = AvFILL (envv) + 1; i--; ) 940 for (int i = AvFILL (env) + 1; i--; )
923 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 941 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
924 942
925 term->envv->push_back (0); 943 envv->push_back (0);
926 944
927 bool success; 945 bool success;
928 946
929 try 947 try
930 { 948 {
931 success = term->init (term->argv->size (), term->argv->begin ()); 949 success = term->init (argv, envv);
932 } 950 }
933 catch (const class rxvt_failure_exception &e) 951 catch (const class rxvt_failure_exception &e)
934 { 952 {
935 success = false; 953 success = false;
936 } 954 }
… …
1063#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1081#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1064#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1082#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1065#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1083#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1066#define TERM_OFFSET_focus TERM_OFFSET(focus) 1084#define TERM_OFFSET_focus TERM_OFFSET(focus)
1067#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1085#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1086#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1087#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1088#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1068#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1089#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1069#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1090#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1070#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1091#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1071 1092
1072int 1093int
… …
1079 fbase = TERM_OFFSET_fbase 1100 fbase = TERM_OFFSET_fbase
1080 nrow = TERM_OFFSET_nrow 1101 nrow = TERM_OFFSET_nrow
1081 ncol = TERM_OFFSET_ncol 1102 ncol = TERM_OFFSET_ncol
1082 focus = TERM_OFFSET_focus 1103 focus = TERM_OFFSET_focus
1083 mapped = TERM_OFFSET_mapped 1104 mapped = TERM_OFFSET_mapped
1105 int_bwidth = TERM_OFFSET_int_bwidth
1106 ext_bwidth = TERM_OFFSET_ext_bwidth
1107 lineSpace = TERM_OFFSET_lineSpace
1084 saveLines = TERM_OFFSET_saveLines 1108 saveLines = TERM_OFFSET_saveLines
1085 total_rows = TERM_OFFSET_total_rows 1109 total_rows = TERM_OFFSET_total_rows
1086 top_row = TERM_OFFSET_top_row 1110 top_row = TERM_OFFSET_top_row
1087 CODE: 1111 CODE:
1088 RETVAL = *(int *)((char *)THIS + ix); 1112 RETVAL = *(int *)((char *)THIS + ix);
… …
1093rxvt_term::ModLevel3Mask () 1117rxvt_term::ModLevel3Mask ()
1094 ALIAS: 1118 ALIAS:
1095 ModLevel3Mask = 0 1119 ModLevel3Mask = 0
1096 ModMetaMask = 1 1120 ModMetaMask = 1
1097 ModNumLockMask = 2 1121 ModNumLockMask = 2
1122 current_screen = 3
1123 hidden_cursor = 4
1098 CODE: 1124 CODE:
1099 switch (ix) 1125 switch (ix)
1100 { 1126 {
1101 case 0: RETVAL = THIS->ModLevel3Mask; break; 1127 case 0: RETVAL = THIS->ModLevel3Mask; break;
1102 case 1: RETVAL = THIS->ModMetaMask; break; 1128 case 1: RETVAL = THIS->ModMetaMask; break;
1103 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;
1104 } 1132 }
1105 OUTPUT: 1133 OUTPUT:
1106 RETVAL 1134 RETVAL
1107 1135
1108char * 1136char *
… …
1188} 1216}
1189 OUTPUT: 1217 OUTPUT:
1190 RETVAL 1218 RETVAL
1191 1219
1192void 1220void
1221rxvt_term::focus_in ()
1222
1223void
1224rxvt_term::focus_out ()
1225
1226void
1193rxvt_term::want_refresh () 1227rxvt_term::want_refresh ()
1194 CODE: 1228 CODE:
1195 THIS->want_refresh = 1; 1229 THIS->want_refresh = 1;
1196 1230
1197void 1231void
… …
1219 { 1253 {
1220 wchar_t *wstr = sv2wcs (new_text); 1254 wchar_t *wstr = sv2wcs (new_text);
1221 1255
1222 int len = min (wcslen (wstr) - start_ofs, max_len); 1256 int len = min (wcslen (wstr) - start_ofs, max_len);
1223 1257
1224 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1258 if (start_col < 0 || start_col + len > THIS->ncol)
1225 { 1259 {
1226 free (wstr); 1260 free (wstr);
1227 croak ("new_text extends beyond horizontal margins"); 1261 croak ("new_text extends beyond horizontal margins");
1228 } 1262 }
1229 1263
… …
1263 croak ("new_rend must be arrayref"); 1297 croak ("new_rend must be arrayref");
1264 1298
1265 AV *av = (AV *)SvRV (new_rend); 1299 AV *av = (AV *)SvRV (new_rend);
1266 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1300 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1267 1301
1268 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1302 if (start_col < 0 || start_col + len > THIS->ncol)
1269 croak ("new_rend array extends beyond horizontal margins"); 1303 croak ("new_rend array extends beyond horizontal margins");
1270 1304
1271 for (int col = start_col; col < start_col + len; col++) 1305 for (int col = start_col; col < start_col + len; col++)
1272 { 1306 {
1273 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1307 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1497 if (items == 3) 1531 if (items == 3)
1498 { 1532 {
1499 rc.row = SvIV (ST (1)); 1533 rc.row = SvIV (ST (1));
1500 rc.col = SvIV (ST (2)); 1534 rc.col = SvIV (ST (2));
1501 1535
1502 if (ix == 2 && rc.col == 0) 1536 if (ix == 2)
1503 { 1537 {
1538 if (rc.col == 0)
1539 {
1540 // col == 0 means end of previous line
1504 rc.row--; 1541 rc.row--;
1505 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 }
1506 } 1550 }
1507 1551
1508 clamp_it (rc.col, 0, THIS->ncol); 1552 clamp_it (rc.col, 0, THIS->ncol);
1509 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1553 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1510 1554
… …
1557void 1601void
1558rxvt_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)
1559 1603
1560void 1604void
1561rxvt_term::scr_bell () 1605rxvt_term::scr_bell ()
1606
1607void
1608rxvt_term::scr_change_screen (int screen)
1562 1609
1563void 1610void
1564rxvt_term::scr_add_lines (SV *string) 1611rxvt_term::scr_add_lines (SV *string)
1565 CODE: 1612 CODE:
1566{ 1613{
… …
1634 Atom type; 1681 Atom type;
1635 int format; 1682 int format;
1636 unsigned long nitems; 1683 unsigned long nitems;
1637 unsigned long bytes_after; 1684 unsigned long bytes_after;
1638 unsigned char *prop; 1685 unsigned char *prop;
1686
1639 XGetWindowProperty (THIS->display->display, window, property, 1687 XGetWindowProperty (THIS->display->display, window, property,
1640 0, 1<<30, 0, AnyPropertyType, 1688 0, 1<<24, 0, AnyPropertyType,
1641 &type, &format, &nitems, &bytes_after, &prop); 1689 &type, &format, &nitems, &bytes_after, &prop);
1690
1642 if (type != None) 1691 if (type != None)
1643 { 1692 {
1693 int elemsize = format == 16 ? sizeof (short)
1694 : format == 32 ? sizeof (long)
1695 : 1;
1696
1644 EXTEND (SP, 3); 1697 EXTEND (SP, 3);
1645 PUSHs (newSVuv ((U32)type)); 1698 PUSHs (newSVuv ((U32)type));
1646 PUSHs (newSViv (format)); 1699 PUSHs (newSViv (format));
1647 PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); 1700 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1648 XFree (prop); 1701 XFree (prop);
1649 } 1702 }
1650} 1703}
1651 1704
1652void 1705void
… …
1654 CODE: 1707 CODE:
1655{ 1708{
1656 STRLEN len; 1709 STRLEN len;
1657 char *data_ = SvPVbyte (data, len); 1710 char *data_ = SvPVbyte (data, len);
1658 1711
1712 int elemsize = format == 16 ? sizeof (short)
1713 : format == 32 ? sizeof (long)
1714 : 1;
1715
1659 XChangeProperty (THIS->display->display, window, property, 1716 XChangeProperty (THIS->display->display, window, property,
1660 type, format, PropModeReplace, 1717 type, format, PropModeReplace,
1661 (unsigned char *)data, len * 8 / format); 1718 (unsigned char *)data_, len / elemsize);
1719 XSync (THIS->display->display, 0);
1662} 1720}
1721
1722Atom
1723XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1724 C_ARGS: term->display->display, atom_name, only_if_exists
1725
1726char *
1727XGetAtomName (rxvt_term *term, Atom atom)
1728 C_ARGS: term->display->display, atom
1729 CLEANUP:
1730 XFree (RETVAL);
1663 1731
1664void 1732void
1665XDeleteProperty (rxvt_term *term, Window window, Atom property) 1733XDeleteProperty (rxvt_term *term, Window window, Atom property)
1666 C_ARGS: term->display->display, window, property 1734 C_ARGS: term->display->display, window, property
1667 1735
… …
1669rxvt_term::DefaultRootWindow () 1737rxvt_term::DefaultRootWindow ()
1670 CODE: 1738 CODE:
1671 RETVAL = THIS->display->root; 1739 RETVAL = THIS->display->root;
1672 OUTPUT: 1740 OUTPUT:
1673 RETVAL 1741 RETVAL
1742
1743#if 0
1674 1744
1675Window 1745Window
1676XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1746XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1677 C_ARGS: term->display->display, (Window)parent, 1747 C_ARGS: term->display->display, (Window)parent,
1678 x, y, width, height, 0, 1748 x, y, width, height, 0,
1679 term->pix_colors_focused[Color_border], 1749 term->pix_colors_focused[Color_border],
1680 term->pix_colors_focused[Color_border] 1750 term->pix_colors_focused[Color_border]
1681 1751
1752#endif
1753
1682void 1754void
1683XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1755XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1684 C_ARGS: term->display->display, window, parent, x, y 1756 C_ARGS: term->display->display, window, parent, x, y
1685 1757
1686void 1758void
… …
1691XUnmapWindow (rxvt_term *term, Window window) 1763XUnmapWindow (rxvt_term *term, Window window)
1692 C_ARGS: term->display->display, window 1764 C_ARGS: term->display->display, window
1693 1765
1694void 1766void
1695XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1767XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1696 C_ARGS: term->display->display, (Window)window, x, y, width, height 1768 C_ARGS: term->display->display, window, x, y, width, height
1769
1770void
1771rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1772 CODE:
1773{
1774 XWindowAttributes attr;
1775 XGetWindowAttributes (THIS->display->display, window, &attr);
1776 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1777}
1778
1779void
1780rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1781 PPCODE:
1782{
1783 int dx, dy;
1784 Window child;
1785
1786 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1787 {
1788 EXTEND (SP, 3);
1789 PUSHs (newSViv (dx));
1790 PUSHs (newSViv (dy));
1791 PUSHs (newSVuv (child));
1792 }
1793}
1697 1794
1698############################################################################# 1795#############################################################################
1699# urxvt::overlay 1796# urxvt::overlay
1700############################################################################# 1797#############################################################################
1701 1798
… …
1847 w->self = (HV *)SvRV (RETVAL); 1944 w->self = (HV *)SvRV (RETVAL);
1848 OUTPUT: 1945 OUTPUT:
1849 RETVAL 1946 RETVAL
1850 1947
1851CHAINED 1948CHAINED
1852iow::start () 1949iw::start ()
1853 CODE: 1950 CODE:
1854 THIS->start (); 1951 THIS->start ();
1855 OUTPUT: 1952 OUTPUT:
1856 RETVAL 1953 RETVAL
1857 1954
1858CHAINED 1955CHAINED
1859iow::stop () 1956iw::stop ()
1860 CODE: 1957 CODE:
1861 THIS->stop (); 1958 THIS->stop ();
1862 OUTPUT: 1959 OUTPUT:
1863 RETVAL 1960 RETVAL
1864 1961
… …
1886 THIS->start (pid); 1983 THIS->start (pid);
1887 OUTPUT: 1984 OUTPUT:
1888 RETVAL 1985 RETVAL
1889 1986
1890CHAINED 1987CHAINED
1891iow::stop () 1988pw::stop ()
1892 CODE: 1989 CODE:
1893 THIS->stop (); 1990 THIS->stop ();
1894 OUTPUT: 1991 OUTPUT:
1895 RETVAL 1992 RETVAL
1896 1993

Diff Legend

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