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.63 by root, Fri Jan 13 05:06:44 2006 UTC vs.
Revision 1.67 by root, Sun Jan 15 06:02:41 2006 UTC

… …
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55#define ENABLE_PERL_FRILLS 1
56
55///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
56 58
57static SV * 59static SV *
58taint (SV *sv) 60taint (SV *sv)
59{ 61{
… …
347 for (int y = ov_h; y--; ) 349 for (int y = ov_h; y--; )
348 { 350 {
349 text_t *t1 = text [y]; 351 text_t *t1 = text [y];
350 rend_t *r1 = rend [y]; 352 rend_t *r1 = rend [y];
351 353
352 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 354 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
353 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 355 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
354 356
355 for (int x = ov_w; x--; ) 357 for (int x = ov_w; x--; )
356 { 358 {
357 text_t t = *t1; *t1++ = *t2; *t2++ = t; 359 text_t t = *t1; *t1++ = *t2; *t2++ = t;
358 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 360 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
… …
443 if (THIS->perl.grabtime) 445 if (THIS->perl.grabtime)
444 { 446 {
445 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
446 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
447 THIS->perl.grabtime = 0; 449 THIS->perl.grabtime = 0;
450 }
451}
452
453static void
454swap_overlays (rxvt_term *term)
455{
456 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
457
458 if (HvKEYS (hv))
459 {
460 hv_iterinit (hv);
461
462 while (HE *he = hv_iternext (hv))
463 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
448 } 464 }
449} 465}
450 466
451bool 467bool
452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
465 { 481 {
466 // handled later 482 // handled later
467 } 483 }
468 else 484 else
469 { 485 {
470 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 486 if (htype == HOOK_REFRESH_END)
487 swap_overlays (term);
488
489 if (!term->perl.should_invoke [htype])
471 { 490 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 491 if (htype == HOOK_REFRESH_BEGIN)
492 swap_overlays (term);
473 493
474 if (HvKEYS (hv)) 494 return false;
475 {
476 hv_iterinit (hv);
477
478 while (HE *he = hv_iternext (hv))
479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
482 } 495 }
483
484 if (!term->perl.should_invoke [htype])
485 return false;
486 } 496 }
487 497
488 swap (perl_environ, environ); 498 swap (perl_environ, environ);
489 499
490 try 500 try
… …
611 { 621 {
612 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 622 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
613 ungrab (term); // better lose the grab than the session 623 ungrab (term); // better lose the grab than the session
614 } 624 }
615 625
626 if (htype == HOOK_REFRESH_BEGIN)
627 swap_overlays (term);
616 if (htype == HOOK_DESTROY) 628 else if (htype == HOOK_DESTROY)
617 { 629 {
618 clearSVptr ((SV *)term->perl.self); 630 clearSVptr ((SV *)term->perl.self);
619 SvREFCNT_dec ((SV *)term->perl.self); 631 SvREFCNT_dec ((SV *)term->perl.self);
620 } 632 }
621 633
… …
891 RETVAL 903 RETVAL
892 904
893void 905void
894rxvt_term::destroy () 906rxvt_term::destroy ()
895 907
908#if ENABLE_PERL_FRILLS
909
910void
911rxvt_term::XListProperties (U32 window)
912 PPCODE:
913{
914 int count;
915 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
916
917 EXTEND (SP, count);
918 while (count--)
919 PUSHs (newSVuv ((U32)props [count]));
920
921 XFree (props);
922}
923
924void
925rxvt_term::XGetWindowProperty (U32 window, U32 property)
926 PPCODE:
927{
928 Atom type;
929 int format;
930 unsigned long nitems;
931 unsigned long bytes_after;
932 unsigned char *prop;
933 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
934 0, 1<<30, 0, AnyPropertyType,
935 &type, &format, &nitems, &bytes_after, &prop);
936 if (type != None)
937 {
938 EXTEND (SP, 3);
939 PUSHs (newSVuv ((U32)type));
940 PUSHs (newSViv (format));
941 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
942 XFree (prop);
943 }
944}
945
946void
947rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
948 CODE:
949{
950 STRLEN len;
951 char *data_ = SvPVbyte (data, len);
952
953 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
954 type, format, PropModeReplace,
955 (unsigned char *)data, len * 8 / format);
956}
957
958void
959rxvt_term::XDeleteProperty (U32 window, U32 property)
960 CODE:
961 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
962
963U32
964rxvt_term::DefaultRootWindow ()
965 CODE:
966 RETVAL = (U32)THIS->display->root;
967 OUTPUT:
968 RETVAL
969
970U32
971rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
972 CODE:
973 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
974 x, y, width, height, 0,
975 THIS->pix_colors_focused[Color_border],
976 THIS->pix_colors_focused[Color_border]);
977 OUTPUT:
978 RETVAL
979
980void
981rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
982 CODE:
983 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
984
985void
986rxvt_term::XMapWindow (U32 window)
987 CODE:
988 XMapWindow (THIS->display->display, (Window)window);
989
990void
991rxvt_term::XUnmapWindow (U32 window)
992 CODE:
993 XUnmapWindow (THIS->display->display, (Window)window);
994
995#endif
996
896void 997void
897rxvt_term::set_should_invoke (int htype, int inc) 998rxvt_term::set_should_invoke (int htype, int inc)
898 CODE: 999 CODE:
899 THIS->perl.should_invoke [htype] += inc; 1000 THIS->perl.should_invoke [htype] += inc;
900 1001
… …
1008#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1109#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1009#define TERM_OFFSET_focus TERM_OFFSET(focus) 1110#define TERM_OFFSET_focus TERM_OFFSET(focus)
1010#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1111#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1011#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1112#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1012#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1113#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1013#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1114#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1014 1115
1015int 1116int
1016rxvt_term::width () 1117rxvt_term::width ()
1017 ALIAS: 1118 ALIAS:
1018 width = TERM_OFFSET_width 1119 width = TERM_OFFSET_width
… …
1024 ncol = TERM_OFFSET_ncol 1125 ncol = TERM_OFFSET_ncol
1025 focus = TERM_OFFSET_focus 1126 focus = TERM_OFFSET_focus
1026 mapped = TERM_OFFSET_mapped 1127 mapped = TERM_OFFSET_mapped
1027 saveLines = TERM_OFFSET_saveLines 1128 saveLines = TERM_OFFSET_saveLines
1028 total_rows = TERM_OFFSET_total_rows 1129 total_rows = TERM_OFFSET_total_rows
1029 nsaved = TERM_OFFSET_nsaved 1130 top_row = TERM_OFFSET_top_row
1030 CODE: 1131 CODE:
1031 RETVAL = *(int *)((char *)THIS + ix); 1132 RETVAL = *(int *)((char *)THIS + ix);
1032 OUTPUT: 1133 OUTPUT:
1033 RETVAL 1134 RETVAL
1034 1135
… …
1118 THIS->rstyle = new_rstyle; 1219 THIS->rstyle = new_rstyle;
1119 OUTPUT: 1220 OUTPUT:
1120 RETVAL 1221 RETVAL
1121 1222
1122int 1223int
1123rxvt_term::view_start (int newval = -1) 1224rxvt_term::view_start (int newval = 1)
1124 PROTOTYPE: $;$ 1225 PROTOTYPE: $;$
1125 CODE: 1226 CODE:
1126{ 1227{
1127 RETVAL = THIS->view_start; 1228 RETVAL = THIS->view_start;
1128 1229
1129 if (newval >= 0) 1230 if (newval <= 0)
1130 { 1231 THIS->scr_changeview (max (newval, THIS->top_row));
1131 THIS->view_start = min (newval, THIS->nsaved);
1132 THIS->scr_changeview (RETVAL);
1133 }
1134} 1232}
1135 OUTPUT: 1233 OUTPUT:
1136 RETVAL 1234 RETVAL
1137 1235
1138void 1236void
… …
1142 1240
1143void 1241void
1144rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1242rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1145 PPCODE: 1243 PPCODE:
1146{ 1244{
1147 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1245 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1148 XSRETURN_EMPTY; 1246 XSRETURN_EMPTY;
1149 1247
1150 line_t &l = ROW(row_number); 1248 line_t &l = ROW(row_number);
1151 1249
1152 if (GIMME_V != G_VOID) 1250 if (GIMME_V != G_VOID)
… …
1185 1283
1186void 1284void
1187rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1285rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1188 PPCODE: 1286 PPCODE:
1189{ 1287{
1190 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1288 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1191 XSRETURN_EMPTY; 1289 XSRETURN_EMPTY;
1192 1290
1193 line_t &l = ROW(row_number); 1291 line_t &l = ROW(row_number);
1194 1292
1195 if (GIMME_V != G_VOID) 1293 if (GIMME_V != G_VOID)
… …
1225 1323
1226int 1324int
1227rxvt_term::ROW_l (int row_number, int new_length = -1) 1325rxvt_term::ROW_l (int row_number, int new_length = -1)
1228 CODE: 1326 CODE:
1229{ 1327{
1230 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1328 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1231 XSRETURN_EMPTY; 1329 XSRETURN_EMPTY;
1232 1330
1233 line_t &l = ROW(row_number); 1331 line_t &l = ROW(row_number);
1234 RETVAL = l.l; 1332 RETVAL = l.l;
1235 1333
… …
1241 1339
1242bool 1340bool
1243rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1341rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1244 CODE: 1342 CODE:
1245{ 1343{
1246 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1344 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1247 XSRETURN_EMPTY; 1345 XSRETURN_EMPTY;
1248 1346
1249 line_t &l = ROW(row_number); 1347 line_t &l = ROW(row_number);
1250 RETVAL = l.is_longer (); 1348 RETVAL = l.is_longer ();
1251 1349
… …
1441 PUSHs (sv_2mortal (newSViv (rc.col))); 1539 PUSHs (sv_2mortal (newSViv (rc.col)));
1442 } 1540 }
1443 1541
1444 if (items == 3) 1542 if (items == 3)
1445 { 1543 {
1446 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1544 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1447 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1545 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1448 1546
1449 if (ix) 1547 if (ix)
1450 THIS->want_refresh = 1; 1548 THIS->want_refresh = 1;
1451 } 1549 }

Diff Legend

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