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.92 by root, Wed Jan 25 00:57:57 2006 UTC

… …
554 break; 554 break;
555 555
556 case DT_STR_LEN: 556 case DT_STR_LEN:
557 { 557 {
558 char *str = va_arg (ap, char *); 558 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 559 int len = va_arg (ap, int);
560 560
561 printf ("pushing str %p:%d\n", str,len);//D
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 563 }
563 break; 564 break;
564 565
565 case DT_WCS_LEN: 566 case DT_WCS_LEN:
566 { 567 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 568 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 569 int wlen = va_arg (ap, int);
569 570
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 571 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
572 }
573 break;
574
575 case DT_LCS_LEN:
576 {
577 long *lstr = va_arg (ap, long *);
578 int llen = va_arg (ap, int);
579
580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 581 }
572 break; 582 break;
573 583
574 case DT_XEVENT: 584 case DT_XEVENT:
575 { 585 {
576 XEvent *xe = va_arg (ap, XEvent *); 586 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 587 HV *hv = newHV ();
578 588
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 589# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
580# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 590# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
581# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 591# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 592# undef set
583 593
584 setiv (type, xe->type); 594 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 595 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 596 setiv (serial, xe->xany.serial);
587 597
… …
596 setuv (root, xe->xmotion.root); 606 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 607 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 608 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 609 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 610 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight); 611 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 612 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 613 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 614 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 615 setuv (state, xe->xmotion.state);
606 616
… …
638 setiv (height, xe->xconfigure.height); 648 setiv (height, xe->xconfigure.height);
639 setuv (above, xe->xconfigure.above); 649 setuv (above, xe->xconfigure.above);
640 break; 650 break;
641 } 651 }
642 652
653 break;
654
655 case PropertyNotify:
656 setuv (window, xe->xproperty.window);
657 setuv (atom, xe->xproperty.atom);
658 setuv (time, xe->xproperty.time);
659 setiv (state, xe->xproperty.state);
660 break;
661
662 case ClientMessage:
663 setuv (window, xe->xclient.window);
664 setuv (message_type, xe->xclient.message_type);
665 setuv (format, xe->xclient.format);
666 setuv (l0, xe->xclient.data.l[0]);
667 setuv (l1, xe->xclient.data.l[1]);
668 setuv (l2, xe->xclient.data.l[2]);
669 setuv (l3, xe->xclient.data.l[3]);
670 setuv (l4, xe->xclient.data.l[4]);
643 break; 671 break;
644 } 672 }
645 673
646 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 674 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
647 } 675 }
… …
698 } 726 }
699 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
700 { 728 {
701 clearSVptr ((SV *)term->perl.self); 729 clearSVptr ((SV *)term->perl.self);
702 SvREFCNT_dec ((SV *)term->perl.self); 730 SvREFCNT_dec ((SV *)term->perl.self);
731
732 // don't allow further calls
733 term->perl.self = 0;
703 } 734 }
704 735
705 swap (perl_environ, environ); 736 swap (perl_environ, environ);
706 737
707 return event_consumed; 738 return event_consumed;
… …
824 const_iv (SelectionRequest), 855 const_iv (SelectionRequest),
825 const_iv (SelectionNotify), 856 const_iv (SelectionNotify),
826 const_iv (ColormapNotify), 857 const_iv (ColormapNotify),
827 const_iv (ClientMessage), 858 const_iv (ClientMessage),
828 const_iv (MappingNotify), 859 const_iv (MappingNotify),
860# if ENABLE_XIM_ONTHESPOT
861 const_iv (XIMReverse),
862 const_iv (XIMUnderline),
863 const_iv (XIMHighlight),
864 const_iv (XIMPrimary),
865 const_iv (XIMSecondary),
866 const_iv (XIMTertiary),
867 const_iv (XIMVisibleToForward),
868 const_iv (XIMVisibleToBackword),
869 const_iv (XIMVisibleToCenter),
870# if 0
871 const_iv (XIMForwardChar),
872 const_iv (XIMBackwardChar),
873 const_iv (XIMForwardWord),
874 const_iv (XIMBackwardWord),
875 const_iv (XIMCaretUp),
876 const_iv (XIMCaretDown),
877 const_iv (XIMNextLine),
878 const_iv (XIMPreviousLine),
879 const_iv (XIMLineStart),
880 const_iv (XIMLineEnd),
881 const_iv (XIMAbsolutePosition),
882 const_iv (XIMDontChange),
883# endif
884# endif
829 }; 885 };
830 886
831 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
832 civ-- > const_iv; ) 888 civ-- > const_iv; )
833 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
910 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 966 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
911 croak ("first argument to urxvt::term->_new must be arrayref"); 967 croak ("first argument to urxvt::term->_new must be arrayref");
912 968
913 rxvt_term *term = new rxvt_term; 969 rxvt_term *term = new rxvt_term;
914 970
915 term->argv = new stringvec; 971 stringvec *argv = new stringvec;
916 term->envv = new stringvec; 972 stringvec *envv = new stringvec;
917 973
918 for (int i = 1; i < items; i++) 974 for (int i = 1; i < items; i++)
919 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 975 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
920 976
921 AV *envv = (AV *)SvRV (ST (0)); 977 AV *env = (AV *)SvRV (ST (0));
922 for (int i = AvFILL (envv) + 1; i--; ) 978 for (int i = AvFILL (env) + 1; i--; )
923 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 979 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
924 980
925 term->envv->push_back (0); 981 envv->push_back (0);
926 982
927 bool success; 983 bool success;
928 984
929 try 985 try
930 { 986 {
931 success = term->init (term->argv->size (), term->argv->begin ()); 987 success = term->init (argv, envv);
932 } 988 }
933 catch (const class rxvt_failure_exception &e) 989 catch (const class rxvt_failure_exception &e)
934 { 990 {
935 success = false; 991 success = false;
936 } 992 }
… …
1063#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1119#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1064#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1120#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1065#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1121#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1066#define TERM_OFFSET_focus TERM_OFFSET(focus) 1122#define TERM_OFFSET_focus TERM_OFFSET(focus)
1067#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1123#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1124#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1125#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1126#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1068#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1127#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1069#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1128#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1070#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1129#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1071 1130
1072int 1131int
… …
1079 fbase = TERM_OFFSET_fbase 1138 fbase = TERM_OFFSET_fbase
1080 nrow = TERM_OFFSET_nrow 1139 nrow = TERM_OFFSET_nrow
1081 ncol = TERM_OFFSET_ncol 1140 ncol = TERM_OFFSET_ncol
1082 focus = TERM_OFFSET_focus 1141 focus = TERM_OFFSET_focus
1083 mapped = TERM_OFFSET_mapped 1142 mapped = TERM_OFFSET_mapped
1143 int_bwidth = TERM_OFFSET_int_bwidth
1144 ext_bwidth = TERM_OFFSET_ext_bwidth
1145 lineSpace = TERM_OFFSET_lineSpace
1084 saveLines = TERM_OFFSET_saveLines 1146 saveLines = TERM_OFFSET_saveLines
1085 total_rows = TERM_OFFSET_total_rows 1147 total_rows = TERM_OFFSET_total_rows
1086 top_row = TERM_OFFSET_top_row 1148 top_row = TERM_OFFSET_top_row
1087 CODE: 1149 CODE:
1088 RETVAL = *(int *)((char *)THIS + ix); 1150 RETVAL = *(int *)((char *)THIS + ix);
… …
1093rxvt_term::ModLevel3Mask () 1155rxvt_term::ModLevel3Mask ()
1094 ALIAS: 1156 ALIAS:
1095 ModLevel3Mask = 0 1157 ModLevel3Mask = 0
1096 ModMetaMask = 1 1158 ModMetaMask = 1
1097 ModNumLockMask = 2 1159 ModNumLockMask = 2
1160 current_screen = 3
1161 hidden_cursor = 4
1098 CODE: 1162 CODE:
1099 switch (ix) 1163 switch (ix)
1100 { 1164 {
1101 case 0: RETVAL = THIS->ModLevel3Mask; break; 1165 case 0: RETVAL = THIS->ModLevel3Mask; break;
1102 case 1: RETVAL = THIS->ModMetaMask; break; 1166 case 1: RETVAL = THIS->ModMetaMask; break;
1103 case 2: RETVAL = THIS->ModNumLockMask; break; 1167 case 2: RETVAL = THIS->ModNumLockMask; break;
1168 case 3: RETVAL = THIS->current_screen; break;
1169 case 4: RETVAL = THIS->hidden_cursor; break;
1104 } 1170 }
1105 OUTPUT: 1171 OUTPUT:
1106 RETVAL 1172 RETVAL
1107 1173
1108char * 1174char *
… …
1146 if (events != EVENT_UNDEF) 1212 if (events != EVENT_UNDEF)
1147 THIS->pty_ev.set (events); 1213 THIS->pty_ev.set (events);
1148 OUTPUT: 1214 OUTPUT:
1149 RETVAL 1215 RETVAL
1150 1216
1217int
1218rxvt_term::pty_fd ()
1219 CODE:
1220 RETVAL = THIS->pty->pty;
1221 OUTPUT:
1222 RETVAL
1223
1151Window 1224Window
1152rxvt_term::parent () 1225rxvt_term::parent ()
1153 CODE: 1226 CODE:
1154 RETVAL = THIS->parent [0]; 1227 RETVAL = THIS->parent [0];
1155 OUTPUT: 1228 OUTPUT:
… …
1188} 1261}
1189 OUTPUT: 1262 OUTPUT:
1190 RETVAL 1263 RETVAL
1191 1264
1192void 1265void
1266rxvt_term::focus_in ()
1267
1268void
1269rxvt_term::focus_out ()
1270
1271void
1193rxvt_term::want_refresh () 1272rxvt_term::want_refresh ()
1194 CODE: 1273 CODE:
1195 THIS->want_refresh = 1; 1274 THIS->want_refresh = 1;
1196 1275
1197void 1276void
… …
1203 1282
1204 line_t &l = ROW(row_number); 1283 line_t &l = ROW(row_number);
1205 1284
1206 if (GIMME_V != G_VOID) 1285 if (GIMME_V != G_VOID)
1207 { 1286 {
1208 wchar_t *wstr = new wchar_t [THIS->ncol]; 1287 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1209 1288
1210 for (int col = 0; col < THIS->ncol; col++) 1289 for (int col = 0; col < THIS->ncol; col++)
1211 wstr [col] = l.t [col]; 1290 wstr [col] = l.t [col];
1212 1291
1213 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1292 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1214
1215 delete [] wstr;
1216 } 1293 }
1217 1294
1218 if (new_text) 1295 if (new_text)
1219 { 1296 {
1220 wchar_t *wstr = sv2wcs (new_text); 1297 wchar_t *wstr = sv2wcs (new_text);
1221 1298
1222 int len = min (wcslen (wstr) - start_ofs, max_len); 1299 int len = min (wcslen (wstr) - start_ofs, max_len);
1223 1300
1224 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1301 if (start_col < 0 || start_col + len > THIS->ncol)
1225 { 1302 {
1226 free (wstr); 1303 free (wstr);
1227 croak ("new_text extends beyond horizontal margins"); 1304 croak ("new_text extends beyond horizontal margins");
1228 } 1305 }
1229 1306
… …
1263 croak ("new_rend must be arrayref"); 1340 croak ("new_rend must be arrayref");
1264 1341
1265 AV *av = (AV *)SvRV (new_rend); 1342 AV *av = (AV *)SvRV (new_rend);
1266 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1343 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1267 1344
1268 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1345 if (start_col < 0 || start_col + len > THIS->ncol)
1269 croak ("new_rend array extends beyond horizontal margins"); 1346 croak ("new_rend array extends beyond horizontal margins");
1270 1347
1271 for (int col = start_col; col < start_col + len; col++) 1348 for (int col = start_col; col < start_col + len; col++)
1272 { 1349 {
1273 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1350 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1313rxvt_term::special_encode (SV *string) 1390rxvt_term::special_encode (SV *string)
1314 CODE: 1391 CODE:
1315{ 1392{
1316 wchar_t *wstr = sv2wcs (string); 1393 wchar_t *wstr = sv2wcs (string);
1317 int wlen = wcslen (wstr); 1394 int wlen = wcslen (wstr);
1318 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1395 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1319 1396
1320 rxvt_push_locale (THIS->locale); 1397 rxvt_push_locale (THIS->locale);
1321 1398
1322 wchar_t *r = rstr; 1399 wchar_t *r = rstr;
1323 for (wchar_t *s = wstr; *s; s++) 1400 for (wchar_t *s = wstr; *s; s++)
1401 {
1402 int w = WCWIDTH (*s);
1403
1324 if (wcwidth (*s) == 0) 1404 if (w == 0)
1325 { 1405 {
1326 if (r == rstr) 1406 if (r == rstr)
1327 croak ("leading combining character unencodable"); 1407 croak ("leading combining character unencodable");
1328 1408
1329 unicode_t n = rxvt_compose (r[-1], *s); 1409 unicode_t n = rxvt_compose (r[-1], *s);
1330 if (n == NOCHAR) 1410 if (n == NOCHAR)
1331 n = rxvt_composite.compose (r[-1], *s); 1411 n = rxvt_composite.compose (r[-1], *s);
1332 1412
1333 r[-1] = n; 1413 r[-1] = n;
1334 } 1414 }
1335#if !UNICODE_3 1415#if !UNICODE_3
1336 else if (*s >= 0x10000) 1416 else if (*s >= 0x10000)
1337 *r++ = rxvt_composite.compose (*s); 1417 *r++ = rxvt_composite.compose (*s);
1338#endif 1418#endif
1339 else 1419 else
1340 *r++ = *s; 1420 *r++ = *s;
1421
1422 // the *2 above only allows wcwidth <= 2
1423 if (w > 1)
1424 *r++ = NOCHAR;
1425 }
1341 1426
1342 rxvt_pop_locale (); 1427 rxvt_pop_locale ();
1343 1428
1344 RETVAL = wcs2sv (rstr, r - rstr); 1429 RETVAL = wcs2sv (rstr, r - rstr);
1345
1346 delete [] rstr;
1347} 1430}
1348 OUTPUT: 1431 OUTPUT:
1349 RETVAL 1432 RETVAL
1350 1433
1351SV * 1434SV *
… …
1363 else if (IS_COMPOSE (*s)) 1446 else if (IS_COMPOSE (*s))
1364 dlen += rxvt_composite.expand (*s, 0); 1447 dlen += rxvt_composite.expand (*s, 0);
1365 else 1448 else
1366 dlen++; 1449 dlen++;
1367 1450
1368 wchar_t *rstr = new wchar_t [dlen]; 1451 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1369 1452
1370 // decode 1453 // decode
1371 wchar_t *r = rstr; 1454 wchar_t *r = rstr;
1372 for (wchar_t *s = wstr; *s; s++) 1455 for (wchar_t *s = wstr; *s; s++)
1373 if (*s == NOCHAR) 1456 if (*s == NOCHAR)
… …
1376 r += rxvt_composite.expand (*s, r); 1459 r += rxvt_composite.expand (*s, r);
1377 else 1460 else
1378 *r++ = *s; 1461 *r++ = *s;
1379 1462
1380 RETVAL = wcs2sv (rstr, r - rstr); 1463 RETVAL = wcs2sv (rstr, r - rstr);
1381
1382 delete [] rstr;
1383} 1464}
1384 OUTPUT: 1465 OUTPUT:
1385 RETVAL 1466 RETVAL
1386 1467
1387void 1468void
… …
1497 if (items == 3) 1578 if (items == 3)
1498 { 1579 {
1499 rc.row = SvIV (ST (1)); 1580 rc.row = SvIV (ST (1));
1500 rc.col = SvIV (ST (2)); 1581 rc.col = SvIV (ST (2));
1501 1582
1502 if (ix == 2 && rc.col == 0) 1583 if (ix == 2)
1503 { 1584 {
1585 if (rc.col == 0)
1586 {
1587 // col == 0 means end of previous line
1504 rc.row--; 1588 rc.row--;
1505 rc.col = THIS->ncol; 1589 rc.col = THIS->ncol;
1590 }
1591 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1592 && rc.col > ROW(rc.row).l)
1593 {
1594 // col >= length means while line and add newline
1595 rc.col = THIS->ncol;
1596 }
1506 } 1597 }
1507 1598
1508 clamp_it (rc.col, 0, THIS->ncol); 1599 clamp_it (rc.col, 0, THIS->ncol);
1509 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1600 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1510 1601
… …
1557void 1648void
1558rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1649rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1559 1650
1560void 1651void
1561rxvt_term::scr_bell () 1652rxvt_term::scr_bell ()
1653
1654void
1655rxvt_term::scr_change_screen (int screen)
1562 1656
1563void 1657void
1564rxvt_term::scr_add_lines (SV *string) 1658rxvt_term::scr_add_lines (SV *string)
1565 CODE: 1659 CODE:
1566{ 1660{
… …
1634 Atom type; 1728 Atom type;
1635 int format; 1729 int format;
1636 unsigned long nitems; 1730 unsigned long nitems;
1637 unsigned long bytes_after; 1731 unsigned long bytes_after;
1638 unsigned char *prop; 1732 unsigned char *prop;
1733
1639 XGetWindowProperty (THIS->display->display, window, property, 1734 XGetWindowProperty (THIS->display->display, window, property,
1640 0, 1<<30, 0, AnyPropertyType, 1735 0, 1<<24, 0, AnyPropertyType,
1641 &type, &format, &nitems, &bytes_after, &prop); 1736 &type, &format, &nitems, &bytes_after, &prop);
1737
1642 if (type != None) 1738 if (type != None)
1643 { 1739 {
1740 int elemsize = format == 16 ? sizeof (short)
1741 : format == 32 ? sizeof (long)
1742 : 1;
1743
1644 EXTEND (SP, 3); 1744 EXTEND (SP, 3);
1645 PUSHs (newSVuv ((U32)type)); 1745 PUSHs (newSVuv ((U32)type));
1646 PUSHs (newSViv (format)); 1746 PUSHs (newSViv (format));
1647 PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); 1747 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1648 XFree (prop); 1748 XFree (prop);
1649 } 1749 }
1650} 1750}
1651 1751
1652void 1752void
… …
1654 CODE: 1754 CODE:
1655{ 1755{
1656 STRLEN len; 1756 STRLEN len;
1657 char *data_ = SvPVbyte (data, len); 1757 char *data_ = SvPVbyte (data, len);
1658 1758
1759 int elemsize = format == 16 ? sizeof (short)
1760 : format == 32 ? sizeof (long)
1761 : 1;
1762
1659 XChangeProperty (THIS->display->display, window, property, 1763 XChangeProperty (THIS->display->display, window, property,
1660 type, format, PropModeReplace, 1764 type, format, PropModeReplace,
1661 (unsigned char *)data, len * 8 / format); 1765 (unsigned char *)data_, len / elemsize);
1766 XSync (THIS->display->display, 0);
1662} 1767}
1768
1769Atom
1770XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1771 C_ARGS: term->display->display, atom_name, only_if_exists
1772
1773char *
1774XGetAtomName (rxvt_term *term, Atom atom)
1775 C_ARGS: term->display->display, atom
1776 CLEANUP:
1777 XFree (RETVAL);
1663 1778
1664void 1779void
1665XDeleteProperty (rxvt_term *term, Window window, Atom property) 1780XDeleteProperty (rxvt_term *term, Window window, Atom property)
1666 C_ARGS: term->display->display, window, property 1781 C_ARGS: term->display->display, window, property
1667 1782
… …
1669rxvt_term::DefaultRootWindow () 1784rxvt_term::DefaultRootWindow ()
1670 CODE: 1785 CODE:
1671 RETVAL = THIS->display->root; 1786 RETVAL = THIS->display->root;
1672 OUTPUT: 1787 OUTPUT:
1673 RETVAL 1788 RETVAL
1789
1790#if 0
1674 1791
1675Window 1792Window
1676XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1793XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1677 C_ARGS: term->display->display, (Window)parent, 1794 C_ARGS: term->display->display, (Window)parent,
1678 x, y, width, height, 0, 1795 x, y, width, height, 0,
1679 term->pix_colors_focused[Color_border], 1796 term->pix_colors_focused[Color_border],
1680 term->pix_colors_focused[Color_border] 1797 term->pix_colors_focused[Color_border]
1681 1798
1799#endif
1800
1682void 1801void
1683XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1802XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1684 C_ARGS: term->display->display, window, parent, x, y 1803 C_ARGS: term->display->display, window, parent, x, y
1685 1804
1686void 1805void
… …
1691XUnmapWindow (rxvt_term *term, Window window) 1810XUnmapWindow (rxvt_term *term, Window window)
1692 C_ARGS: term->display->display, window 1811 C_ARGS: term->display->display, window
1693 1812
1694void 1813void
1695XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1814XMoveResizeWindow (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 1815 C_ARGS: term->display->display, window, x, y, width, height
1816
1817void
1818rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1819 CODE:
1820{
1821 XWindowAttributes attr;
1822 XGetWindowAttributes (THIS->display->display, window, &attr);
1823 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1824}
1825
1826void
1827rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1828 PPCODE:
1829{
1830 int dx, dy;
1831 Window child;
1832
1833 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1834 {
1835 EXTEND (SP, 3);
1836 PUSHs (newSViv (dx));
1837 PUSHs (newSViv (dy));
1838 PUSHs (newSVuv (child));
1839 }
1840}
1697 1841
1698############################################################################# 1842#############################################################################
1699# urxvt::overlay 1843# urxvt::overlay
1700############################################################################# 1844#############################################################################
1701 1845
… …
1847 w->self = (HV *)SvRV (RETVAL); 1991 w->self = (HV *)SvRV (RETVAL);
1848 OUTPUT: 1992 OUTPUT:
1849 RETVAL 1993 RETVAL
1850 1994
1851CHAINED 1995CHAINED
1852iow::start () 1996iw::start ()
1853 CODE: 1997 CODE:
1854 THIS->start (); 1998 THIS->start ();
1855 OUTPUT: 1999 OUTPUT:
1856 RETVAL 2000 RETVAL
1857 2001
1858CHAINED 2002CHAINED
1859iow::stop () 2003iw::stop ()
1860 CODE: 2004 CODE:
1861 THIS->stop (); 2005 THIS->stop ();
1862 OUTPUT: 2006 OUTPUT:
1863 RETVAL 2007 RETVAL
1864 2008
… …
1886 THIS->start (pid); 2030 THIS->start (pid);
1887 OUTPUT: 2031 OUTPUT:
1888 RETVAL 2032 RETVAL
1889 2033
1890CHAINED 2034CHAINED
1891iow::stop () 2035pw::stop ()
1892 CODE: 2036 CODE:
1893 THIS->stop (); 2037 THIS->stop ();
1894 OUTPUT: 2038 OUTPUT:
1895 RETVAL 2039 RETVAL
1896 2040

Diff Legend

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