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.80 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.86 by root, Fri Jan 20 22:49:34 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
… …
640 break; 640 break;
641 } 641 }
642 642
643 break; 643 break;
644 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
645 case ClientMessage: 652 case ClientMessage:
646 setuv (window, xe->xclient.window); 653 setuv (window, xe->xclient.window);
647 setuv (message_type, xe->xclient.message_type); 654 setuv (message_type, xe->xclient.message_type);
648 setuv (format, xe->xclient.format); 655 setuv (format, xe->xclient.format);
649 setuv (l0, xe->xclient.data.l[0]); 656 setuv (l0, xe->xclient.data.l[0]);
650 setuv (l1, xe->xclient.data.l[1]); 657 setuv (l1, xe->xclient.data.l[1]);
651 setuv (l2, xe->xclient.data.l[2]); 658 setuv (l2, xe->xclient.data.l[2]);
652 setuv (l3, xe->xclient.data.l[3]); 659 setuv (l3, xe->xclient.data.l[3]);
653 setuv (l4, xe->xclient.data.l[4]); 660 setuv (l4, xe->xclient.data.l[4]);
661 break;
654 } 662 }
655 663
656 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 664 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
657 } 665 }
658 break; 666 break;
… …
1109rxvt_term::ModLevel3Mask () 1117rxvt_term::ModLevel3Mask ()
1110 ALIAS: 1118 ALIAS:
1111 ModLevel3Mask = 0 1119 ModLevel3Mask = 0
1112 ModMetaMask = 1 1120 ModMetaMask = 1
1113 ModNumLockMask = 2 1121 ModNumLockMask = 2
1122 current_screen = 3
1114 CODE: 1123 CODE:
1115 switch (ix) 1124 switch (ix)
1116 { 1125 {
1117 case 0: RETVAL = THIS->ModLevel3Mask; break; 1126 case 0: RETVAL = THIS->ModLevel3Mask; break;
1118 case 1: RETVAL = THIS->ModMetaMask; break; 1127 case 1: RETVAL = THIS->ModMetaMask; break;
1119 case 2: RETVAL = THIS->ModNumLockMask; break; 1128 case 2: RETVAL = THIS->ModNumLockMask; break;
1129 case 3: RETVAL = THIS->current_screen; break;
1120 } 1130 }
1121 OUTPUT: 1131 OUTPUT:
1122 RETVAL 1132 RETVAL
1123 1133
1124char * 1134char *
… …
1204} 1214}
1205 OUTPUT: 1215 OUTPUT:
1206 RETVAL 1216 RETVAL
1207 1217
1208void 1218void
1219rxvt_term::focus_in ()
1220
1221void
1222rxvt_term::focus_out ()
1223
1224void
1209rxvt_term::want_refresh () 1225rxvt_term::want_refresh ()
1210 CODE: 1226 CODE:
1211 THIS->want_refresh = 1; 1227 THIS->want_refresh = 1;
1212 1228
1213void 1229void
… …
1235 { 1251 {
1236 wchar_t *wstr = sv2wcs (new_text); 1252 wchar_t *wstr = sv2wcs (new_text);
1237 1253
1238 int len = min (wcslen (wstr) - start_ofs, max_len); 1254 int len = min (wcslen (wstr) - start_ofs, max_len);
1239 1255
1240 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1256 if (start_col < 0 || start_col + len > THIS->ncol)
1241 { 1257 {
1242 free (wstr); 1258 free (wstr);
1243 croak ("new_text extends beyond horizontal margins"); 1259 croak ("new_text extends beyond horizontal margins");
1244 } 1260 }
1245 1261
… …
1279 croak ("new_rend must be arrayref"); 1295 croak ("new_rend must be arrayref");
1280 1296
1281 AV *av = (AV *)SvRV (new_rend); 1297 AV *av = (AV *)SvRV (new_rend);
1282 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1298 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1283 1299
1284 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1300 if (start_col < 0 || start_col + len > THIS->ncol)
1285 croak ("new_rend array extends beyond horizontal margins"); 1301 croak ("new_rend array extends beyond horizontal margins");
1286 1302
1287 for (int col = start_col; col < start_col + len; col++) 1303 for (int col = start_col; col < start_col + len; col++)
1288 { 1304 {
1289 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1305 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1575 1591
1576void 1592void
1577rxvt_term::scr_bell () 1593rxvt_term::scr_bell ()
1578 1594
1579void 1595void
1596rxvt_term::scr_change_screen (int screen)
1597
1598void
1580rxvt_term::scr_add_lines (SV *string) 1599rxvt_term::scr_add_lines (SV *string)
1581 CODE: 1600 CODE:
1582{ 1601{
1583 wchar_t *wstr = sv2wcs (string); 1602 wchar_t *wstr = sv2wcs (string);
1584 THIS->scr_add_lines (wstr, wcslen (wstr)); 1603 THIS->scr_add_lines (wstr, wcslen (wstr));
… …
1650 Atom type; 1669 Atom type;
1651 int format; 1670 int format;
1652 unsigned long nitems; 1671 unsigned long nitems;
1653 unsigned long bytes_after; 1672 unsigned long bytes_after;
1654 unsigned char *prop; 1673 unsigned char *prop;
1674
1655 XGetWindowProperty (THIS->display->display, window, property, 1675 XGetWindowProperty (THIS->display->display, window, property,
1656 0, 1<<30, 0, AnyPropertyType, 1676 0, 1<<24, 0, AnyPropertyType,
1657 &type, &format, &nitems, &bytes_after, &prop); 1677 &type, &format, &nitems, &bytes_after, &prop);
1678
1658 if (type != None) 1679 if (type != None)
1659 { 1680 {
1681 int elemsize = format == 16 ? sizeof (short)
1682 : format == 32 ? sizeof (long)
1683 : 1;
1684
1660 EXTEND (SP, 3); 1685 EXTEND (SP, 3);
1661 PUSHs (newSVuv ((U32)type)); 1686 PUSHs (newSVuv ((U32)type));
1662 PUSHs (newSViv (format)); 1687 PUSHs (newSViv (format));
1663 PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); 1688 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1664 XFree (prop); 1689 XFree (prop);
1665 } 1690 }
1666} 1691}
1667 1692
1668void 1693void
… …
1670 CODE: 1695 CODE:
1671{ 1696{
1672 STRLEN len; 1697 STRLEN len;
1673 char *data_ = SvPVbyte (data, len); 1698 char *data_ = SvPVbyte (data, len);
1674 1699
1700 int elemsize = format == 16 ? sizeof (short)
1701 : format == 32 ? sizeof (long)
1702 : 1;
1703
1675 XChangeProperty (THIS->display->display, window, property, 1704 XChangeProperty (THIS->display->display, window, property,
1676 type, format, PropModeReplace, 1705 type, format, PropModeReplace,
1677 (unsigned char *)data, len * 8 / format); 1706 (unsigned char *)data_, len / elemsize);
1707 XSync (THIS->display->display, 0);
1678} 1708}
1709
1710Atom
1711XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1712 C_ARGS: term->display->display, atom_name, only_if_exists
1713
1714char *
1715XGetAtomName (rxvt_term *term, Atom atom)
1716 C_ARGS: term->display->display, atom
1717 CLEANUP:
1718 XFree (RETVAL);
1679 1719
1680void 1720void
1681XDeleteProperty (rxvt_term *term, Window window, Atom property) 1721XDeleteProperty (rxvt_term *term, Window window, Atom property)
1682 C_ARGS: term->display->display, window, property 1722 C_ARGS: term->display->display, window, property
1683 1723
… …
1685rxvt_term::DefaultRootWindow () 1725rxvt_term::DefaultRootWindow ()
1686 CODE: 1726 CODE:
1687 RETVAL = THIS->display->root; 1727 RETVAL = THIS->display->root;
1688 OUTPUT: 1728 OUTPUT:
1689 RETVAL 1729 RETVAL
1730
1731#if 0
1690 1732
1691Window 1733Window
1692XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1734XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1693 C_ARGS: term->display->display, (Window)parent, 1735 C_ARGS: term->display->display, (Window)parent,
1694 x, y, width, height, 0, 1736 x, y, width, height, 0,
1695 term->pix_colors_focused[Color_border], 1737 term->pix_colors_focused[Color_border],
1696 term->pix_colors_focused[Color_border] 1738 term->pix_colors_focused[Color_border]
1697 1739
1740#endif
1741
1698void 1742void
1699XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1743XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1700 C_ARGS: term->display->display, window, parent, x, y 1744 C_ARGS: term->display->display, window, parent, x, y
1701 1745
1702void 1746void
… …
1707XUnmapWindow (rxvt_term *term, Window window) 1751XUnmapWindow (rxvt_term *term, Window window)
1708 C_ARGS: term->display->display, window 1752 C_ARGS: term->display->display, window
1709 1753
1710void 1754void
1711XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1755XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1712 C_ARGS: term->display->display, (Window)window, x, y, width, height 1756 C_ARGS: term->display->display, window, x, y, width, height
1757
1758void
1759rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1760 CODE:
1761{
1762 XWindowAttributes attr;
1763 XGetWindowAttributes (THIS->display->display, window, &attr);
1764 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1765}
1766
1767void
1768rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1769 PPCODE:
1770{
1771 int dx, dy;
1772 Window child;
1773
1774 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1775 {
1776 EXTEND (SP, 3);
1777 PUSHs (newSViv (dx));
1778 PUSHs (newSViv (dy));
1779 PUSHs (newSVuv (child));
1780 }
1781}
1713 1782
1714############################################################################# 1783#############################################################################
1715# urxvt::overlay 1784# urxvt::overlay
1716############################################################################# 1785#############################################################################
1717 1786

Diff Legend

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