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

Diff Legend

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