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.91 by root, Wed Jan 25 00:42:21 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
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
829 }; 884 };
830 885
831 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 886 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
832 civ-- > const_iv; ) 887 civ-- > const_iv; )
833 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
910 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 965 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
911 croak ("first argument to urxvt::term->_new must be arrayref"); 966 croak ("first argument to urxvt::term->_new must be arrayref");
912 967
913 rxvt_term *term = new rxvt_term; 968 rxvt_term *term = new rxvt_term;
914 969
915 term->argv = new stringvec; 970 stringvec *argv = new stringvec;
916 term->envv = new stringvec; 971 stringvec *envv = new stringvec;
917 972
918 for (int i = 1; i < items; i++) 973 for (int i = 1; i < items; i++)
919 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 974 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
920 975
921 AV *envv = (AV *)SvRV (ST (0)); 976 AV *env = (AV *)SvRV (ST (0));
922 for (int i = AvFILL (envv) + 1; i--; ) 977 for (int i = AvFILL (env) + 1; i--; )
923 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 978 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
924 979
925 term->envv->push_back (0); 980 envv->push_back (0);
926 981
927 bool success; 982 bool success;
928 983
929 try 984 try
930 { 985 {
931 success = term->init (term->argv->size (), term->argv->begin ()); 986 success = term->init (argv, envv);
932 } 987 }
933 catch (const class rxvt_failure_exception &e) 988 catch (const class rxvt_failure_exception &e)
934 { 989 {
935 success = false; 990 success = false;
936 } 991 }
… …
1063#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1118#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1064#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1119#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1065#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1120#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1066#define TERM_OFFSET_focus TERM_OFFSET(focus) 1121#define TERM_OFFSET_focus TERM_OFFSET(focus)
1067#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1122#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1123#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1124#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1125#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1068#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1126#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1069#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1127#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1070#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1128#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1071 1129
1072int 1130int
… …
1079 fbase = TERM_OFFSET_fbase 1137 fbase = TERM_OFFSET_fbase
1080 nrow = TERM_OFFSET_nrow 1138 nrow = TERM_OFFSET_nrow
1081 ncol = TERM_OFFSET_ncol 1139 ncol = TERM_OFFSET_ncol
1082 focus = TERM_OFFSET_focus 1140 focus = TERM_OFFSET_focus
1083 mapped = TERM_OFFSET_mapped 1141 mapped = TERM_OFFSET_mapped
1142 int_bwidth = TERM_OFFSET_int_bwidth
1143 ext_bwidth = TERM_OFFSET_ext_bwidth
1144 lineSpace = TERM_OFFSET_lineSpace
1084 saveLines = TERM_OFFSET_saveLines 1145 saveLines = TERM_OFFSET_saveLines
1085 total_rows = TERM_OFFSET_total_rows 1146 total_rows = TERM_OFFSET_total_rows
1086 top_row = TERM_OFFSET_top_row 1147 top_row = TERM_OFFSET_top_row
1087 CODE: 1148 CODE:
1088 RETVAL = *(int *)((char *)THIS + ix); 1149 RETVAL = *(int *)((char *)THIS + ix);
… …
1093rxvt_term::ModLevel3Mask () 1154rxvt_term::ModLevel3Mask ()
1094 ALIAS: 1155 ALIAS:
1095 ModLevel3Mask = 0 1156 ModLevel3Mask = 0
1096 ModMetaMask = 1 1157 ModMetaMask = 1
1097 ModNumLockMask = 2 1158 ModNumLockMask = 2
1159 current_screen = 3
1160 hidden_cursor = 4
1098 CODE: 1161 CODE:
1099 switch (ix) 1162 switch (ix)
1100 { 1163 {
1101 case 0: RETVAL = THIS->ModLevel3Mask; break; 1164 case 0: RETVAL = THIS->ModLevel3Mask; break;
1102 case 1: RETVAL = THIS->ModMetaMask; break; 1165 case 1: RETVAL = THIS->ModMetaMask; break;
1103 case 2: RETVAL = THIS->ModNumLockMask; break; 1166 case 2: RETVAL = THIS->ModNumLockMask; break;
1167 case 3: RETVAL = THIS->current_screen; break;
1168 case 4: RETVAL = THIS->hidden_cursor; break;
1104 } 1169 }
1105 OUTPUT: 1170 OUTPUT:
1106 RETVAL 1171 RETVAL
1107 1172
1108char * 1173char *
… …
1146 if (events != EVENT_UNDEF) 1211 if (events != EVENT_UNDEF)
1147 THIS->pty_ev.set (events); 1212 THIS->pty_ev.set (events);
1148 OUTPUT: 1213 OUTPUT:
1149 RETVAL 1214 RETVAL
1150 1215
1216int
1217rxvt_term::pty_fd ()
1218 CODE:
1219 RETVAL = THIS->pty->pty;
1220 OUTPUT:
1221 RETVAL
1222
1151Window 1223Window
1152rxvt_term::parent () 1224rxvt_term::parent ()
1153 CODE: 1225 CODE:
1154 RETVAL = THIS->parent [0]; 1226 RETVAL = THIS->parent [0];
1155 OUTPUT: 1227 OUTPUT:
… …
1188} 1260}
1189 OUTPUT: 1261 OUTPUT:
1190 RETVAL 1262 RETVAL
1191 1263
1192void 1264void
1265rxvt_term::focus_in ()
1266
1267void
1268rxvt_term::focus_out ()
1269
1270void
1193rxvt_term::want_refresh () 1271rxvt_term::want_refresh ()
1194 CODE: 1272 CODE:
1195 THIS->want_refresh = 1; 1273 THIS->want_refresh = 1;
1196 1274
1197void 1275void
… …
1203 1281
1204 line_t &l = ROW(row_number); 1282 line_t &l = ROW(row_number);
1205 1283
1206 if (GIMME_V != G_VOID) 1284 if (GIMME_V != G_VOID)
1207 { 1285 {
1208 wchar_t *wstr = new wchar_t [THIS->ncol]; 1286 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1209 1287
1210 for (int col = 0; col < THIS->ncol; col++) 1288 for (int col = 0; col < THIS->ncol; col++)
1211 wstr [col] = l.t [col]; 1289 wstr [col] = l.t [col];
1212 1290
1213 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1291 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1214
1215 delete [] wstr;
1216 } 1292 }
1217 1293
1218 if (new_text) 1294 if (new_text)
1219 { 1295 {
1220 wchar_t *wstr = sv2wcs (new_text); 1296 wchar_t *wstr = sv2wcs (new_text);
1221 1297
1222 int len = min (wcslen (wstr) - start_ofs, max_len); 1298 int len = min (wcslen (wstr) - start_ofs, max_len);
1223 1299
1224 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1300 if (start_col < 0 || start_col + len > THIS->ncol)
1225 { 1301 {
1226 free (wstr); 1302 free (wstr);
1227 croak ("new_text extends beyond horizontal margins"); 1303 croak ("new_text extends beyond horizontal margins");
1228 } 1304 }
1229 1305
… …
1263 croak ("new_rend must be arrayref"); 1339 croak ("new_rend must be arrayref");
1264 1340
1265 AV *av = (AV *)SvRV (new_rend); 1341 AV *av = (AV *)SvRV (new_rend);
1266 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1342 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1267 1343
1268 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1344 if (start_col < 0 || start_col + len > THIS->ncol)
1269 croak ("new_rend array extends beyond horizontal margins"); 1345 croak ("new_rend array extends beyond horizontal margins");
1270 1346
1271 for (int col = start_col; col < start_col + len; col++) 1347 for (int col = start_col; col < start_col + len; col++)
1272 { 1348 {
1273 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1349 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1313rxvt_term::special_encode (SV *string) 1389rxvt_term::special_encode (SV *string)
1314 CODE: 1390 CODE:
1315{ 1391{
1316 wchar_t *wstr = sv2wcs (string); 1392 wchar_t *wstr = sv2wcs (string);
1317 int wlen = wcslen (wstr); 1393 int wlen = wcslen (wstr);
1318 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1394 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1319 1395
1320 rxvt_push_locale (THIS->locale); 1396 rxvt_push_locale (THIS->locale);
1321 1397
1322 wchar_t *r = rstr; 1398 wchar_t *r = rstr;
1323 for (wchar_t *s = wstr; *s; s++) 1399 for (wchar_t *s = wstr; *s; s++)
1400 {
1401 int w = WCWIDTH (*s);
1402
1324 if (wcwidth (*s) == 0) 1403 if (w == 0)
1325 { 1404 {
1326 if (r == rstr) 1405 if (r == rstr)
1327 croak ("leading combining character unencodable"); 1406 croak ("leading combining character unencodable");
1328 1407
1329 unicode_t n = rxvt_compose (r[-1], *s); 1408 unicode_t n = rxvt_compose (r[-1], *s);
1330 if (n == NOCHAR) 1409 if (n == NOCHAR)
1331 n = rxvt_composite.compose (r[-1], *s); 1410 n = rxvt_composite.compose (r[-1], *s);
1332 1411
1333 r[-1] = n; 1412 r[-1] = n;
1334 } 1413 }
1335#if !UNICODE_3 1414#if !UNICODE_3
1336 else if (*s >= 0x10000) 1415 else if (*s >= 0x10000)
1337 *r++ = rxvt_composite.compose (*s); 1416 *r++ = rxvt_composite.compose (*s);
1338#endif 1417#endif
1339 else 1418 else
1340 *r++ = *s; 1419 *r++ = *s;
1420
1421 // the *2 above only allows wcwidth <= 2
1422 if (w > 1)
1423 *r++ = NOCHAR;
1424 }
1341 1425
1342 rxvt_pop_locale (); 1426 rxvt_pop_locale ();
1343 1427
1344 RETVAL = wcs2sv (rstr, r - rstr); 1428 RETVAL = wcs2sv (rstr, r - rstr);
1345
1346 delete [] rstr;
1347} 1429}
1348 OUTPUT: 1430 OUTPUT:
1349 RETVAL 1431 RETVAL
1350 1432
1351SV * 1433SV *
… …
1363 else if (IS_COMPOSE (*s)) 1445 else if (IS_COMPOSE (*s))
1364 dlen += rxvt_composite.expand (*s, 0); 1446 dlen += rxvt_composite.expand (*s, 0);
1365 else 1447 else
1366 dlen++; 1448 dlen++;
1367 1449
1368 wchar_t *rstr = new wchar_t [dlen]; 1450 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1369 1451
1370 // decode 1452 // decode
1371 wchar_t *r = rstr; 1453 wchar_t *r = rstr;
1372 for (wchar_t *s = wstr; *s; s++) 1454 for (wchar_t *s = wstr; *s; s++)
1373 if (*s == NOCHAR) 1455 if (*s == NOCHAR)
… …
1376 r += rxvt_composite.expand (*s, r); 1458 r += rxvt_composite.expand (*s, r);
1377 else 1459 else
1378 *r++ = *s; 1460 *r++ = *s;
1379 1461
1380 RETVAL = wcs2sv (rstr, r - rstr); 1462 RETVAL = wcs2sv (rstr, r - rstr);
1381
1382 delete [] rstr;
1383} 1463}
1384 OUTPUT: 1464 OUTPUT:
1385 RETVAL 1465 RETVAL
1386 1466
1387void 1467void
… …
1497 if (items == 3) 1577 if (items == 3)
1498 { 1578 {
1499 rc.row = SvIV (ST (1)); 1579 rc.row = SvIV (ST (1));
1500 rc.col = SvIV (ST (2)); 1580 rc.col = SvIV (ST (2));
1501 1581
1502 if (ix == 2 && rc.col == 0) 1582 if (ix == 2)
1503 { 1583 {
1584 if (rc.col == 0)
1585 {
1586 // col == 0 means end of previous line
1504 rc.row--; 1587 rc.row--;
1505 rc.col = THIS->ncol; 1588 rc.col = THIS->ncol;
1589 }
1590 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1591 && rc.col > ROW(rc.row).l)
1592 {
1593 // col >= length means while line and add newline
1594 rc.col = THIS->ncol;
1595 }
1506 } 1596 }
1507 1597
1508 clamp_it (rc.col, 0, THIS->ncol); 1598 clamp_it (rc.col, 0, THIS->ncol);
1509 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1599 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1510 1600
… …
1557void 1647void
1558rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1648rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1559 1649
1560void 1650void
1561rxvt_term::scr_bell () 1651rxvt_term::scr_bell ()
1652
1653void
1654rxvt_term::scr_change_screen (int screen)
1562 1655
1563void 1656void
1564rxvt_term::scr_add_lines (SV *string) 1657rxvt_term::scr_add_lines (SV *string)
1565 CODE: 1658 CODE:
1566{ 1659{
… …
1634 Atom type; 1727 Atom type;
1635 int format; 1728 int format;
1636 unsigned long nitems; 1729 unsigned long nitems;
1637 unsigned long bytes_after; 1730 unsigned long bytes_after;
1638 unsigned char *prop; 1731 unsigned char *prop;
1732
1639 XGetWindowProperty (THIS->display->display, window, property, 1733 XGetWindowProperty (THIS->display->display, window, property,
1640 0, 1<<30, 0, AnyPropertyType, 1734 0, 1<<24, 0, AnyPropertyType,
1641 &type, &format, &nitems, &bytes_after, &prop); 1735 &type, &format, &nitems, &bytes_after, &prop);
1736
1642 if (type != None) 1737 if (type != None)
1643 { 1738 {
1739 int elemsize = format == 16 ? sizeof (short)
1740 : format == 32 ? sizeof (long)
1741 : 1;
1742
1644 EXTEND (SP, 3); 1743 EXTEND (SP, 3);
1645 PUSHs (newSVuv ((U32)type)); 1744 PUSHs (newSVuv ((U32)type));
1646 PUSHs (newSViv (format)); 1745 PUSHs (newSViv (format));
1647 PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); 1746 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1648 XFree (prop); 1747 XFree (prop);
1649 } 1748 }
1650} 1749}
1651 1750
1652void 1751void
… …
1654 CODE: 1753 CODE:
1655{ 1754{
1656 STRLEN len; 1755 STRLEN len;
1657 char *data_ = SvPVbyte (data, len); 1756 char *data_ = SvPVbyte (data, len);
1658 1757
1758 int elemsize = format == 16 ? sizeof (short)
1759 : format == 32 ? sizeof (long)
1760 : 1;
1761
1659 XChangeProperty (THIS->display->display, window, property, 1762 XChangeProperty (THIS->display->display, window, property,
1660 type, format, PropModeReplace, 1763 type, format, PropModeReplace,
1661 (unsigned char *)data, len * 8 / format); 1764 (unsigned char *)data_, len / elemsize);
1765 XSync (THIS->display->display, 0);
1662} 1766}
1767
1768Atom
1769XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1770 C_ARGS: term->display->display, atom_name, only_if_exists
1771
1772char *
1773XGetAtomName (rxvt_term *term, Atom atom)
1774 C_ARGS: term->display->display, atom
1775 CLEANUP:
1776 XFree (RETVAL);
1663 1777
1664void 1778void
1665XDeleteProperty (rxvt_term *term, Window window, Atom property) 1779XDeleteProperty (rxvt_term *term, Window window, Atom property)
1666 C_ARGS: term->display->display, window, property 1780 C_ARGS: term->display->display, window, property
1667 1781
… …
1669rxvt_term::DefaultRootWindow () 1783rxvt_term::DefaultRootWindow ()
1670 CODE: 1784 CODE:
1671 RETVAL = THIS->display->root; 1785 RETVAL = THIS->display->root;
1672 OUTPUT: 1786 OUTPUT:
1673 RETVAL 1787 RETVAL
1788
1789#if 0
1674 1790
1675Window 1791Window
1676XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1792XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1677 C_ARGS: term->display->display, (Window)parent, 1793 C_ARGS: term->display->display, (Window)parent,
1678 x, y, width, height, 0, 1794 x, y, width, height, 0,
1679 term->pix_colors_focused[Color_border], 1795 term->pix_colors_focused[Color_border],
1680 term->pix_colors_focused[Color_border] 1796 term->pix_colors_focused[Color_border]
1681 1797
1798#endif
1799
1682void 1800void
1683XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1801XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1684 C_ARGS: term->display->display, window, parent, x, y 1802 C_ARGS: term->display->display, window, parent, x, y
1685 1803
1686void 1804void
… …
1691XUnmapWindow (rxvt_term *term, Window window) 1809XUnmapWindow (rxvt_term *term, Window window)
1692 C_ARGS: term->display->display, window 1810 C_ARGS: term->display->display, window
1693 1811
1694void 1812void
1695XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1813XMoveResizeWindow (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 1814 C_ARGS: term->display->display, window, x, y, width, height
1815
1816void
1817rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1818 CODE:
1819{
1820 XWindowAttributes attr;
1821 XGetWindowAttributes (THIS->display->display, window, &attr);
1822 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1823}
1824
1825void
1826rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1827 PPCODE:
1828{
1829 int dx, dy;
1830 Window child;
1831
1832 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1833 {
1834 EXTEND (SP, 3);
1835 PUSHs (newSViv (dx));
1836 PUSHs (newSViv (dy));
1837 PUSHs (newSVuv (child));
1838 }
1839}
1697 1840
1698############################################################################# 1841#############################################################################
1699# urxvt::overlay 1842# urxvt::overlay
1700############################################################################# 1843#############################################################################
1701 1844
… …
1847 w->self = (HV *)SvRV (RETVAL); 1990 w->self = (HV *)SvRV (RETVAL);
1848 OUTPUT: 1991 OUTPUT:
1849 RETVAL 1992 RETVAL
1850 1993
1851CHAINED 1994CHAINED
1852iow::start () 1995iw::start ()
1853 CODE: 1996 CODE:
1854 THIS->start (); 1997 THIS->start ();
1855 OUTPUT: 1998 OUTPUT:
1856 RETVAL 1999 RETVAL
1857 2000
1858CHAINED 2001CHAINED
1859iow::stop () 2002iw::stop ()
1860 CODE: 2003 CODE:
1861 THIS->stop (); 2004 THIS->stop ();
1862 OUTPUT: 2005 OUTPUT:
1863 RETVAL 2006 RETVAL
1864 2007
… …
1886 THIS->start (pid); 2029 THIS->start (pid);
1887 OUTPUT: 2030 OUTPUT:
1888 RETVAL 2031 RETVAL
1889 2032
1890CHAINED 2033CHAINED
1891iow::stop () 2034pw::stop ()
1892 CODE: 2035 CODE:
1893 THIS->stop (); 2036 THIS->stop ();
1894 OUTPUT: 2037 OUTPUT:
1895 RETVAL 2038 RETVAL
1896 2039

Diff Legend

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