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.103 by root, Mon Aug 7 21:38:24 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);
… …
269}; 268};
270 269
271overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 270overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
272: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 271: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
273{ 272{
273 if (w < 0) w = 0;
274 if (h < 0) h = 0;
275
274 if (border == 2) 276 if (border == 2)
275 { 277 {
276 w += 2; 278 w += 2;
277 h += 2; 279 h += 2;
278 } 280 }
… …
356 358
357 int i; 359 int i;
358 360
359 for (i = AvFILL (overlay_av); i >= 0; i--) 361 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) 362 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361 {
362 av_delete (overlay_av, i, G_DISCARD);
363 break; 363 break;
364 }
365 364
366 for (; i < AvFILL (overlay_av); i++) 365 for (; i < AvFILL (overlay_av); i++)
367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 366 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368 367
369 av_pop (overlay_av); 368 av_pop (overlay_av);
… …
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),
… …
791 const_iv (Button2Mask), 790 const_iv (Button2Mask),
792 const_iv (Button3Mask), 791 const_iv (Button3Mask),
793 const_iv (Button4Mask), 792 const_iv (Button4Mask),
794 const_iv (Button5Mask), 793 const_iv (Button5Mask),
795 const_iv (AnyModifier), 794 const_iv (AnyModifier),
795
796 const_iv (NoSymbol),
797 const_iv (GrabModeSync),
798 const_iv (GrabModeAsync),
796 799
797 const_iv (EVENT_NONE), 800 const_iv (EVENT_NONE),
798 const_iv (EVENT_READ), 801 const_iv (EVENT_READ),
799 const_iv (EVENT_WRITE), 802 const_iv (EVENT_WRITE),
800 803
… …
883 const_iv (XIMDontChange), 886 const_iv (XIMDontChange),
884# endif 887# endif
885# endif 888# endif
886 }; 889 };
887 890
888 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 891 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)); 892 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
891} 893}
892 894
893void 895void
894warn (const char *msg) 896warn (const char *msg)
… …
925 RETVAL 927 RETVAL
926 928
927int 929int
928SET_FGCOLOR (int rend, int new_color) 930SET_FGCOLOR (int rend, int new_color)
929 CODE: 931 CODE:
930 RETVAL = SET_FGCOLOR (rend, new_color); 932 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
931 OUTPUT: 933 OUTPUT:
932 RETVAL 934 RETVAL
933 935
934int 936int
935SET_BGCOLOR (int rend, int new_color) 937SET_BGCOLOR (int rend, int new_color)
936 CODE: 938 CODE:
937 RETVAL = SET_BGCOLOR (rend, new_color); 939 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
938 OUTPUT: 940 OUTPUT:
939 RETVAL 941 RETVAL
940 942
941int 943int
942GET_CUSTOM (int rend) 944GET_CUSTOM (int rend)
… …
1017void 1019void
1018rxvt_term::set_should_invoke (int htype, int inc) 1020rxvt_term::set_should_invoke (int htype, int inc)
1019 CODE: 1021 CODE:
1020 THIS->perl.should_invoke [htype] += inc; 1022 THIS->perl.should_invoke [htype] += inc;
1021 1023
1022void 1024int
1023rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1025rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1024 CODE: 1026 CODE:
1025 XGrabButton (THIS->xdisp, button, modifiers, window, 1, 1027 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1026 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1028 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1027 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1029 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1030 OUTPUT: RETVAL
1028 1031
1029void 1032int
1030rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt) 1033rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1031 CODE: 1034 CODE:
1032 XUngrabButton (THIS->xdisp, button, modifiers, window); 1035 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
1036 OUTPUT: RETVAL
1033 1037
1034#if 0
1035
1036void 1038void
1037XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 1039rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1038 C_ARGS: 1040 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1039 THIS->xdisp, keycode, modifiers, window, 1, 1041 CODE:
1040 GrabModeSync, GrabModeSync 1042 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1041 1043
1042void 1044void
1043XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt) 1045rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
1044 C_ARGS: THIS->xdisp, keycode, modifiers, window 1046 CODE:
1047 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1045 1048
1046#endif 1049void
1050rxvt_term::XUngrabKeyboard (Time eventtime)
1051 CODE:
1052 XUngrabKeyboard (THIS->dpy, eventtime);
1047 1053
1048bool 1054bool
1049rxvt_term::grab (Time eventtime, int sync = 0) 1055rxvt_term::grab (Time eventtime, int sync = 0)
1050 CODE: 1056 CODE:
1051{ 1057{
1052 int mode = sync ? GrabModeSync : GrabModeAsync; 1058 int mode = sync ? GrabModeSync : GrabModeAsync;
1053 1059
1054 THIS->perl.grabtime = 0; 1060 THIS->perl.grabtime = 0;
1055 1061
1056 if (!XGrabPointer (THIS->xdisp, THIS->vt, 0, 1062 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1057 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1063 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1058 mode, mode, None, GRAB_CURSOR, eventtime)) 1064 mode, mode, None, GRAB_CURSOR, eventtime))
1059 if (!XGrabKeyboard (THIS->xdisp, THIS->vt, 0, mode, mode, eventtime)) 1065 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1060 THIS->perl.grabtime = eventtime; 1066 THIS->perl.grabtime = eventtime;
1061 else 1067 else
1062 XUngrabPointer (THIS->xdisp, eventtime); 1068 XUngrabPointer (THIS->dpy, eventtime);
1063 1069
1064 RETVAL = !!THIS->perl.grabtime; 1070 RETVAL = !!THIS->perl.grabtime;
1065} 1071}
1066 OUTPUT: 1072 OUTPUT:
1067 RETVAL 1073 RETVAL
1068 1074
1069void 1075void
1070rxvt_term::allow_events_async () 1076rxvt_term::allow_events_async ()
1071 CODE: 1077 CODE:
1072 XAllowEvents (THIS->xdisp, AsyncBoth, THIS->perl.grabtime); 1078 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1073 1079
1074void 1080void
1075rxvt_term::allow_events_sync () 1081rxvt_term::allow_events_sync ()
1076 CODE: 1082 CODE:
1077 XAllowEvents (THIS->xdisp, SyncBoth, THIS->perl.grabtime); 1083 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1078 1084
1079void 1085void
1080rxvt_term::allow_events_replay () 1086rxvt_term::allow_events_replay ()
1081 CODE: 1087 CODE:
1082 XAllowEvents (THIS->xdisp, ReplayPointer, THIS->perl.grabtime); 1088 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1083 XAllowEvents (THIS->xdisp, ReplayKeyboard, THIS->perl.grabtime); 1089 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1084 1090
1085void 1091void
1086rxvt_term::ungrab () 1092rxvt_term::ungrab ()
1087 CODE: 1093 CODE:
1088 ungrab (THIS); 1094 ungrab (THIS);
1095
1096int
1097rxvt_term::XStringToKeysym (char *string)
1098 CODE:
1099 RETVAL = XStringToKeysym (string);
1100 OUTPUT: RETVAL
1101
1102char *
1103rxvt_term::XKeysymToString (int sym)
1104 CODE:
1105 RETVAL = XKeysymToString (sym);
1106 OUTPUT: RETVAL
1107
1108int
1109rxvt_term::XKeysymToKeycode (int sym)
1110 CODE:
1111 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
1112 OUTPUT: RETVAL
1113
1114int
1115rxvt_term::XKeycodeToKeysym (int code, int index)
1116 CODE:
1117 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
1118 OUTPUT: RETVAL
1089 1119
1090int 1120int
1091rxvt_term::strwidth (SV *str) 1121rxvt_term::strwidth (SV *str)
1092 CODE: 1122 CODE:
1093{ 1123{
… …
1211 } 1241 }
1212 OUTPUT: 1242 OUTPUT:
1213 RETVAL 1243 RETVAL
1214 1244
1215SV * 1245SV *
1216rxvt_term::_env () 1246rxvt_term::envv ()
1247 ALIAS:
1248 argv = 1
1217 CODE: 1249 PPCODE:
1218{ 1250{
1219 if (THIS->envv) 1251 stringvec *vec = ix ? THIS->argv : THIS->envv;
1220 {
1221 AV *av = newAV ();
1222 1252
1253 EXTEND (SP, vec->size ());
1254
1223 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1255 for (char **i = vec->begin (); i != vec->end (); ++i)
1224 if (*i) 1256 if (*i)
1225 av_push (av, newSVpv (*i, 0)); 1257 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1226
1227 RETVAL = newRV_noinc ((SV *)av);
1228 }
1229 else
1230 RETVAL = &PL_sv_undef;
1231} 1258}
1232 OUTPUT:
1233 RETVAL
1234 1259
1235int 1260int
1236rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1261rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1237 CODE: 1262 CODE:
1238 RETVAL = THIS->pty_ev.events; 1263 RETVAL = THIS->pty_ev.events;
… …
1292void 1317void
1293rxvt_term::focus_in () 1318rxvt_term::focus_in ()
1294 1319
1295void 1320void
1296rxvt_term::focus_out () 1321rxvt_term::focus_out ()
1322
1323void
1324rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1325 ALIAS:
1326 key_release = 1
1327 CODE:
1328{
1329 XKeyEvent xkey;
1330
1331 memset (&xkey, 0, sizeof (xkey));
1332
1333 xkey.time = time;
1334 xkey.state = state;
1335 xkey.keycode = keycode;
1336
1337 xkey.type = ix ? KeyRelease : KeyPress;
1338 xkey.display = THIS->dpy;
1339 xkey.window = THIS->vt;
1340 xkey.root = THIS->display->root;
1341 xkey.subwindow = THIS->vt;
1342
1343 if (ix)
1344 THIS->key_release (xkey);
1345 else
1346 THIS->key_press (xkey);
1347}
1297 1348
1298void 1349void
1299rxvt_term::want_refresh () 1350rxvt_term::want_refresh ()
1300 CODE: 1351 CODE:
1301 THIS->want_refresh = 1; 1352 THIS->want_refresh = 1;
… …
1494 1545
1495void 1546void
1496rxvt_term::_resource (char *name, int index, SV *newval = 0) 1547rxvt_term::_resource (char *name, int index, SV *newval = 0)
1497 PPCODE: 1548 PPCODE:
1498{ 1549{
1499 struct resval { const char *name; int value; } rslist [] = { 1550 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1500# define def(name) { # name, Rs_ ## name }, 1551# define def(name) { # name, Rs_ ## name },
1501# define reserve(name,count) 1552# define reserve(name,count)
1502# include "rsinc.h" 1553# include "rsinc.h"
1503# undef def 1554# undef def
1504# undef reserve 1555# undef reserve
1505 }; 1556 };
1506 1557
1507 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1558 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1508 1559
1509 do { 1560 do {
1510 if (rs-- == rslist) 1561 if (rs-- == rslist)
1511 croak ("no such resource '%s', requested", name); 1562 croak ("no such resource '%s', requested", name);
1512 } while (strcmp (name, rs->name)); 1563 } while (strcmp (name, rs->name));
… …
1737void 1788void
1738rxvt_term::XListProperties (Window window) 1789rxvt_term::XListProperties (Window window)
1739 PPCODE: 1790 PPCODE:
1740{ 1791{
1741 int count; 1792 int count;
1742 Atom *props = XListProperties (THIS->xdisp, window, &count); 1793 Atom *props = XListProperties (THIS->dpy, window, &count);
1743 1794
1744 EXTEND (SP, count); 1795 EXTEND (SP, count);
1745 while (count--) 1796 while (count--)
1746 PUSHs (newSVuv ((U32)props [count])); 1797 PUSHs (newSVuv ((U32)props [count]));
1747 1798
… …
1756 int format; 1807 int format;
1757 unsigned long nitems; 1808 unsigned long nitems;
1758 unsigned long bytes_after; 1809 unsigned long bytes_after;
1759 unsigned char *prop; 1810 unsigned char *prop;
1760 1811
1761 XGetWindowProperty (THIS->xdisp, window, property, 1812 XGetWindowProperty (THIS->dpy, window, property,
1762 0, 1<<24, 0, AnyPropertyType, 1813 0, 1<<24, 0, AnyPropertyType,
1763 &type, &format, &nitems, &bytes_after, &prop); 1814 &type, &format, &nitems, &bytes_after, &prop);
1764 1815
1765 if (type != None) 1816 if (type != None)
1766 { 1817 {
… …
1785 1836
1786 int elemsize = format == 16 ? sizeof (short) 1837 int elemsize = format == 16 ? sizeof (short)
1787 : format == 32 ? sizeof (long) 1838 : format == 32 ? sizeof (long)
1788 : 1; 1839 : 1;
1789 1840
1790 XChangeProperty (THIS->xdisp, window, property, 1841 XChangeProperty (THIS->dpy, window, property,
1791 type, format, PropModeReplace, 1842 type, format, PropModeReplace,
1792 (unsigned char *)data_, len / elemsize); 1843 (unsigned char *)data_, len / elemsize);
1793 XSync (THIS->xdisp, 0);
1794} 1844}
1795 1845
1796Atom 1846Atom
1797XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1847XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1798 C_ARGS: term->xdisp, atom_name, only_if_exists 1848 C_ARGS: term->dpy, atom_name, only_if_exists
1799 1849
1800char * 1850char *
1801XGetAtomName (rxvt_term *term, Atom atom) 1851XGetAtomName (rxvt_term *term, Atom atom)
1802 C_ARGS: term->xdisp, atom 1852 C_ARGS: term->dpy, atom
1803 CLEANUP: 1853 CLEANUP:
1804 XFree (RETVAL); 1854 XFree (RETVAL);
1805 1855
1806void 1856void
1807XDeleteProperty (rxvt_term *term, Window window, Atom property) 1857XDeleteProperty (rxvt_term *term, Window window, Atom property)
1808 C_ARGS: term->xdisp, window, property 1858 C_ARGS: term->dpy, window, property
1809 1859
1810Window 1860Window
1811rxvt_term::DefaultRootWindow () 1861rxvt_term::DefaultRootWindow ()
1812 CODE: 1862 CODE:
1813 RETVAL = THIS->display->root; 1863 RETVAL = THIS->display->root;
… …
1816 1866
1817#if 0 1867#if 0
1818 1868
1819Window 1869Window
1820XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1870XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1821 C_ARGS: term->xdisp, (Window)parent, 1871 C_ARGS: term->dpy, (Window)parent,
1822 x, y, width, height, 0, 1872 x, y, width, height, 0,
1823 term->pix_colors_focused[Color_border], 1873 term->pix_colors_focused[Color_border],
1824 term->pix_colors_focused[Color_border] 1874 term->pix_colors_focused[Color_border]
1825 1875
1826#endif 1876#endif
1827 1877
1828void 1878void
1829XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1879XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1830 C_ARGS: term->xdisp, window, parent, x, y 1880 C_ARGS: term->dpy, window, parent, x, y
1831 1881
1832void 1882void
1833XMapWindow (rxvt_term *term, Window window) 1883XMapWindow (rxvt_term *term, Window window)
1834 C_ARGS: term->xdisp, window 1884 C_ARGS: term->dpy, window
1835 1885
1836void 1886void
1837XUnmapWindow (rxvt_term *term, Window window) 1887XUnmapWindow (rxvt_term *term, Window window)
1838 C_ARGS: term->xdisp, window 1888 C_ARGS: term->dpy, window
1839 1889
1840void 1890void
1841XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1891XMoveResizeWindow (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 1892 C_ARGS: term->dpy, window, x, y, width, height
1843 1893
1844void 1894void
1845rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) 1895rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1846 CODE: 1896 CODE:
1847{ 1897{
1848 XWindowAttributes attr; 1898 XWindowAttributes attr;
1849 XGetWindowAttributes (THIS->xdisp, window, &attr); 1899 XGetWindowAttributes (THIS->dpy, window, &attr);
1850 XSelectInput (THIS->xdisp, window, attr.your_event_mask | add_events & ~del_events); 1900 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1851} 1901}
1852 1902
1853void 1903void
1854rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1904rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1855 PPCODE: 1905 PPCODE:
1856{ 1906{
1857 int dx, dy; 1907 int dx, dy;
1858 Window child; 1908 Window child;
1859 1909
1860 if (XTranslateCoordinates (THIS->xdisp, src, dst, x, y, &dx, &dy, &child)) 1910 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1861 { 1911 {
1862 EXTEND (SP, 3); 1912 EXTEND (SP, 3);
1863 PUSHs (newSViv (dx)); 1913 PUSHs (newSViv (dx));
1864 PUSHs (newSViv (dy)); 1914 PUSHs (newSViv (dy));
1865 PUSHs (newSVuv (child)); 1915 PUSHs (newSVuv (child));

Diff Legend

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