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.125 by root, Fri Aug 22 15:36:45 2008 UTC vs.
Revision 1.131 by root, Sun May 23 00:08:53 2010 UTC

… …
107 107
108///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
109 109
110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
111 111
112class overlay { 112class overlay : overlay_base
113{
113 rxvt_term *THIS; 114 rxvt_term *THIS;
114 AV *overlay_av; 115 AV *overlay_av;
115 int x, y, w, h;
116 int border; 116 int border;
117 text_t **text;
118 rend_t **rend;
119 117
120public: 118public:
121 HV *self; 119 HV *self;
122 120
123 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 121 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
130 128
131 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
132}; 130};
133 131
134overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 132overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
135: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 133: THIS(THIS), border(border == 2), overlay_av (0)
136{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
137 if (w < 0) w = 0; 140 if (w < 0) w = 0;
138 if (h < 0) h = 0; 141 if (h < 0) h = 0;
139 142
140 if (border == 2) 143 if (border == 2)
141 { 144 {
… …
244 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 247 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
245 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 248 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
246 249
247 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
248 int ov_h = min (h, THIS->nrow - ov_y); 251 int ov_h = min (h, THIS->nrow - ov_y);
252
253 // hide cursor if it is within the overlay area
254 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
255 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
256 THIS->screen.flags &= ~Screen_VisibleCursor;
249 257
250 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
251 { 259 {
252 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
253 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
646 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
647# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
648 const_iv (NUM_RESOURCES), 656 const_iv (NUM_RESOURCES),
649 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
650 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
659 const_iv (Color_Bits),
660 const_iv (RS_bgShift), const_iv (RS_bgMask),
661 const_iv (RS_fgShift), const_iv (RS_fgMask),
662 const_iv (RS_Careful),
663 const_iv (RS_fontCount),
664 const_iv (RS_fontShift),
665 const_iv (RS_fontMask),
666 const_iv (RS_baseattrMask),
667 const_iv (RS_attrMask),
668 const_iv (RS_redraw),
669 const_iv (RS_Sel),
651 const_iv (RS_Bold), 670 const_iv (RS_Bold),
652 const_iv (RS_Italic), 671 const_iv (RS_Italic),
653 const_iv (RS_Blink), 672 const_iv (RS_Blink),
654 const_iv (RS_RVid), 673 const_iv (RS_RVid),
655 const_iv (RS_Uline), 674 const_iv (RS_Uline),
… …
1047 OUTPUT: 1066 OUTPUT:
1048 RETVAL 1067 RETVAL
1049 1068
1050#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1069#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1051 1070
1052#define TERM_OFFSET_width TERM_OFFSET(width) 1071#define TERM_OFFSET_width TERM_OFFSET(width)
1053#define TERM_OFFSET_height TERM_OFFSET(height) 1072#define TERM_OFFSET_height TERM_OFFSET(height)
1054#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1073#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1055#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1074#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1056#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1075#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1057#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1076#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1058#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1077#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1059#define TERM_OFFSET_focus TERM_OFFSET(focus) 1078#define TERM_OFFSET_focus TERM_OFFSET(focus)
1060#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1079#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1061#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1080#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1062#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1081#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1063#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1082#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1083#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1064#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1084#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1065#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1085#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1066#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1086#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1067 1087
1068int 1088int
1069rxvt_term::width () 1089rxvt_term::width ()
1070 ALIAS: 1090 ALIAS:
1071 width = TERM_OFFSET_width 1091 width = TERM_OFFSET_width
1072 height = TERM_OFFSET_height 1092 height = TERM_OFFSET_height
1073 fwidth = TERM_OFFSET_fwidth 1093 fwidth = TERM_OFFSET_fwidth
1074 fheight = TERM_OFFSET_fheight 1094 fheight = TERM_OFFSET_fheight
1075 fbase = TERM_OFFSET_fbase 1095 fbase = TERM_OFFSET_fbase
1076 nrow = TERM_OFFSET_nrow 1096 nrow = TERM_OFFSET_nrow
1077 ncol = TERM_OFFSET_ncol 1097 ncol = TERM_OFFSET_ncol
1078 focus = TERM_OFFSET_focus 1098 focus = TERM_OFFSET_focus
1079 mapped = TERM_OFFSET_mapped 1099 mapped = TERM_OFFSET_mapped
1080 int_bwidth = TERM_OFFSET_int_bwidth 1100 int_bwidth = TERM_OFFSET_int_bwidth
1081 ext_bwidth = TERM_OFFSET_ext_bwidth 1101 ext_bwidth = TERM_OFFSET_ext_bwidth
1082 lineSpace = TERM_OFFSET_lineSpace 1102 lineSpace = TERM_OFFSET_lineSpace
1103 letterSpace = TERM_OFFSET_letterSpace
1083 saveLines = TERM_OFFSET_saveLines 1104 saveLines = TERM_OFFSET_saveLines
1084 total_rows = TERM_OFFSET_total_rows 1105 total_rows = TERM_OFFSET_total_rows
1085 top_row = TERM_OFFSET_top_row 1106 top_row = TERM_OFFSET_top_row
1086 CODE: 1107 CODE:
1087 RETVAL = *(int *)((char *)THIS + ix); 1108 RETVAL = *(int *)((char *)THIS + ix);
1088 OUTPUT: 1109 OUTPUT:
1089 RETVAL 1110 RETVAL
1090 1111
… …
1540 EXTEND (SP, 2); 1561 EXTEND (SP, 2);
1541 PUSHs (sv_2mortal (newSViv (rc.row))); 1562 PUSHs (sv_2mortal (newSViv (rc.row)));
1542 PUSHs (sv_2mortal (newSViv (rc.col))); 1563 PUSHs (sv_2mortal (newSViv (rc.col)));
1543 } 1564 }
1544 1565
1545 if (items == 3) 1566 if (items >= 3)
1546 { 1567 {
1547 rc.row = SvIV (ST (1)); 1568 rc.row = SvIV (ST (1));
1548 rc.col = SvIV (ST (2)); 1569 rc.col = SvIV (ST (2));
1549 1570
1550 if (ix == 2) 1571 if (ix == 2)
… …
1566 clamp_it (rc.col, 0, THIS->ncol); 1587 clamp_it (rc.col, 0, THIS->ncol);
1567 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1588 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1568 1589
1569 if (ix) 1590 if (ix)
1570 { 1591 {
1592 THIS->selection.screen = THIS->current_screen;
1593
1571 THIS->want_refresh = 1; 1594 THIS->want_refresh = 1;
1572 THIS->refresh_check (); 1595 THIS->refresh_check ();
1573 } 1596 }
1574 } 1597 }
1575} 1598}
1576 1599
1577char 1600int
1578rxvt_term::cur_charset () 1601rxvt_term::selection_screen (int screen = -1)
1579 CODE: 1602 CODE:
1580 RETVAL = THIS->charsets [THIS->screen.charset]; 1603 RETVAL = THIS->selection.screen;
1581 OUTPUT: 1604 if (screen >= 0)
1605 THIS->selection.screen = screen;
1606 OUTPUT:
1582 RETVAL 1607 RETVAL
1583 1608
1584void 1609void
1585rxvt_term::selection_clear () 1610rxvt_term::selection_clear (bool clipboard = false)
1586 1611
1587void 1612void
1588rxvt_term::selection_make (Time eventtime, bool rect = false) 1613rxvt_term::selection_make (Time eventtime, bool rect = false)
1589 CODE: 1614 CODE:
1590 THIS->selection.op = SELECTION_CONT; 1615 THIS->selection.op = SELECTION_CONT;
1591 THIS->selection.rect = rect; 1616 THIS->selection.rect = rect;
1592 THIS->selection_make (eventtime); 1617 THIS->selection_make (eventtime);
1593 1618
1594int 1619int
1595rxvt_term::selection_grab (Time eventtime) 1620rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1596 1621
1597void 1622void
1598rxvt_term::selection (SV *newtext = 0) 1623rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1599 PPCODE: 1624 PPCODE:
1600{ 1625{
1626 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1627 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1628
1601 if (GIMME_V != G_VOID) 1629 if (GIMME_V != G_VOID)
1602 XPUSHs (THIS->selection.text 1630 XPUSHs (text
1603 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1631 ? sv_2mortal (wcs2sv (text, len))
1604 : &PL_sv_undef); 1632 : &PL_sv_undef);
1605 1633
1606 if (newtext) 1634 if (newtext)
1607 { 1635 {
1608 free (THIS->selection.text); 1636 free (text);
1609 1637
1610 THIS->selection.text = sv2wcs (newtext); 1638 text = sv2wcs (newtext);
1611 THIS->selection.len = wcslen (THIS->selection.text); 1639 len = wcslen (text);
1612 } 1640 }
1613} 1641}
1642
1643char
1644rxvt_term::cur_charset ()
1645 CODE:
1646 RETVAL = THIS->charsets [THIS->screen.charset];
1647 OUTPUT:
1648 RETVAL
1614 1649
1615void 1650void
1616rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) 1651rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1617 1652
1618void 1653void

Diff Legend

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