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.94 by root, Thu Jan 26 00:09:47 2006 UTC

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

Diff Legend

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