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.95 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.100 by root, Mon Feb 20 20:44:22 2006 UTC

… …
80new_ref (HV *hv, const char *klass) 80new_ref (HV *hv, const char *klass)
81{ 81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83} 83}
84 84
85//TODO: use magic
86static SV * 85static SV *
87newSVptr (void *ptr, const char *klass) 86newSVptr (void *ptr, const char *klass)
88{ 87{
89 HV *hv = newHV (); 88 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
… …
494static void 493static void
495ungrab (rxvt_term *THIS) 494ungrab (rxvt_term *THIS)
496{ 495{
497 if (THIS->perl.grabtime) 496 if (THIS->perl.grabtime)
498 { 497 {
499 XUngrabKeyboard (THIS->xdisp, THIS->perl.grabtime); 498 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
500 XUngrabPointer (THIS->xdisp, THIS->perl.grabtime); 499 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
501 THIS->perl.grabtime = 0; 500 THIS->perl.grabtime = 0;
502 } 501 }
503} 502}
504 503
505bool 504bool
… …
763# include "optinc.h" 762# include "optinc.h"
764# undef nodef 763# undef nodef
765# undef def 764# undef def
766 765
767 HV *stash = gv_stashpv ("urxvt", 1); 766 HV *stash = gv_stashpv ("urxvt", 1);
768 struct { 767 static const struct {
769 const char *name; 768 const char *name;
770 IV iv; 769 IV iv;
771 } *civ, const_iv[] = { 770 } *civ, const_iv[] = {
772# define const_iv(name) { # name, (IV)name } 771# define const_iv(name) { # name, (IV)name }
773 const_iv (DEFAULT_RSTYLE), 772 const_iv (DEFAULT_RSTYLE),
… …
883 const_iv (XIMDontChange), 882 const_iv (XIMDontChange),
884# endif 883# endif
885# endif 884# endif
886 }; 885 };
887 886
888 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
889 civ-- > const_iv; )
890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
891} 889}
892 890
893void 891void
894warn (const char *msg) 892warn (const char *msg)
… …
925 RETVAL 923 RETVAL
926 924
927int 925int
928SET_FGCOLOR (int rend, int new_color) 926SET_FGCOLOR (int rend, int new_color)
929 CODE: 927 CODE:
930 RETVAL = SET_FGCOLOR (rend, new_color); 928 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
931 OUTPUT: 929 OUTPUT:
932 RETVAL 930 RETVAL
933 931
934int 932int
935SET_BGCOLOR (int rend, int new_color) 933SET_BGCOLOR (int rend, int new_color)
936 CODE: 934 CODE:
937 RETVAL = SET_BGCOLOR (rend, new_color); 935 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
938 OUTPUT: 936 OUTPUT:
939 RETVAL 937 RETVAL
940 938
941int 939int
942GET_CUSTOM (int rend) 940GET_CUSTOM (int rend)
… …
1020 THIS->perl.should_invoke [htype] += inc; 1018 THIS->perl.should_invoke [htype] += inc;
1021 1019
1022void 1020void
1023rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1021rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1024 CODE: 1022 CODE:
1025 XGrabButton (THIS->xdisp, button, modifiers, window, 1, 1023 XGrabButton (THIS->dpy, button, modifiers, window, 1,
1026 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1024 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1027 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1025 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1028 1026
1029void 1027void
1030rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt) 1028rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1031 CODE: 1029 CODE:
1032 XUngrabButton (THIS->xdisp, button, modifiers, window); 1030 XUngrabButton (THIS->dpy, button, modifiers, window);
1033 1031
1034#if 0 1032#if 0
1035 1033
1036void 1034void
1037XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 1035XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1038 C_ARGS: 1036 C_ARGS:
1039 THIS->xdisp, keycode, modifiers, window, 1, 1037 THIS->dpy, keycode, modifiers, window, 1,
1040 GrabModeSync, GrabModeSync 1038 GrabModeSync, GrabModeSync
1041 1039
1042void 1040void
1043XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 1041XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1044 C_ARGS: THIS->xdisp, keycode, modifiers, window 1042 C_ARGS: THIS->dpy, keycode, modifiers, window
1045 1043
1046#endif 1044#endif
1047 1045
1048bool 1046bool
1049rxvt_term::grab (Time eventtime, int sync = 0) 1047rxvt_term::grab (Time eventtime, int sync = 0)
… …
1051{ 1049{
1052 int mode = sync ? GrabModeSync : GrabModeAsync; 1050 int mode = sync ? GrabModeSync : GrabModeAsync;
1053 1051
1054 THIS->perl.grabtime = 0; 1052 THIS->perl.grabtime = 0;
1055 1053
1056 if (!XGrabPointer (THIS->xdisp, THIS->vt, 0, 1054 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1057 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1055 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1058 mode, mode, None, GRAB_CURSOR, eventtime)) 1056 mode, mode, None, GRAB_CURSOR, eventtime))
1059 if (!XGrabKeyboard (THIS->xdisp, THIS->vt, 0, mode, mode, eventtime)) 1057 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1060 THIS->perl.grabtime = eventtime; 1058 THIS->perl.grabtime = eventtime;
1061 else 1059 else
1062 XUngrabPointer (THIS->xdisp, eventtime); 1060 XUngrabPointer (THIS->dpy, eventtime);
1063 1061
1064 RETVAL = !!THIS->perl.grabtime; 1062 RETVAL = !!THIS->perl.grabtime;
1065} 1063}
1066 OUTPUT: 1064 OUTPUT:
1067 RETVAL 1065 RETVAL
1068 1066
1069void 1067void
1070rxvt_term::allow_events_async () 1068rxvt_term::allow_events_async ()
1071 CODE: 1069 CODE:
1072 XAllowEvents (THIS->xdisp, AsyncBoth, THIS->perl.grabtime); 1070 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1073 1071
1074void 1072void
1075rxvt_term::allow_events_sync () 1073rxvt_term::allow_events_sync ()
1076 CODE: 1074 CODE:
1077 XAllowEvents (THIS->xdisp, SyncBoth, THIS->perl.grabtime); 1075 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1078 1076
1079void 1077void
1080rxvt_term::allow_events_replay () 1078rxvt_term::allow_events_replay ()
1081 CODE: 1079 CODE:
1082 XAllowEvents (THIS->xdisp, ReplayPointer, THIS->perl.grabtime); 1080 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1083 XAllowEvents (THIS->xdisp, ReplayKeyboard, THIS->perl.grabtime); 1081 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1084 1082
1085void 1083void
1086rxvt_term::ungrab () 1084rxvt_term::ungrab ()
1087 CODE: 1085 CODE:
1088 ungrab (THIS); 1086 ungrab (THIS);
… …
1211 } 1209 }
1212 OUTPUT: 1210 OUTPUT:
1213 RETVAL 1211 RETVAL
1214 1212
1215SV * 1213SV *
1216rxvt_term::_env () 1214rxvt_term::envv ()
1215 ALIAS:
1216 argv = 1
1217 CODE: 1217 PPCODE:
1218{ 1218{
1219 if (THIS->envv) 1219 stringvec *vec = ix ? THIS->argv : THIS->envv;
1220 {
1221 AV *av = newAV ();
1222 1220
1221 EXTEND (SP, vec->size ());
1222
1223 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1223 for (char **i = vec->begin (); i != vec->end (); ++i)
1224 if (*i) 1224 if (*i)
1225 av_push (av, newSVpv (*i, 0)); 1225 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1226
1227 RETVAL = newRV_noinc ((SV *)av);
1228 }
1229 else
1230 RETVAL = &PL_sv_undef;
1231} 1226}
1232 OUTPUT:
1233 RETVAL
1234 1227
1235int 1228int
1236rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1229rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1237 CODE: 1230 CODE:
1238 RETVAL = THIS->pty_ev.events; 1231 RETVAL = THIS->pty_ev.events;
… …
1292void 1285void
1293rxvt_term::focus_in () 1286rxvt_term::focus_in ()
1294 1287
1295void 1288void
1296rxvt_term::focus_out () 1289rxvt_term::focus_out ()
1290
1291void
1292rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1293 ALIAS:
1294 key_release = 1
1295 CODE:
1296{
1297 XKeyEvent xkey;
1298
1299 memset (&xkey, 0, sizeof (xkey));
1300
1301 xkey.time = time;
1302 xkey.state = state;
1303 xkey.keycode = keycode;
1304
1305 xkey.type = ix ? KeyRelease : KeyPress;
1306 xkey.display = THIS->dpy;
1307 xkey.window = THIS->vt;
1308 xkey.root = THIS->display->root;
1309 xkey.subwindow = THIS->vt;
1310
1311 if (ix)
1312 THIS->key_release (xkey);
1313 else
1314 THIS->key_press (xkey);
1315}
1297 1316
1298void 1317void
1299rxvt_term::want_refresh () 1318rxvt_term::want_refresh ()
1300 CODE: 1319 CODE:
1301 THIS->want_refresh = 1; 1320 THIS->want_refresh = 1;
… …
1494 1513
1495void 1514void
1496rxvt_term::_resource (char *name, int index, SV *newval = 0) 1515rxvt_term::_resource (char *name, int index, SV *newval = 0)
1497 PPCODE: 1516 PPCODE:
1498{ 1517{
1499 struct resval { const char *name; int value; } rslist [] = { 1518 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1500# define def(name) { # name, Rs_ ## name }, 1519# define def(name) { # name, Rs_ ## name },
1501# define reserve(name,count) 1520# define reserve(name,count)
1502# include "rsinc.h" 1521# include "rsinc.h"
1503# undef def 1522# undef def
1504# undef reserve 1523# undef reserve
1505 }; 1524 };
1506 1525
1507 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1526 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1508 1527
1509 do { 1528 do {
1510 if (rs-- == rslist) 1529 if (rs-- == rslist)
1511 croak ("no such resource '%s', requested", name); 1530 croak ("no such resource '%s', requested", name);
1512 } while (strcmp (name, rs->name)); 1531 } while (strcmp (name, rs->name));
… …
1737void 1756void
1738rxvt_term::XListProperties (Window window) 1757rxvt_term::XListProperties (Window window)
1739 PPCODE: 1758 PPCODE:
1740{ 1759{
1741 int count; 1760 int count;
1742 Atom *props = XListProperties (THIS->xdisp, window, &count); 1761 Atom *props = XListProperties (THIS->dpy, window, &count);
1743 1762
1744 EXTEND (SP, count); 1763 EXTEND (SP, count);
1745 while (count--) 1764 while (count--)
1746 PUSHs (newSVuv ((U32)props [count])); 1765 PUSHs (newSVuv ((U32)props [count]));
1747 1766
… …
1756 int format; 1775 int format;
1757 unsigned long nitems; 1776 unsigned long nitems;
1758 unsigned long bytes_after; 1777 unsigned long bytes_after;
1759 unsigned char *prop; 1778 unsigned char *prop;
1760 1779
1761 XGetWindowProperty (THIS->xdisp, window, property, 1780 XGetWindowProperty (THIS->dpy, window, property,
1762 0, 1<<24, 0, AnyPropertyType, 1781 0, 1<<24, 0, AnyPropertyType,
1763 &type, &format, &nitems, &bytes_after, &prop); 1782 &type, &format, &nitems, &bytes_after, &prop);
1764 1783
1765 if (type != None) 1784 if (type != None)
1766 { 1785 {
… …
1785 1804
1786 int elemsize = format == 16 ? sizeof (short) 1805 int elemsize = format == 16 ? sizeof (short)
1787 : format == 32 ? sizeof (long) 1806 : format == 32 ? sizeof (long)
1788 : 1; 1807 : 1;
1789 1808
1790 XChangeProperty (THIS->xdisp, window, property, 1809 XChangeProperty (THIS->dpy, window, property,
1791 type, format, PropModeReplace, 1810 type, format, PropModeReplace,
1792 (unsigned char *)data_, len / elemsize); 1811 (unsigned char *)data_, len / elemsize);
1793 XSync (THIS->xdisp, 0);
1794} 1812}
1795 1813
1796Atom 1814Atom
1797XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1815XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1798 C_ARGS: term->xdisp, atom_name, only_if_exists 1816 C_ARGS: term->dpy, atom_name, only_if_exists
1799 1817
1800char * 1818char *
1801XGetAtomName (rxvt_term *term, Atom atom) 1819XGetAtomName (rxvt_term *term, Atom atom)
1802 C_ARGS: term->xdisp, atom 1820 C_ARGS: term->dpy, atom
1803 CLEANUP: 1821 CLEANUP:
1804 XFree (RETVAL); 1822 XFree (RETVAL);
1805 1823
1806void 1824void
1807XDeleteProperty (rxvt_term *term, Window window, Atom property) 1825XDeleteProperty (rxvt_term *term, Window window, Atom property)
1808 C_ARGS: term->xdisp, window, property 1826 C_ARGS: term->dpy, window, property
1809 1827
1810Window 1828Window
1811rxvt_term::DefaultRootWindow () 1829rxvt_term::DefaultRootWindow ()
1812 CODE: 1830 CODE:
1813 RETVAL = THIS->display->root; 1831 RETVAL = THIS->display->root;
… …
1816 1834
1817#if 0 1835#if 0
1818 1836
1819Window 1837Window
1820XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1838XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1821 C_ARGS: term->xdisp, (Window)parent, 1839 C_ARGS: term->dpy, (Window)parent,
1822 x, y, width, height, 0, 1840 x, y, width, height, 0,
1823 term->pix_colors_focused[Color_border], 1841 term->pix_colors_focused[Color_border],
1824 term->pix_colors_focused[Color_border] 1842 term->pix_colors_focused[Color_border]
1825 1843
1826#endif 1844#endif
1827 1845
1828void 1846void
1829XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1847XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1830 C_ARGS: term->xdisp, window, parent, x, y 1848 C_ARGS: term->dpy, window, parent, x, y
1831 1849
1832void 1850void
1833XMapWindow (rxvt_term *term, Window window) 1851XMapWindow (rxvt_term *term, Window window)
1834 C_ARGS: term->xdisp, window 1852 C_ARGS: term->dpy, window
1835 1853
1836void 1854void
1837XUnmapWindow (rxvt_term *term, Window window) 1855XUnmapWindow (rxvt_term *term, Window window)
1838 C_ARGS: term->xdisp, window 1856 C_ARGS: term->dpy, window
1839 1857
1840void 1858void
1841XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1859XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1842 C_ARGS: term->xdisp, window, x, y, width, height 1860 C_ARGS: term->dpy, window, x, y, width, height
1843 1861
1844void 1862void
1845rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1863rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1846 CODE: 1864 CODE:
1847{ 1865{
1848 XWindowAttributes attr; 1866 XWindowAttributes attr;
1849 XGetWindowAttributes (THIS->xdisp, window, &attr); 1867 XGetWindowAttributes (THIS->dpy, window, &attr);
1850 XSelectInput (THIS->xdisp, window, attr.your_event_mask | add_events & ~del_events); 1868 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1851} 1869}
1852 1870
1853void 1871void
1854rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1872rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1855 PPCODE: 1873 PPCODE:
1856{ 1874{
1857 int dx, dy; 1875 int dx, dy;
1858 Window child; 1876 Window child;
1859 1877
1860 if (XTranslateCoordinates (THIS->xdisp, src, dst, x, y, &dx, &dy, &child)) 1878 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1861 { 1879 {
1862 EXTEND (SP, 3); 1880 EXTEND (SP, 3);
1863 PUSHs (newSViv (dx)); 1881 PUSHs (newSViv (dx));
1864 PUSHs (newSViv (dy)); 1882 PUSHs (newSViv (dy));
1865 PUSHs (newSVuv (child)); 1883 PUSHs (newSVuv (child));

Diff Legend

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