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.88 by root, Sun Jan 22 00:36:59 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;
… …
1559 1593
1560void 1594void
1561rxvt_term::scr_bell () 1595rxvt_term::scr_bell ()
1562 1596
1563void 1597void
1598rxvt_term::scr_change_screen (int screen)
1599
1600void
1564rxvt_term::scr_add_lines (SV *string) 1601rxvt_term::scr_add_lines (SV *string)
1565 CODE: 1602 CODE:
1566{ 1603{
1567 wchar_t *wstr = sv2wcs (string); 1604 wchar_t *wstr = sv2wcs (string);
1568 THIS->scr_add_lines (wstr, wcslen (wstr)); 1605 THIS->scr_add_lines (wstr, wcslen (wstr));
… …
1634 Atom type; 1671 Atom type;
1635 int format; 1672 int format;
1636 unsigned long nitems; 1673 unsigned long nitems;
1637 unsigned long bytes_after; 1674 unsigned long bytes_after;
1638 unsigned char *prop; 1675 unsigned char *prop;
1676
1639 XGetWindowProperty (THIS->display->display, window, property, 1677 XGetWindowProperty (THIS->display->display, window, property,
1640 0, 1<<30, 0, AnyPropertyType, 1678 0, 1<<24, 0, AnyPropertyType,
1641 &type, &format, &nitems, &bytes_after, &prop); 1679 &type, &format, &nitems, &bytes_after, &prop);
1680
1642 if (type != None) 1681 if (type != None)
1643 { 1682 {
1683 int elemsize = format == 16 ? sizeof (short)
1684 : format == 32 ? sizeof (long)
1685 : 1;
1686
1644 EXTEND (SP, 3); 1687 EXTEND (SP, 3);
1645 PUSHs (newSVuv ((U32)type)); 1688 PUSHs (newSVuv ((U32)type));
1646 PUSHs (newSViv (format)); 1689 PUSHs (newSViv (format));
1647 PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); 1690 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1648 XFree (prop); 1691 XFree (prop);
1649 } 1692 }
1650} 1693}
1651 1694
1652void 1695void
… …
1654 CODE: 1697 CODE:
1655{ 1698{
1656 STRLEN len; 1699 STRLEN len;
1657 char *data_ = SvPVbyte (data, len); 1700 char *data_ = SvPVbyte (data, len);
1658 1701
1702 int elemsize = format == 16 ? sizeof (short)
1703 : format == 32 ? sizeof (long)
1704 : 1;
1705
1659 XChangeProperty (THIS->display->display, window, property, 1706 XChangeProperty (THIS->display->display, window, property,
1660 type, format, PropModeReplace, 1707 type, format, PropModeReplace,
1661 (unsigned char *)data, len * 8 / format); 1708 (unsigned char *)data_, len / elemsize);
1709 XSync (THIS->display->display, 0);
1662} 1710}
1711
1712Atom
1713XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1714 C_ARGS: term->display->display, atom_name, only_if_exists
1715
1716char *
1717XGetAtomName (rxvt_term *term, Atom atom)
1718 C_ARGS: term->display->display, atom
1719 CLEANUP:
1720 XFree (RETVAL);
1663 1721
1664void 1722void
1665XDeleteProperty (rxvt_term *term, Window window, Atom property) 1723XDeleteProperty (rxvt_term *term, Window window, Atom property)
1666 C_ARGS: term->display->display, window, property 1724 C_ARGS: term->display->display, window, property
1667 1725
… …
1669rxvt_term::DefaultRootWindow () 1727rxvt_term::DefaultRootWindow ()
1670 CODE: 1728 CODE:
1671 RETVAL = THIS->display->root; 1729 RETVAL = THIS->display->root;
1672 OUTPUT: 1730 OUTPUT:
1673 RETVAL 1731 RETVAL
1732
1733#if 0
1674 1734
1675Window 1735Window
1676XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1736XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1677 C_ARGS: term->display->display, (Window)parent, 1737 C_ARGS: term->display->display, (Window)parent,
1678 x, y, width, height, 0, 1738 x, y, width, height, 0,
1679 term->pix_colors_focused[Color_border], 1739 term->pix_colors_focused[Color_border],
1680 term->pix_colors_focused[Color_border] 1740 term->pix_colors_focused[Color_border]
1681 1741
1742#endif
1743
1682void 1744void
1683XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1745XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1684 C_ARGS: term->display->display, window, parent, x, y 1746 C_ARGS: term->display->display, window, parent, x, y
1685 1747
1686void 1748void
… …
1691XUnmapWindow (rxvt_term *term, Window window) 1753XUnmapWindow (rxvt_term *term, Window window)
1692 C_ARGS: term->display->display, window 1754 C_ARGS: term->display->display, window
1693 1755
1694void 1756void
1695XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1757XMoveResizeWindow (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 1758 C_ARGS: term->display->display, window, x, y, width, height
1759
1760void
1761rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1762 CODE:
1763{
1764 XWindowAttributes attr;
1765 XGetWindowAttributes (THIS->display->display, window, &attr);
1766 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1767}
1768
1769void
1770rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1771 PPCODE:
1772{
1773 int dx, dy;
1774 Window child;
1775
1776 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1777 {
1778 EXTEND (SP, 3);
1779 PUSHs (newSViv (dx));
1780 PUSHs (newSViv (dy));
1781 PUSHs (newSVuv (child));
1782 }
1783}
1697 1784
1698############################################################################# 1785#############################################################################
1699# urxvt::overlay 1786# urxvt::overlay
1700############################################################################# 1787#############################################################################
1701 1788
… …
1847 w->self = (HV *)SvRV (RETVAL); 1934 w->self = (HV *)SvRV (RETVAL);
1848 OUTPUT: 1935 OUTPUT:
1849 RETVAL 1936 RETVAL
1850 1937
1851CHAINED 1938CHAINED
1852iow::start () 1939iw::start ()
1853 CODE: 1940 CODE:
1854 THIS->start (); 1941 THIS->start ();
1855 OUTPUT: 1942 OUTPUT:
1856 RETVAL 1943 RETVAL
1857 1944
1858CHAINED 1945CHAINED
1859iow::stop () 1946iw::stop ()
1860 CODE: 1947 CODE:
1861 THIS->stop (); 1948 THIS->stop ();
1862 OUTPUT: 1949 OUTPUT:
1863 RETVAL 1950 RETVAL
1864 1951
… …
1886 THIS->start (pid); 1973 THIS->start (pid);
1887 OUTPUT: 1974 OUTPUT:
1888 RETVAL 1975 RETVAL
1889 1976
1890CHAINED 1977CHAINED
1891iow::stop () 1978pw::stop ()
1892 CODE: 1979 CODE:
1893 THIS->stop (); 1980 THIS->stop ();
1894 OUTPUT: 1981 OUTPUT:
1895 RETVAL 1982 RETVAL
1896 1983

Diff Legend

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