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.85 by root, Fri Jan 20 22:05:41 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 }
… …
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);
… …
1188} 1212}
1189 OUTPUT: 1213 OUTPUT:
1190 RETVAL 1214 RETVAL
1191 1215
1192void 1216void
1217rxvt_term::focus_in ()
1218
1219void
1220rxvt_term::focus_out ()
1221
1222void
1193rxvt_term::want_refresh () 1223rxvt_term::want_refresh ()
1194 CODE: 1224 CODE:
1195 THIS->want_refresh = 1; 1225 THIS->want_refresh = 1;
1196 1226
1197void 1227void
… …
1219 { 1249 {
1220 wchar_t *wstr = sv2wcs (new_text); 1250 wchar_t *wstr = sv2wcs (new_text);
1221 1251
1222 int len = min (wcslen (wstr) - start_ofs, max_len); 1252 int len = min (wcslen (wstr) - start_ofs, max_len);
1223 1253
1224 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1254 if (start_col < 0 || start_col + len > THIS->ncol)
1225 { 1255 {
1226 free (wstr); 1256 free (wstr);
1227 croak ("new_text extends beyond horizontal margins"); 1257 croak ("new_text extends beyond horizontal margins");
1228 } 1258 }
1229 1259
… …
1263 croak ("new_rend must be arrayref"); 1293 croak ("new_rend must be arrayref");
1264 1294
1265 AV *av = (AV *)SvRV (new_rend); 1295 AV *av = (AV *)SvRV (new_rend);
1266 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1296 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1267 1297
1268 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1298 if (start_col < 0 || start_col + len > THIS->ncol)
1269 croak ("new_rend array extends beyond horizontal margins"); 1299 croak ("new_rend array extends beyond horizontal margins");
1270 1300
1271 for (int col = start_col; col < start_col + len; col++) 1301 for (int col = start_col; col < start_col + len; col++)
1272 { 1302 {
1273 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1303 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1634 Atom type; 1664 Atom type;
1635 int format; 1665 int format;
1636 unsigned long nitems; 1666 unsigned long nitems;
1637 unsigned long bytes_after; 1667 unsigned long bytes_after;
1638 unsigned char *prop; 1668 unsigned char *prop;
1669
1639 XGetWindowProperty (THIS->display->display, window, property, 1670 XGetWindowProperty (THIS->display->display, window, property,
1640 0, 1<<30, 0, AnyPropertyType, 1671 0, 1<<24, 0, AnyPropertyType,
1641 &type, &format, &nitems, &bytes_after, &prop); 1672 &type, &format, &nitems, &bytes_after, &prop);
1673
1642 if (type != None) 1674 if (type != None)
1643 { 1675 {
1676 int elemsize = format == 16 ? sizeof (short)
1677 : format == 32 ? sizeof (long)
1678 : 1;
1679
1644 EXTEND (SP, 3); 1680 EXTEND (SP, 3);
1645 PUSHs (newSVuv ((U32)type)); 1681 PUSHs (newSVuv ((U32)type));
1646 PUSHs (newSViv (format)); 1682 PUSHs (newSViv (format));
1647 PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); 1683 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1648 XFree (prop); 1684 XFree (prop);
1649 } 1685 }
1650} 1686}
1651 1687
1652void 1688void
… …
1654 CODE: 1690 CODE:
1655{ 1691{
1656 STRLEN len; 1692 STRLEN len;
1657 char *data_ = SvPVbyte (data, len); 1693 char *data_ = SvPVbyte (data, len);
1658 1694
1695 int elemsize = format == 16 ? sizeof (short)
1696 : format == 32 ? sizeof (long)
1697 : 1;
1698
1659 XChangeProperty (THIS->display->display, window, property, 1699 XChangeProperty (THIS->display->display, window, property,
1660 type, format, PropModeReplace, 1700 type, format, PropModeReplace,
1661 (unsigned char *)data, len * 8 / format); 1701 (unsigned char *)data_, len / elemsize);
1702 XSync (THIS->display->display, 0);
1662} 1703}
1704
1705Atom
1706XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1707 C_ARGS: term->display->display, atom_name, only_if_exists
1708
1709char *
1710XGetAtomName (rxvt_term *term, Atom atom)
1711 C_ARGS: term->display->display, atom
1712 CLEANUP:
1713 XFree (RETVAL);
1663 1714
1664void 1715void
1665XDeleteProperty (rxvt_term *term, Window window, Atom property) 1716XDeleteProperty (rxvt_term *term, Window window, Atom property)
1666 C_ARGS: term->display->display, window, property 1717 C_ARGS: term->display->display, window, property
1667 1718
… …
1669rxvt_term::DefaultRootWindow () 1720rxvt_term::DefaultRootWindow ()
1670 CODE: 1721 CODE:
1671 RETVAL = THIS->display->root; 1722 RETVAL = THIS->display->root;
1672 OUTPUT: 1723 OUTPUT:
1673 RETVAL 1724 RETVAL
1725
1726#if 0
1674 1727
1675Window 1728Window
1676XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1729XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1677 C_ARGS: term->display->display, (Window)parent, 1730 C_ARGS: term->display->display, (Window)parent,
1678 x, y, width, height, 0, 1731 x, y, width, height, 0,
1679 term->pix_colors_focused[Color_border], 1732 term->pix_colors_focused[Color_border],
1680 term->pix_colors_focused[Color_border] 1733 term->pix_colors_focused[Color_border]
1681 1734
1735#endif
1736
1682void 1737void
1683XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1738XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1684 C_ARGS: term->display->display, window, parent, x, y 1739 C_ARGS: term->display->display, window, parent, x, y
1685 1740
1686void 1741void
… …
1691XUnmapWindow (rxvt_term *term, Window window) 1746XUnmapWindow (rxvt_term *term, Window window)
1692 C_ARGS: term->display->display, window 1747 C_ARGS: term->display->display, window
1693 1748
1694void 1749void
1695XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1750XMoveResizeWindow (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 1751 C_ARGS: term->display->display, window, x, y, width, height
1752
1753void
1754rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1755 CODE:
1756{
1757 XWindowAttributes attr;
1758 XGetWindowAttributes (THIS->display->display, window, &attr);
1759 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1760}
1761
1762void
1763rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1764 PPCODE:
1765{
1766 int dx, dy;
1767 Window child;
1768
1769 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1770 {
1771 EXTEND (SP, 3);
1772 PUSHs (newSViv (dx));
1773 PUSHs (newSViv (dy));
1774 PUSHs (newSVuv (child));
1775 }
1776}
1697 1777
1698############################################################################# 1778#############################################################################
1699# urxvt::overlay 1779# urxvt::overlay
1700############################################################################# 1780#############################################################################
1701 1781
… …
1847 w->self = (HV *)SvRV (RETVAL); 1927 w->self = (HV *)SvRV (RETVAL);
1848 OUTPUT: 1928 OUTPUT:
1849 RETVAL 1929 RETVAL
1850 1930
1851CHAINED 1931CHAINED
1852iow::start () 1932iw::start ()
1853 CODE: 1933 CODE:
1854 THIS->start (); 1934 THIS->start ();
1855 OUTPUT: 1935 OUTPUT:
1856 RETVAL 1936 RETVAL
1857 1937
1858CHAINED 1938CHAINED
1859iow::stop () 1939iw::stop ()
1860 CODE: 1940 CODE:
1861 THIS->stop (); 1941 THIS->stop ();
1862 OUTPUT: 1942 OUTPUT:
1863 RETVAL 1943 RETVAL
1864 1944
… …
1886 THIS->start (pid); 1966 THIS->start (pid);
1887 OUTPUT: 1967 OUTPUT:
1888 RETVAL 1968 RETVAL
1889 1969
1890CHAINED 1970CHAINED
1891iow::stop () 1971pw::stop ()
1892 CODE: 1972 CODE:
1893 THIS->stop (); 1973 THIS->stop ();
1894 OUTPUT: 1974 OUTPUT:
1895 RETVAL 1975 RETVAL
1896 1976

Diff Legend

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