ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.241 by root, Thu Jan 19 17:37:01 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.2 2003/11/24 17:31:27 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
22/* 23/*
23 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
24 */ 25 */
25 26
26#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
27#define INTERN_SCREEN
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "screen.intpro" /* PROTOS for internal routines */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32 32
33#include <stdint.h> 33#include <inttypes.h>
34#include <wchar.h> 34
35#include "salloc.C" // HACK, should be a seperate compile!
35 36
36inline void fill_text (text_t *start, text_t value, int len) 37inline void fill_text (text_t *start, text_t value, int len)
37{ 38{
38 while (len--) 39 while (len--)
39 *start++ = value; 40 *start++ = value;
40} 41}
41 42
42#define RESET_CHSTAT(H) \
43 if ((H)->chstat == WBYTE) \
44 (H)->chstat = SBYTE, (H)->lost_multi = 1
45
46/* ------------------------------------------------------------------------- */ 43/* ------------------------------------------------------------------------- */
47#define PROP_SIZE 16384 44#define PROP_SIZE 256*1024
48#define TABSIZE 8 /* default tab size */ 45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */
49 47
50/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
51 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
52 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
53#define ZERO_SCROLLBACK(R) \ 51#define ZERO_SCROLLBACK() \
54 if (((R)->Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
55 (R)->TermWin.view_start = 0 53 view_start = 0
56#define CLEAR_SELECTION(R) \ 54#define CLEAR_SELECTION() \
57 (R)->selection.beg.row = (R)->selection.beg.col \ 55 selection.beg.row = selection.beg.col \
58 = (R)->selection.end.row = (R)->selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
59#define CLEAR_ALL_SELECTION(R) \ 57#define CLEAR_ALL_SELECTION() \
60 (R)->selection.beg.row = (R)->selection.beg.col \ 58 selection.beg.row = selection.beg.col \
61 = (R)->selection.mark.row = (R)->selection.mark.col \ 59 = selection.mark.row = selection.mark.col \
62 = (R)->selection.end.row = (R)->selection.end.col = 0 60 = selection.end.row = selection.end.col = 0
63 61
64#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 62#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
65 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 63 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
66#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 64#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
67 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 65 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
68#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 66#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
69 (((A) == (C)) && ((B) > (D))) 67 (((A) == (C)) && ((B) > (D)))
70#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 68#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
71 (((A) == (C)) && ((B) >= (D))) 69 (((A) == (C)) && ((B) >= (D)))
72#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 70#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
73 (((A) == (C)) && ((B) < (D))) 71 (((A) == (C)) && ((B) < (D)))
74#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 72#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
75 (((A) == (C)) && ((B) <= (D))) 73 (((A) == (C)) && ((B) <= (D)))
76 74
77/* these must be row_col_t */ 75/* these must be row_col_t */
78#define ROWCOL_IS_AFTER(X, Y) \ 76#define ROWCOL_IS_AFTER(X, Y) \
79 ROW_AND_COL_IS_AFTER((X).row, (X).col, (Y).row, (Y).col) 77 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
80#define ROWCOL_IS_BEFORE(X, Y) \ 78#define ROWCOL_IS_BEFORE(X, Y) \
81 ROW_AND_COL_IS_BEFORE((X).row, (X).col, (Y).row, (Y).col) 79 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
82#define ROWCOL_IN_ROW_AFTER(X, Y) \ 80#define ROWCOL_IN_ROW_AFTER(X, Y) \
83 ROW_AND_COL_IN_ROW_AFTER((X).row, (X).col, (Y).row, (Y).col) 81 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 82#define ROWCOL_IN_ROW_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_BEFORE((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_AFTER((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
88#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
89 ROW_AND_COL_IN_ROW_AT_OR_BEFORE((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
90 88
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 93 */
96#define drawBuffer (R->TermWin.vt) 94#define drawBuffer vt
97 95
98#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
99 if (R->TermWin.mapped) \ 97 if (mapped) \
100 XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ 98 XClearArea (display->display, drawBuffer, 0, \
101 Row2Pixel(row), (unsigned int)R->TermWin.width, \ 99 Row2Pixel (row), (unsigned int)width, \
102 (unsigned int)Height2Pixel(num), False) 100 (unsigned int)Height2Pixel (num), False)
103 101
104#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
105 if (R->TermWin.mapped) \ 103 if (mapped) \
106 XClearArea(R->Xdisplay, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
107 (unsigned int)Width2Pixel(num), \ 105 (unsigned int)Width2Pixel (num), \
108 (unsigned int)Height2Pixel(1), False) 106 (unsigned int)Height2Pixel (1), False)
109 107
110#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
111 XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, gc, \
112 R->TermWin.int_bwidth, Row2Pixel(row), \ 110 0, Row2Pixel (row), \
113 (unsigned int)R->TermWin.width, \ 111 (unsigned int)width, \
114 (unsigned int)Height2Pixel(num)) 112 (unsigned int)Height2Pixel (num))
115 113
116/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
117 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
118 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117
119/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
120/* INTPROTO */
121void 119void
122rxvt_blank_line(pR_ text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const
123{ 121{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
129 l.touch ();
130
124 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
125 efs = SET_FONT (efs, R->TermWin.fontset->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
126 133
134 text_t *et = l.t + col;
135 rend_t *er = l.r + col;
136
127 while (width--) 137 while (width--)
128 { 138 {
129 *et++ = ' '; 139 *et++ = ' ';
130 *er++ = efs; 140 *er++ = efs;
131 } 141 }
132} 142}
133 143
134/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
135/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
136/* INTPROTO */
137void 146void
138rxvt_blank_screen_mem(pR_ text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
139{ 148{
140 int width = R->TermWin.ncol; 149 scr_blank_line (l, 0, ncol, efs);
141 rend_t *er;
142 150
143#ifdef DEBUG_STRICT 151 l.l = 0;
144 assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); 152 l.f = 0;
145#endif
146 if (tp[row] == NULL) {
147 tp[row] = (text_t *)rxvt_malloc(sizeof(text_t) * width);
148 rp[row] = (rend_t *)rxvt_malloc(sizeof(rend_t) * width);
149 }
150 rxvt_blank_line (aR_ tp[row], rp[row], width, efs);
151} 153}
152 154
153/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
156/* EXTPROTO */ 158
157void 159void
158rxvt_scr_reset(pR) 160rxvt_term::scr_reset ()
159{ 161{
160 unsigned int ncol, nrow, prev_ncol, prev_nrow, 162#if ENABLE_OVERLAY
161 total_rows, prev_total_rows; 163 scr_overlay_off ();
162 unsigned int p, q; 164#endif
163 int k;
164 rend_t setrstyle;
165 165
166 D_SCREEN((stderr, "rxvt_scr_reset()")); 166 view_start = 0;
167
168 R->TermWin.view_start = 0;
169 RESET_CHSTAT(R->h);
170 R->h->num_scr = 0; 167 num_scr = 0;
171 168
172 prev_ncol = R->h->prev_ncol; 169 if (ncol == 0)
173 prev_nrow = R->h->prev_nrow; 170 ncol = 80;
174 if (R->TermWin.ncol == 0) 171
175 R->TermWin.ncol = 80; 172 if (nrow == 0)
176 if (R->TermWin.nrow == 0) 173 nrow = 24;
177 R->TermWin.nrow = 24; 174
178 ncol = R->TermWin.ncol;
179 nrow = R->TermWin.nrow;
180 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
181 return; 176 return;
182 177
178 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2)
180 {
181 //TODO//FIXME
182 saveLines++;
183 prev_nrow--;
184 top_row--;
185 }
186
183 R->h->want_refresh = 1; 187 want_refresh = 1;
184 188
185 total_rows = nrow + R->TermWin.saveLines;
186 prev_total_rows = prev_nrow + R->TermWin.saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
190 total_rows = nrow + saveLines;
187 191
188 R->screen.tscroll = 0; 192 screen.tscroll = 0;
189 R->screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
190 194
191 if (prev_nrow == 0) { 195 if (!row_buf)
192/* 196 {
197 /*
193 * A: first time called so just malloc everything : don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL 199 */
195 */ 200 top_row = 0; /* no saved lines */
196 R->screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); 201 term_start = 0;
197 R->buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *));
198 R->drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *));
199 R->swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *));
200 202
201 R->screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 R->swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 205
204 R->screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 R->buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 R->drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 R->swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *));
208 209
209 for (p = 0; p < nrow; p++) { 210 for (int row = nrow; row--; )
210 q = p + R->TermWin.saveLines; 211 {
211 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
212 q, DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
213 rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
214 p, DEFAULT_RSTYLE); 215 }
215 R->screen.tlen[q] = R->swap.tlen[p] = 0; 216
216 rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, 217 memset (charsets, 'B', sizeof (charsets));
217 p, DEFAULT_RSTYLE);
218 }
219 MEMSET(R->h->charsets, 'B', sizeof(R->h->charsets));
220 R->TermWin.nscrolled = 0; /* no saved lines */
221 R->h->rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
222 R->screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
223 R->screen.cur.row = R->screen.cur.col = 0; 220 screen.cur.row = screen.cur.col = 0;
224 R->screen.charset = 0; 221 screen.charset = 0;
225 R->h->current_screen = PRIMARY; 222 current_screen = PRIMARY;
226 rxvt_scr_cursor(aR_ SAVE); 223 scr_cursor (SAVE);
224
227#if NSCREENS 225#if NSCREENS
228 R->swap.flags = Screen_DefaultFlags; 226 swap.flags = Screen_DefaultFlags;
229 R->swap.cur.row = R->swap.cur.col = 0; 227 swap.cur.row = swap.cur.col = 0;
230 R->swap.charset = 0; 228 swap.charset = 0;
231 R->h->current_screen = SECONDARY; 229 current_screen = SECONDARY;
232 rxvt_scr_cursor(aR_ SAVE); 230 scr_cursor (SAVE);
233 R->h->current_screen = PRIMARY; 231 current_screen = PRIMARY;
234#endif 232#endif
233
235 R->selection.text = NULL; 234 selection.text = NULL;
236 R->selection.len = 0; 235 selection.len = 0;
237 R->selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
238 R->selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
239 R->selection.clicks = 0; 238 selection.clicks = 0;
240 CLEAR_ALL_SELECTION(R); 239 rvideo = 0;
241 R->h->rvideo = 0; 240 }
242 241 else
243 } else { 242 {
244/* 243 /*
245 * B1: add or delete rows as appropriate 244 * add or delete rows as appropriate
246 */ 245 */
247 setrstyle = DEFAULT_RSTYLE;
248 246
247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
248 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
249
250#if 0
249 if (nrow < prev_nrow) { 251 if (nrow < prev_nrow)
250 /* delete rows */ 252 {
251 k = min(R->TermWin.nscrolled, prev_nrow - nrow); 253 for (int row = nrow; row < prev_nrow; row++)
252 rxvt_scroll_text(aR_ 0, (int)prev_nrow - 1, k, 1); 254 {
253 for (p = nrow; p < prev_nrow; p++) { 255 lfree (swap_buf [row]);
254 q = p + R->TermWin.saveLines; 256 lfree (drawn_buf[row]);
255 if (R->screen.text[q]) { 257 }
258 }
259#endif
260
261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
262 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
263
264 for (int row = min (nrow, prev_nrow); row--; )
265 {
266 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]);
268 }
269
270 for (int row = prev_nrow; row < nrow; row++)
271 {
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 }
275
276 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row
282
283 if (top_row)
284 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm.
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
291 do
292 {
293 p = MOD (p - 1, prev_total_rows);
256#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
257 assert(R->screen.rend[q]); 295 assert (old_buf [MOD (p, prev_total_rows)].t);
258#endif 296#endif
259 free(R->screen.text[q]); 297 int plines = 1;
260 free(R->screen.rend[q]); 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
261 } 299
262 if (R->swap.text[p]) { 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 {
302 p = MOD (p - 1, prev_total_rows);
303
304 plines++;
305 llen += prev_ncol;
306 }
307
308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
316 int lofs = 0;
317 line_t *qline;
318
319 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++)
321 {
322 qline = row_buf + qrow;
323 lalloc (*qline);
324 qline->l = ncol;
325 qline->is_longer (1);
326
327 int qcol = 0;
328
329 // see below for cursor adjustment rationale
330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
333 // fill a single destination line
334 while (lofs < llen && qcol < ncol)
335 {
336 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol;
338
339 prow = MOD (p + prow, prev_total_rows);
340
341 // we only adjust the cursor _row_ and put it into
342 // the topmost line of "long line" it was in, as
343 // this seems to upset applications/shells/readline
344 // least.
345 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow);
347
348 line_t &pline = old_buf [prow];
349
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351
263#ifdef DEBUG_STRICT 352#if DEBUG_STRICT
264 assert(R->swap.rend[p]); 353 assert (len);
354 assert (pline.t);
265#endif 355#endif
266 free(R->swap.text[p]); 356
267 free(R->swap.rend[p]); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
268 } 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
269#ifdef DEBUG_STRICT 359
270 assert(R->drawn_text[p] && R->drawn_rend[p]); 360 lofs += len;
271#endif 361 qcol += len;
272 free(R->drawn_text[p]); 362 }
273 free(R->drawn_rend[p]); 363 }
364
365 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
366 qline->is_longer (0);
367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
368 }
369 while (p != pend && q > 0);
370
371 term_start = total_rows - nrow;
372 top_row = q - term_start;
373
374 // make sure all terminal lines exist
375 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 }
378 else
379 {
380 // if no scrollback exists (yet), wing, instead of wrap
381
382 for (int row = min (nrow, prev_nrow); row--; )
383 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row];
386
387 qline = pline;
388 lresize (qline);
389 }
390
391 for (int row = prev_nrow; row < nrow; row++)
392 {
393 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
394 }
395
396 term_start = 0;
397 }
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402
403 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1);
405
406 if (tabs)
407 free (tabs);
274 } 408 }
275 /* we have fewer rows so fix up cursor position */
276 MIN_IT(R->screen.cur.row, (int32_t)nrow - 1);
277 MIN_IT(R->swap.cur.row, (int32_t)nrow - 1);
278 409
279 rxvt_scr_reset_realloc(aR); /* realloc _last_ */ 410 CLEAR_ALL_SELECTION ();
280 411
281 } else if (nrow > prev_nrow) { 412 prev_nrow = nrow;
282 /* add rows */ 413 prev_ncol = ncol;
283 rxvt_scr_reset_realloc(aR); /* realloc _first_ */
284 414
285 k = min(R->TermWin.nscrolled, nrow - prev_nrow);
286 for (p = prev_total_rows; p < total_rows; p++) {
287 R->screen.tlen[p] = 0;
288 R->screen.text[p] = NULL;
289 R->screen.rend[p] = NULL;
290 }
291 for (p = prev_total_rows; p < total_rows - k; p++)
292 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend,
293 p, setrstyle);
294 for (p = prev_nrow; p < nrow; p++) {
295 R->swap.tlen[p] = 0;
296 R->swap.text[p] = NULL;
297 R->swap.rend[p] = NULL;
298 R->drawn_text[p] = NULL;
299 R->drawn_rend[p] = NULL;
300 rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend,
301 p, setrstyle);
302 rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend,
303 p, setrstyle);
304 }
305 if (k > 0) {
306 rxvt_scroll_text(aR_ 0, (int)nrow - 1, -k, 1);
307 R->screen.cur.row += k;
308 R->screen.s_cur.row += k;
309 R->TermWin.nscrolled -= k;
310 }
311#ifdef DEBUG_STRICT
312 assert(R->screen.cur.row < R->TermWin.nrow);
313 assert(R->swap.cur.row < R->TermWin.nrow);
314#else /* drive with your eyes closed */
315 MIN_IT(R->screen.cur.row, nrow - 1);
316 MIN_IT(R->swap.cur.row, nrow - 1);
317#endif
318 }
319/* B2: resize columns */
320 if (ncol != prev_ncol) {
321 for (p = 0; p < total_rows; p++) {
322 if (R->screen.text[p]) {
323 R->screen.text[p] = (text_t *)rxvt_realloc(R->screen.text[p], ncol * sizeof(text_t));
324 R->screen.rend[p] = (rend_t *)rxvt_realloc(R->screen.rend[p], ncol * sizeof(rend_t));
325 MIN_IT(R->screen.tlen[p], (int16_t)ncol);
326 if (ncol > prev_ncol)
327 rxvt_blank_line(aR_
328 &(R->screen.text[p][prev_ncol]),
329 &(R->screen.rend[p][prev_ncol]),
330 ncol - prev_ncol,
331 setrstyle);
332 }
333 }
334 for (p = 0; p < nrow; p++) {
335 R->drawn_text[p] = (text_t *)rxvt_realloc(R->drawn_text[p], ncol * sizeof(text_t));
336 R->drawn_rend[p] = (rend_t *)rxvt_realloc(R->drawn_rend[p], ncol * sizeof(rend_t));
337 if (R->swap.text[p]) {
338 R->swap.text[p] = (text_t *)rxvt_realloc(R->swap.text[p], ncol * sizeof(text_t));
339 R->swap.rend[p] = (rend_t *)rxvt_realloc(R->swap.rend[p], ncol * sizeof(rend_t));
340 MIN_IT(R->swap.tlen[p], (int16_t)ncol);
341 if (ncol > prev_ncol)
342 rxvt_blank_line(aR_
343 &(R->swap.text[p][prev_ncol]),
344 &(R->swap.rend[p][prev_ncol]),
345 ncol - prev_ncol, setrstyle);
346 }
347 if (ncol > prev_ncol)
348 rxvt_blank_line(aR_
349 &(R->drawn_text[p][prev_ncol]),
350 &(R->drawn_rend[p][prev_ncol]),
351 ncol - prev_ncol, setrstyle);
352 }
353 MIN_IT(R->screen.cur.col, (int16_t)ncol - 1);
354 MIN_IT(R->swap.cur.col, (int16_t)ncol - 1);
355 }
356 if (R->tabs)
357 free(R->tabs);
358 }
359
360 R->tabs = (char *)rxvt_malloc(ncol * sizeof(char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
361 416
362 for (p = 0; p < ncol; p++) 417 for (int col = ncol; col--; )
363 R->tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 418 tabs [col] = col % TABSIZE == 0;
364 419
365 R->h->prev_nrow = nrow; 420 tt_winch ();
366 R->h->prev_ncol = ncol;
367 421
368 rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->h->cmd_pid); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
369}
370
371/* INTPROTO */
372void
373rxvt_scr_reset_realloc(pR)
374{
375 uint16_t total_rows, nrow;
376
377 nrow = R->TermWin.nrow;
378 total_rows = nrow + R->TermWin.saveLines;
379/* *INDENT-OFF* */
380 R->screen.text = (text_t **)rxvt_realloc(R->screen.text, total_rows * sizeof(text_t *));
381 R->buf_text = (text_t **)rxvt_realloc(R->buf_text , total_rows * sizeof(text_t *));
382 R->drawn_text = (text_t **)rxvt_realloc(R->drawn_text , nrow * sizeof(text_t *));
383 R->swap.text = (text_t **)rxvt_realloc(R->swap.text , nrow * sizeof(text_t *));
384
385 R->screen.tlen = (int16_t *)rxvt_realloc(R->screen.tlen, total_rows * sizeof(int16_t));
386 R->swap.tlen = (int16_t *)rxvt_realloc(R->swap.tlen , total_rows * sizeof(int16_t));
387
388 R->screen.rend = (rend_t **)rxvt_realloc(R->screen.rend, total_rows * sizeof(rend_t *));
389 R->buf_rend = (rend_t **)rxvt_realloc(R->buf_rend , total_rows * sizeof(rend_t *));
390 R->drawn_rend = (rend_t **)rxvt_realloc(R->drawn_rend , nrow * sizeof(rend_t *));
391 R->swap.rend = (rend_t **)rxvt_realloc(R->swap.rend , nrow * sizeof(rend_t *));
392/* *INDENT-ON* */
393} 423}
394 424
395/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
396/* 426/*
397 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
398 */ 428 */
399/* EXTPROTO */
400void 429void
401rxvt_scr_release(pR) 430rxvt_term::scr_release ()
402{ 431{
403 uint16_t total_rows; 432 delete talloc; talloc = 0;
404 int i; 433 delete ralloc; ralloc = 0;
405 434
406 total_rows = R->TermWin.nrow + R->TermWin.saveLines; 435 free (row_buf);
407 for (i = 0; i < total_rows; i++) { 436 free (swap_buf);
408 if (R->screen.text[i]) { /* then so is R->screen.rend[i] */ 437 free (drawn_buf);
409 free(R->screen.text[i]);
410#ifdef DEBUG_STRICT
411 assert(R->screen.rend[i]);
412#endif
413 free(R->screen.rend[i]);
414 }
415 }
416 for (i = 0; i < R->TermWin.nrow; i++) {
417 free(R->drawn_text[i]);
418 free(R->drawn_rend[i]);
419 free(R->swap.text[i]);
420 free(R->swap.rend[i]);
421 }
422 free(R->screen.text);
423 free(R->screen.tlen);
424 free(R->screen.rend);
425 free(R->drawn_text);
426 free(R->drawn_rend);
427 free(R->swap.text);
428 free(R->swap.tlen);
429 free(R->swap.rend);
430 free(R->buf_text);
431 free(R->buf_rend);
432 free(R->tabs); 438 free (tabs);
433 439
434/* NULL these so if anything tries to use them, we'll know about it */ 440 row_buf = 0; // signal that we freed all the arrays
435 R->screen.text = R->drawn_text = R->swap.text = NULL;
436 R->screen.rend = R->drawn_rend = R->swap.rend = NULL;
437 R->screen.tlen = R->swap.tlen = NULL;
438 R->buf_text = NULL;
439 R->buf_rend = NULL;
440 R->tabs = NULL;
441} 441}
442 442
443/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
444/* 444/*
445 * Hard reset 445 * Hard reset
446 */ 446 */
447/* EXTPROTO */
448void 447void
449rxvt_scr_poweron(pR) 448rxvt_term::scr_poweron ()
450{ 449{
451 D_SCREEN((stderr, "rxvt_scr_poweron()"));
452
453 rxvt_scr_release(aR); 450 scr_release ();
454 R->h->prev_nrow = R->h->prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
455 rxvt_scr_reset(aR); 452 scr_reset ();
456 453
457 rxvt_scr_clear(aR); 454 scr_clear (true);
458 rxvt_scr_refresh(aR_ SLOW_REFRESH); 455 scr_refresh ();
459#ifdef RXVT_GRAPHICS
460 rxvt_Gr_reset(aR);
461#endif
462} 456}
463 457
464/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
465 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
466 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
467/* 461/*
468 * Save and Restore cursor 462 * Save and Restore cursor
469 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
470 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
471 */ 465 */
472/* EXTPROTO */
473void 466void
474rxvt_scr_cursor(pR_ int mode) 467rxvt_term::scr_cursor (int mode)
475{ 468{
476 screen_t *s; 469 screen_t *s;
477
478 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode));
479 470
480#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
481 if (R->h->current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
482 s = &(R->swap); 473 s = &swap;
483 else 474 else
484#endif 475#endif
485 s = &(R->screen); 476 s = &screen;
477
486 switch (mode) { 478 switch (mode)
479 {
487 case SAVE: 480 case SAVE:
488 s->s_cur.row = s->cur.row; 481 s->s_cur.row = screen.cur.row;
489 s->s_cur.col = s->cur.col; 482 s->s_cur.col = screen.cur.col;
490 s->s_rstyle = R->h->rstyle; 483 s->s_rstyle = rstyle;
491 s->s_charset = s->charset; 484 s->s_charset = screen.charset;
492 s->s_charset_char = R->h->charsets[s->charset]; 485 s->s_charset_char = charsets[screen.charset];
493 break; 486 break;
487
494 case RESTORE: 488 case RESTORE:
495 R->h->want_refresh = 1; 489 want_refresh = 1;
496 s->cur.row = s->s_cur.row; 490 screen.cur.row = s->s_cur.row;
497 s->cur.col = s->s_cur.col; 491 screen.cur.col = s->s_cur.col;
498 s->flags &= ~Screen_WrapNext; 492 screen.flags &= ~Screen_WrapNext;
499 R->h->rstyle = s->s_rstyle; 493 rstyle = s->s_rstyle;
500 s->charset = s->s_charset; 494 screen.charset = s->s_charset;
501 R->h->charsets[s->charset] = s->s_charset_char; 495 charsets[screen.charset] = s->s_charset_char;
502 rxvt_set_font_style(aR); 496 set_font_style ();
503 break; 497 break;
504 } 498 }
499
505/* boundary check in case screen size changed between SAVE and RESTORE */ 500 /* boundary check in case screen size changed between SAVE and RESTORE */
506 MIN_IT(s->cur.row, R->TermWin.nrow - 1); 501 min_it (s->cur.row, nrow - 1);
507 MIN_IT(s->cur.col, R->TermWin.ncol - 1); 502 min_it (s->cur.col, ncol - 1);
508#ifdef DEBUG_STRICT 503#ifdef DEBUG_STRICT
509 assert(s->cur.row >= 0); 504 assert (s->cur.row >= 0);
510 assert(s->cur.col >= 0); 505 assert (s->cur.col >= 0);
511#else /* drive with your eyes closed */
512 MAX_IT(s->cur.row, 0);
513 MAX_IT(s->cur.col, 0);
514#endif 506#endif
515} 507}
516 508
517/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
518/* 510/*
519 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
520 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
521 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
522 */ 514 */
523/* EXTPROTO */
524int 515int
525rxvt_scr_change_screen(pR_ int scrn) 516rxvt_term::scr_change_screen (int scrn)
526{ 517{
527 int i; 518 want_refresh = 1;
519 view_start = 0;
520
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */
525
526 int i = current_screen; current_screen = scrn; scrn = i;
527
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533
528#if NSCREENS 534#if NSCREENS
529 int offset; 535 if (OPTION (Opt_secondaryScreen))
530#endif
531
532 R->h->want_refresh = 1;
533
534 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn));
535
536 R->TermWin.view_start = 0;
537 RESET_CHSTAT(R->h);
538
539 if (R->h->current_screen == scrn)
540 return R->h->current_screen;
541
542 rxvt_selection_check(aR_ 2); /* check for boundary cross */
543
544 SWAP_IT(R->h->current_screen, scrn, int);
545#if NSCREENS
546 R->h->num_scr = 0;
547 offset = R->TermWin.saveLines;
548 for (i = R->h->prev_nrow; i--;) {
549 SWAP_IT(R->screen.text[i + offset], R->swap.text[i], text_t *);
550 SWAP_IT(R->screen.tlen[i + offset], R->swap.tlen[i], int16_t);
551 SWAP_IT(R->screen.rend[i + offset], R->swap.rend[i], rend_t *);
552 } 536 {
553 SWAP_IT(R->screen.cur.row, R->swap.cur.row, int16_t); 537 num_scr = 0;
554 SWAP_IT(R->screen.cur.col, R->swap.cur.col, int16_t); 538
555# ifdef DEBUG_STRICT 539 for (int i = prev_nrow; i--; )
556 assert((R->screen.cur.row >= 0) && (R->screen.cur.row < R->h->prev_nrow)); 540 ::swap (ROW(i), swap_buf [i]);
557 assert((R->screen.cur.col >= 0) && (R->screen.cur.col < R->h->prev_ncol)); 541
558# else /* drive with your eyes closed */ 542 ::swap (screen.charset, swap.charset);
559 MAX_IT(R->screen.cur.row, 0); 543 ::swap (screen.flags, swap.flags);
560 MIN_IT(R->screen.cur.row, (int32_t)R->h->prev_nrow - 1);
561 MAX_IT(R->screen.cur.col, 0);
562 MIN_IT(R->screen.cur.col, (int32_t)R->h->prev_ncol - 1);
563# endif
564 SWAP_IT(R->screen.charset, R->swap.charset, int16_t);
565 SWAP_IT(R->screen.flags, R->swap.flags, int);
566 R->screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
567 R->swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
568
569# ifdef RXVT_GRAPHICS
570
571 if (rxvt_Gr_Displayed(aR)) {
572 rxvt_Gr_scroll(aR_ 0);
573 rxvt_Gr_ChangeScreen(aR);
574 } 546 }
547 else
575# endif 548#endif
576#else 549 if (OPTION (Opt_secondaryScroll))
577# ifdef SCROLL_ON_NO_SECONDARY 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
578# ifdef RXVT_GRAPHICS 551
579 if (rxvt_Gr_Displayed(aR))
580 rxvt_Gr_ClearScreen(aR);
581# endif
582 if (R->h->current_screen == PRIMARY
583# ifdef RXVT_GRAPHICS
584 && !rxvt_Gr_Displayed(aR)
585# endif
586 )
587 rxvt_scroll_text(aR_ 0, (R->h->prev_nrow - 1), R->h->prev_nrow, 0);
588# endif
589#endif
590 return scrn; 552 return scrn;
553}
554
555// clear WrapNext indicator, solidifying position on next line
556void
557rxvt_term::scr_do_wrap ()
558{
559 if (!(screen.flags & Screen_WrapNext))
560 return;
561
562 screen.flags &= ~Screen_WrapNext;
563
564 screen.cur.col = 0;
565
566 if (screen.cur.row == screen.bscroll)
567 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
568 else if (screen.cur.row < nrow - 1)
569 screen.cur.row++;
591} 570}
592 571
593/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
594/* 573/*
595 * Change the colour for following text 574 * Change the colour for following text
596 */ 575 */
597/* EXTPROTO */
598void 576void
599rxvt_scr_color(pR_ unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg)
600{ 578{
579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
601 color &= RS_fgMask; 580 color = fgbg;
581
602 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
603 R->h->rstyle = SET_FGCOLOR(R->h->rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
604 else 584 else
605 R->h->rstyle = SET_BGCOLOR(R->h->rstyle, color); 585 rstyle = SET_BGCOLOR (rstyle, color);
606} 586}
607 587
608/* ------------------------------------------------------------------------- */ 588/* ------------------------------------------------------------------------- */
609/* 589/*
610 * Change the rendition style for following text 590 * Change the rendition style for following text
611 */ 591 */
612/* EXTPROTO */
613void 592void
614rxvt_scr_rendition(pR_ int set, int style) 593rxvt_term::scr_rendition (int set, int style)
615{ 594 {
616 if (set) 595 if (set)
617 R->h->rstyle |= style; 596 rstyle |= style;
618 else if (style == ~RS_None) 597 else if (style == ~RS_None)
619 R->h->rstyle = DEFAULT_RSTYLE; 598 rstyle = DEFAULT_RSTYLE;
620 else 599 else
621 R->h->rstyle &= ~style; 600 rstyle &= ~style;
622} 601 }
623 602
624/* ------------------------------------------------------------------------- */ 603/* ------------------------------------------------------------------------- */
625/* 604/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 606 * count positive ==> scroll up
628 * count negative ==> scroll down 607 * count negative ==> scroll down
629 * spec == 0 for normal routines
630 */ 608 */
631/* EXTPROTO */
632int 609int
633rxvt_scroll_text(pR_ int row1, int row2, int count, int spec) 610rxvt_term::scr_scroll_text (int row1, int row2, int count)
634{ 611{
635 int i, j;
636 long nscrolled;
637
638 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
639 return 0; 613 return 0;
640 614
641 R->h->want_refresh = 1; 615 want_refresh = 1;
642 D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (R->h->current_screen == PRIMARY) ? "Primary" : "Secondary")); 616 num_scr += count;
643 617
644 if ((count > 0) && (row1 == 0) && (R->h->current_screen == PRIMARY)) { 618 if (count > 0
645 nscrolled = (long)R->TermWin.nscrolled + (long)count;; 619 && row1 == 0
646 if (nscrolled > (long)R->TermWin.saveLines) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
647 R->TermWin.nscrolled = R->TermWin.saveLines; 621 {
648 else 622 top_row = max (top_row - count, -saveLines);
649 R->TermWin.nscrolled = (uint16_t)nscrolled;
650 if ((R->Options & Opt_scrollWithBuffer)
651 && R->TermWin.view_start != 0
652 && R->TermWin.view_start != R->TermWin.saveLines)
653 rxvt_scr_page(aR_ UP, count);
654 } else if (!spec)
655 row1 += R->TermWin.saveLines;
656 row2 += R->TermWin.saveLines;
657 623
624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows;
626
627 // sever bottommost line
628 {
629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
631 l.touch ();
632 }
633
634 // erase newly scrolled-in lines
635 for (int i = count; i--; )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
658 if (R->selection.op && R->h->current_screen == R->selection.screen) { 660 if (selection.op && current_screen == selection.screen)
659 i = R->selection.beg.row + R->TermWin.saveLines; 661 {
660 j = R->selection.end.row + R->TermWin.saveLines; 662 selection.beg.row -= count;
661 if ((i < row1 && j > row1) 663 selection.end.row -= count;
662 || (i < row2 && j > row2) 664 selection.mark.row -= count;
663 || (i - count < row1 && i >= row1) 665
664 || (i - count > row2 && i <= row2) 666 if (selection.beg.row < top_row
665 || (j - count < row1 && j >= row1) 667 || selection.end.row < top_row
666 || (j - count > row2 && j <= row2)) { 668 || selection.mark.row < top_row)
669 {
667 CLEAR_ALL_SELECTION(R); 670 CLEAR_ALL_SELECTION ();
668 R->selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
669 } else if (j >= row1 && j <= row2) { 672 }
673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
683 }
684 else
685 {
686 if (selection.op && current_screen == selection.screen)
687 {
688 if ((selection.beg.row < row1 && selection.end.row > row1)
689 || (selection.beg.row < row2 && selection.end.row > row2)
690 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
691 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
692 || (selection.end.row - count < row1 && selection.end.row >= row1)
693 || (selection.end.row - count > row2 && selection.end.row <= row2))
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 else if (selection.end.row >= row1 && selection.end.row <= row2)
699 {
670 /* move selected region too */ 700 /* move selected region too */
671 R->selection.beg.row -= count; 701 selection.beg.row -= count;
672 R->selection.end.row -= count; 702 selection.end.row -= count;
673 R->selection.mark.row -= count; 703 selection.mark.row -= count;
674 } 704
675 } 705 selection_check (0);
676 rxvt_selection_check(aR_ 0); /* _after_ R->TermWin.nscrolled update */ 706 }
707 }
677 708
678 R->h->num_scr += count; 709 // use a simple and robust scrolling algorithm, this
679 j = count; 710 // part of scr_scroll_text is not time-critical.
680 if (count < 0) 711
681 count = -count;
682 i = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
683 MIN_IT(count, i);
684 713
685 if (j > 0) { 714 min_it (count, rows);
686/* A: scroll up */
687 715
688/* A1: Copy lines that will get clobbered by the rotation */ 716 line_t *temp_buf = row_buf + total_rows;
689 for (i = 0, j = row1; i < count; i++, j++) {
690 R->buf_text[i] = R->screen.text[j];
691 R->buf_rend[i] = R->screen.rend[j];
692 }
693/* A2: Rotate lines */
694 for (j = row1, i = j + count; i <= row2; i++, j++) {
695 R->screen.tlen[j] = R->screen.tlen[i];
696 R->screen.text[j] = R->screen.text[i];
697 R->screen.rend[j] = R->screen.rend[i];
698 }
699 j = row2 - count + 1, i = count;
700 } else /* if (j < 0) */ {
701/* B: scroll down */
702 717
703/* B1: Copy lines that will get clobbered by the rotation */ 718 for (int row = 0; row < rows; row++)
704 for (i = 0, j = row2; i < count; i++, j--) { 719 {
705 R->buf_text[i] = R->screen.text[j]; 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
706 R->buf_rend[i] = R->screen.rend[j];
707 }
708/* B2: Rotate lines */
709 for (j = row2, i = j - count; i >= row1; i--, j--) {
710 R->screen.tlen[j] = R->screen.tlen[i];
711 R->screen.text[j] = R->screen.text[i];
712 R->screen.rend[j] = R->screen.rend[i];
713 }
714 j = row1, i = count;
715 count = -count;
716 }
717 721
718/* C: Resurrect lines */ 722 if (!IN_RANGE_EXC (row + count, 0, rows))
719 for (; i--; j++) { 723 scr_blank_screen_mem (temp_buf [row], rstyle);
720 R->screen.tlen[j] = 0; 724 }
721 R->screen.text[j] = R->buf_text[i];
722 R->screen.rend[j] = R->buf_rend[i];
723 if (!spec) /* line length may not equal TermWin.ncol */
724 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend,
725 (unsigned int)j, R->h->rstyle);
726 }
727 725
728#ifdef RXVT_GRAPHICS 726 for (int row = 0; row < rows; row++)
729 if (rxvt_Gr_Displayed(aR)) 727 ROW(row1 + row) = temp_buf [row];
730 rxvt_Gr_scroll(aR_ count); 728 }
731#endif 729
732 return count; 730 return count;
733} 731}
734 732
735/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
736/* 734/*
737 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
738 */ 736 */
739/* EXTPROTO */
740void 737void
741rxvt_scr_add_lines(pR_ const uint32_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
742{ 739{
740 if (len <= 0) /* sanity */
741 return;
742
743 unsigned char checksel, clearsel; 743 unsigned char checksel;
744 uint32_t c; 744 unicode_t c;
745 int i, row, last_col; 745 int ncol = this->ncol;
746 text_t *stp; 746 const wchar_t *strend = str + len;
747 rend_t *srp;
748 struct rxvt_hidden *h = R->h;
749 747
750 if (len <= 0) /* sanity */
751 return;
752
753 h->want_refresh = 1; 748 want_refresh = 1;
754 last_col = R->TermWin.ncol;
755
756 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len));
757 ZERO_SCROLLBACK(R); 749 ZERO_SCROLLBACK ();
750
758 if (nlines > 0) { 751 if (minlines > 0)
752 {
759 nlines += (R->screen.cur.row - R->screen.bscroll); 753 minlines += screen.cur.row - screen.bscroll;
760 if ((nlines > 0) 754
755 if (minlines > 0
761 && (R->screen.tscroll == 0) 756 && screen.tscroll == 0
762 && (R->screen.bscroll == (R->TermWin.nrow - 1))) { 757 && screen.bscroll == nrow - 1)
758 {
763 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
764 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, nlines, 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
765 0); 761 screen.cur.row -= minlines;
766 R->screen.cur.row -= nlines; 762 }
767 }
768 } 763 }
764
769#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
770 assert(R->screen.cur.col < last_col); 766 assert (screen.cur.col < ncol);
771 assert((R->screen.cur.row < R->TermWin.nrow) 767 assert (screen.cur.row < nrow
772 && (R->screen.cur.row >= -(int32_t)R->TermWin.nscrolled)); 768 && screen.cur.row >= top_row);
773#else /* drive with your eyes closed */
774 MIN_IT(R->screen.cur.col, last_col - 1);
775 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1);
776 MAX_IT(R->screen.cur.row, -(int32_t)R->TermWin.nscrolled);
777#endif 769#endif
778 row = R->screen.cur.row + R->TermWin.saveLines; 770 int row = screen.cur.row;
779 771
780 checksel = (R->selection.op 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
781 && h->current_screen == R->selection.screen) ? 1 : 0;
782 clearsel = 0;
783 773
784 stp = R->screen.text[row]; 774 line_t *line = &ROW(row);
785 srp = R->screen.rend[row];
786 775
787 for (i = 0; i < len;) { 776 while (str < strend)
788 c = str[i++]; 777 {
789 switch (c) { 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
790 case '\t': 779
791 rxvt_scr_tab(aR_ 1); 780 if (c < 0x20)
792 continue; 781 if (c == C0_LF)
793 case '\n': 782 {
794 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 783 max_it (line->l, screen.cur.col);
795 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 784
796 R->screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
786
797 if (R->screen.cur.row == R->screen.bscroll) 787 if (screen.cur.row == screen.bscroll)
798 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); 788 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
799 else if (R->screen.cur.row < (R->TermWin.nrow - 1)) 789 else if (screen.cur.row < (nrow - 1))
800 row = (++R->screen.cur.row) + R->TermWin.saveLines; 790 row = ++screen.cur.row;
801 stp = R->screen.text[row]; /* _must_ refresh */ 791
802 srp = R->screen.rend[row]; /* _must_ refresh */ 792 line = &ROW(row); /* _must_ refresh */
803 RESET_CHSTAT(h); 793 continue;
804 continue; 794 }
805 case '\r': 795 else if (c == C0_CR)
806 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 796 {
807 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 797 max_it (line->l, screen.cur.col);
798
808 R->screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
809 R->screen.cur.col = 0; 800 screen.cur.col = 0;
810 RESET_CHSTAT(h); 801 continue;
811 continue; 802 }
812 default: 803 else if (c == C0_HT)
813 if (c == 127) 804 {
814 continue; /* yummmm..... */ 805 scr_tab (1, true);
815 break; 806 continue;
816 } 807 }
817 808
818 if (checksel /* see if we're writing within selection */ 809 if (checksel /* see if we're writing within selection */
819 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 810 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
820 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) { 811 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
812 {
821 checksel = 0; 813 checksel = 0;
822 clearsel = 1; 814 /*
823 } 815 * If we wrote anywhere in the selected area, kill the selection
816 * XXX: should we kill the mark too? Possibly, but maybe that
817 * should be a similar check.
818 */
819 CLEAR_SELECTION ();
820 }
821
824 if (R->screen.flags & Screen_WrapNext) { 822 if (screen.flags & Screen_WrapNext)
825 R->screen.tlen[row] = -1; 823 {
826 if (R->screen.cur.row == R->screen.bscroll) 824 scr_do_wrap ();
827 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); 825
828 else if (R->screen.cur.row < (R->TermWin.nrow - 1)) 826 line->l = ncol;
829 row = (++R->screen.cur.row) + R->TermWin.saveLines; 827 line->is_longer (1);
830 stp = R->screen.text[row]; /* _must_ refresh */
831 srp = R->screen.rend[row]; /* _must_ refresh */
832 R->screen.cur.col = 0;
833 R->screen.flags &= ~Screen_WrapNext;
834 }
835 if (R->screen.flags & Screen_Insert)
836 rxvt_scr_insdel_chars(aR_ 1, INSERT);
837 828
829 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */
831 }
832
833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
835 c = 0xfffd;
836
837 // rely on wcwidth to tell us the character width, at least for non-latin1
838 // do wcwidth before further replacements, as wcwidth might return -1
839 // for the line drawing characters below as they might be invalid in the current
840 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c);
842
838 if (R->h->charsets[R->screen.charset] == '0') // DEC SPECIAL 843 if (charsets [screen.charset] == '0') // DEC SPECIAL
839 switch (c) 844 {
845 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100
847 // 40-5e rxvt extension for extra curses acs chars
848 static uint16_t vt100_0[62] = { // 41 .. 7e
849 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
850 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
851 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
852 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
853 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
854 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
855 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
856 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
857 };
858
859 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
840 { 860 {
841 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 861 c = vt100_0[c - 0x41];
842 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 862 width = 1; // vt100 line drawing characters are always single-width
843 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break;
844 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
845 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break;
846 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break;
847 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
848 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
849 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
850 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
851 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
852 } 863 }
864 }
853 865
854 rend_t rend = SET_FONT (h->rstyle, R->TermWin.fontset->find_font (c)); 866 if (screen.flags & Screen_Insert)
867 scr_insdel_chars (width, INSERT);
855 868
856 stp[R->screen.cur.col] = c; 869 if (width != 0)
857 srp[R->screen.cur.col] = rend;
858
859 if (c > 255)
860 { 870 {
861 // rely on wcwidth to tell us the character width, at least for non iso-8859-1 871#if !UNICODE_3
862 int width = wcwidth (c); 872 // trim characters we can't store directly :(
873 if (c >= 0x10000)
874# if ENABLE_COMBINING
875 c = rxvt_composite.compose (c); // map to lower 16 bits
876# else
877 c = 0xfffd;
878# endif
879#endif
880
881 // nuke the character at this position, if required
882 if (line->t[screen.cur.col] == NOCHAR
883 || (screen.cur.col < ncol - 1
884 && line->t[screen.cur.col + 1] == NOCHAR))
863 885 {
864 if (width > 1) 886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (screen.cur.col > ncol - width && ncol >= width)
865 { 906 {
866 while (--width > 0 && R->screen.cur.col < last_col - 1) 907 // ...output spaces
908 c = ' ';
909 // and try the same character next loop iteration
910 --str;
911 }
912
913 line->touch ();
914
915 do
916 {
917 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend;
919
920 if (screen.cur.col < ncol - 1)
921 screen.cur.col++;
922 else
867 { 923 {
868 924 line->l = ncol;
869 srp[R->screen.cur.col] |= RS_wide; 925 if (screen.flags & Screen_Autowrap)
870 926 screen.flags |= Screen_WrapNext;
871 R->screen.cur.col++; 927 break;
872 stp[R->screen.cur.col] = NOCHAR;
873 srp[R->screen.cur.col] = rend;
874 } 928 }
929
930 c = NOCHAR;
931 }
932 while (--width > 0);
933
934 // pad with spaces when overwriting wide character with smaller one
935 if (!width)
936 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' ';
942 line->r[c] = rend;
875 } 943 }
876 } 944 }
945 }
946 else // width == 0
947 {
948#if ENABLE_COMBINING
949 // handle combining characters
950 // we just tag the accent on the previous on-screen character.
951 // this is arguably not correct, but also arguably not wrong.
952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
954 text_t *tp;
955 rend_t *rp;
877 956
878 if (R->screen.cur.col < last_col - 1) 957 if (screen.cur.col > 0)
879 R->screen.cur.col++; 958 {
880 else { 959 linep = line;
881 R->screen.tlen[row] = last_col; 960 tp = line->t + screen.cur.col - 1;
882 if (R->screen.flags & Screen_Autowrap) 961 rp = line->r + screen.cur.col - 1;
883 R->screen.flags |= Screen_WrapNext; 962 }
884 } 963 else if (screen.cur.row > 0
885 } 964 && ROW(screen.cur.row - 1).is_longer ())
886 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 965 {
887 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 966 linep = &ROW(screen.cur.row - 1);
967 tp = line->t + ncol - 1;
968 rp = line->r + ncol - 1;
969 }
970 else
971 continue;
888 972
889/* 973 linep->touch ();
890 * If we wrote anywhere in the selected area, kill the selection 974
891 * XXX: should we kill the mark too? Possibly, but maybe that 975 while (*tp == NOCHAR && tp > linep->t)
892 * should be a similar check. 976 tp--, rp--;
893 */ 977
894 if (clearsel) 978 // first try to find a precomposed character
895 CLEAR_SELECTION(R); 979 unicode_t n = rxvt_compose (*tp, c);
980 if (n == NOCHAR)
981 n = rxvt_composite.compose (*tp, c);
982
983 *tp = n;
984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
985#endif
986 }
987 }
988
989 max_it (line->l, screen.cur.col);
896 990
897#ifdef DEBUG_STRICT 991#ifdef DEBUG_STRICT
898 assert(R->screen.cur.row >= 0); 992 assert (screen.cur.row >= 0);
899#else /* drive with your eyes closed */
900 MAX_IT(R->screen.cur.row, 0);
901#endif 993#endif
902} 994}
903 995
904/* ------------------------------------------------------------------------- */ 996/* ------------------------------------------------------------------------- */
905/* 997/*
906 * Process Backspace. Move back the cursor back a position, wrap if have to 998 * Process Backspace. Move back the cursor back a position, wrap if have to
907 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
908 */ 1000 */
909/* EXTPROTO */
910void 1001void
911rxvt_scr_backspace(pR) 1002rxvt_term::scr_backspace ()
912{ 1003{
913 RESET_CHSTAT(R->h);
914 R->h->want_refresh = 1; 1004 want_refresh = 1;
1005
915 if (R->screen.cur.col == 0) { 1006 if (screen.cur.col == 0)
1007 {
916 if (R->screen.cur.row > 0) { 1008 if (screen.cur.row > 0)
1009 {
917#ifdef TERMCAP_HAS_BW 1010#ifdef TERMCAP_HAS_BW
918 R->screen.cur.col = R->TermWin.ncol - 1; 1011 screen.cur.col = ncol - 1;
919 R->screen.cur.row--; 1012 screen.cur.row--;
920 return; 1013 return;
921#endif 1014#endif
922 } 1015 }
1016 }
923 } else if ((R->screen.flags & Screen_WrapNext) == 0) 1017 else if (!(screen.flags & Screen_WrapNext))
924 rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); 1018 scr_gotorc (0, -1, RELATIVE);
1019
925 R->screen.flags &= ~Screen_WrapNext; 1020 screen.flags &= ~Screen_WrapNext;
926} 1021}
927 1022
928/* ------------------------------------------------------------------------- */ 1023/* ------------------------------------------------------------------------- */
929/* 1024/*
930 * Process Horizontal Tab 1025 * Process Horizontal Tab
931 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
932 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
933 */ 1028 */
934/* EXTPROTO */
935void 1029void
936rxvt_scr_tab(pR_ int count) 1030rxvt_term::scr_tab (int count, bool ht)
937{ 1031{
938 int i, x; 1032 int i, x;
939 1033
940 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count));
941 R->h->want_refresh = 1; 1034 want_refresh = 1;
942 RESET_CHSTAT(R->h);
943 i = x = R->screen.cur.col; 1035 i = x = screen.cur.col;
1036
944 if (count == 0) 1037 if (count == 0)
945 return; 1038 return;
946 else if (count > 0) { 1039 else if (count > 0)
947 for (; ++i < R->TermWin.ncol; ) 1040 {
1041 line_t &l = ROW(screen.cur.row);
1042 rend_t base_rend = l.r[i];
1043 ht &= l.t[i] == ' ';
1044
1045 for (; ++i < ncol; )
948 if (R->tabs[i]) { 1046 if (tabs[i])
949 x = i; 1047 {
950 if (!--count) 1048 x = i;
951 break; 1049
1050 if (!--count)
1051 break;
1052 }
1053 else
1054 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend);
1056
1057 if (count)
1058 x = ncol - 1;
1059
1060 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs))
1063 {
1064 base_rend = SET_FONT (base_rend, 0);
1065
1066 l.touch (x);
1067
1068 i = screen.cur.col;
1069
1070 l.t[i] = '\t';
1071 l.r[i] = base_rend;
1072
1073 while (++i < x)
1074 {
1075 l.t[i] = NOCHAR;
1076 l.r[i] = base_rend;
1077 }
1078 }
952 } 1079 }
953 if (count)
954 x = R->TermWin.ncol - 1;
955 } else /* if (count < 0) */ { 1080 else /* if (count < 0) */
1081 {
956 for (; --i >= 0; ) 1082 for (; --i >= 0; )
957 if (R->tabs[i]) { 1083 if (tabs[i])
958 x = i; 1084 {
959 if (!++count) 1085 x = i;
960 break; 1086 if (!++count)
1087 break;
1088 }
1089
1090 if (count)
1091 x = 0;
961 } 1092 }
962 if (count) 1093
963 x = 0;
964 }
965 if (x != R->screen.cur.col) 1094 if (x != screen.cur.col)
966 rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); 1095 scr_gotorc (0, x, R_RELATIVE);
967} 1096}
968 1097
969/* ------------------------------------------------------------------------- */ 1098/* ------------------------------------------------------------------------- */
970/* 1099/*
971 * Process DEC Back Index 1100 * Process DEC Back Index
972 * XTERM_SEQ: ESC 6 1101 * XTERM_SEQ: ESC 6
973 * Move cursor left in row. If we're at the left boundary, shift everything 1102 * Move cursor left in row. If we're at the left boundary, shift everything
974 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
975 */ 1104 */
976#ifndef NO_FRILLS 1105#if ENABLE_FRILLS
977/* EXTPROTO */
978void 1106void
979rxvt_scr_backindex(pR) 1107rxvt_term::scr_backindex ()
980{ 1108{
981 if (R->screen.cur.col > 0) 1109 if (screen.cur.col > 0)
982 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
983 else { 1111 else
984 if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0)
985 return; /* um, yeah? */
986 rxvt_scr_insdel_chars(aR_ 1, INSERT); 1112 scr_insdel_chars (1, INSERT);
987 }
988} 1113}
989#endif 1114#endif
990/* ------------------------------------------------------------------------- */ 1115/* ------------------------------------------------------------------------- */
991/* 1116/*
992 * Process DEC Forward Index 1117 * Process DEC Forward Index
993 * XTERM_SEQ: ESC 9 1118 * XTERM_SEQ: ESC 9
994 * Move cursor right in row. If we're at the right boundary, shift everything 1119 * Move cursor right in row. If we're at the right boundary, shift everything
995 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
996 */ 1121 */
997#ifndef NO_FRILLS 1122#if ENABLE_FRILLS
998/* EXTPROTO */
999void 1123void
1000rxvt_scr_forwardindex(pR) 1124rxvt_term::scr_forwardindex ()
1001{ 1125{
1002 int row;
1003
1004 if (R->screen.cur.col < R->TermWin.ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1005 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1006 else { 1128 else
1007 row = R->screen.cur.row + R->TermWin.saveLines; 1129 {
1008 if (R->screen.tlen[row] == 0) 1130 line_t &l = ROW(screen.cur.row);
1009 return; /* um, yeah? */ 1131
1010 else if (R->screen.tlen[row] == -1) 1132 l.touch ();
1011 R->screen.tlen[row] = R->TermWin.ncol; 1133 l.is_longer (0);
1134
1012 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 1135 scr_gotorc (0, 0, R_RELATIVE);
1013 rxvt_scr_insdel_chars(aR_ 1, DELETE); 1136 scr_insdel_chars (1, DELETE);
1014 rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); 1137 scr_gotorc (0, ncol - 1, R_RELATIVE);
1015 } 1138 }
1016} 1139}
1017#endif 1140#endif
1018 1141
1019/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1020/* 1143/*
1021 * Goto Row/Column 1144 * Goto Row/Column
1022 */ 1145 */
1023/* EXTPROTO */
1024void 1146void
1025rxvt_scr_gotorc(pR_ int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative)
1026{ 1148{
1027 R->h->want_refresh = 1; 1149 want_refresh = 1;
1028 ZERO_SCROLLBACK(R); 1150 ZERO_SCROLLBACK ();
1029 RESET_CHSTAT(R->h);
1030#ifdef RXVT_GRAPHICS
1031 if (rxvt_Gr_Displayed(aR))
1032 rxvt_Gr_scroll(aR_ 0);
1033#endif
1034 1151
1035 D_SCREEN((stderr, "rxvt_scr_gotorc(r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, R->screen.cur.row, R->screen.cur.col));
1036
1037 R->screen.cur.col = ((relative & C_RELATIVE) ? (R->screen.cur.col + col) 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1038 : col); 1153 clamp_it (screen.cur.col, 0, ncol - 1);
1039 MAX_IT(R->screen.cur.col, 0);
1040 MIN_IT(R->screen.cur.col, (int32_t)R->TermWin.ncol - 1);
1041 1154
1042 R->screen.flags &= ~Screen_WrapNext; 1155 screen.flags &= ~Screen_WrapNext;
1156
1043 if (relative & R_RELATIVE) { 1157 if (relative & R_RELATIVE)
1044 if (row > 0) { 1158 {
1159 if (row > 0)
1160 {
1045 if (R->screen.cur.row <= R->screen.bscroll 1161 if (screen.cur.row <= screen.bscroll
1046 && (R->screen.cur.row + row) > R->screen.bscroll) 1162 && (screen.cur.row + row) > screen.bscroll)
1047 R->screen.cur.row = R->screen.bscroll; 1163 screen.cur.row = screen.bscroll;
1048 else 1164 else
1049 R->screen.cur.row += row; 1165 screen.cur.row += row;
1166 }
1050 } else if (row < 0) { 1167 else if (row < 0)
1168 {
1051 if (R->screen.cur.row >= R->screen.tscroll 1169 if (screen.cur.row >= screen.tscroll
1052 && (R->screen.cur.row + row) < R->screen.tscroll) 1170 && (screen.cur.row + row) < screen.tscroll)
1053 R->screen.cur.row = R->screen.tscroll; 1171 screen.cur.row = screen.tscroll;
1172 else
1173 screen.cur.row += row;
1174 }
1175 }
1176 else
1177 {
1178 if (screen.flags & Screen_Relative)
1179 { /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll);
1182 }
1054 else 1183 else
1055 R->screen.cur.row += row; 1184 screen.cur.row = row;
1056 }
1057 } else {
1058 if (R->screen.flags & Screen_Relative) { /* relative origin mode */
1059 R->screen.cur.row = row + R->screen.tscroll;
1060 MIN_IT(R->screen.cur.row, R->screen.bscroll);
1061 } else
1062 R->screen.cur.row = row;
1063 } 1185 }
1064 MAX_IT(R->screen.cur.row, 0);
1065 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1);
1066}
1067 1186
1187 clamp_it (screen.cur.row, 0, nrow - 1);
1188}
1189
1068/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1069/* 1191/*
1070 * direction should be UP or DN 1192 * direction should be UP or DN
1071 */ 1193 */
1072/* EXTPROTO */
1073void 1194void
1074rxvt_scr_index(pR_ enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction)
1075{ 1196{
1076 int dirn; 1197 int dirn;
1077 1198
1078 R->h->want_refresh = 1; 1199 want_refresh = 1;
1200 ZERO_SCROLLBACK ();
1201
1079 dirn = ((direction == UP) ? 1 : -1); 1202 dirn = ((direction == UP) ? 1 : -1);
1080 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn));
1081 1203
1082 ZERO_SCROLLBACK(R);
1083 RESET_CHSTAT(R->h);
1084
1085#ifdef RXVT_GRAPHICS
1086 if (rxvt_Gr_Displayed(aR))
1087 rxvt_Gr_scroll(aR_ 0);
1088#endif
1089
1090 R->screen.flags &= ~Screen_WrapNext; 1204 screen.flags &= ~Screen_WrapNext;
1205
1091 if ((R->screen.cur.row == R->screen.bscroll && direction == UP) 1206 if ((screen.cur.row == screen.bscroll && direction == UP)
1092 || (R->screen.cur.row == R->screen.tscroll && direction == DN)) 1207 || (screen.cur.row == screen.tscroll && direction == DN))
1093 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, dirn, 0); 1208 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1094 else 1209 else
1095 R->screen.cur.row += dirn; 1210 screen.cur.row += dirn;
1096 MAX_IT(R->screen.cur.row, 0); 1211
1097 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1212 clamp_it (screen.cur.row, 0, nrow - 1);
1098 rxvt_selection_check(aR_ 0); 1213 selection_check (0);
1099} 1214}
1100 1215
1101/* ------------------------------------------------------------------------- */ 1216/* ------------------------------------------------------------------------- */
1102/* 1217/*
1103 * Erase part or whole of a line 1218 * Erase part or whole of a line
1104 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1105 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1106 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1107 */ 1222 */
1108/* EXTPROTO */
1109void 1223void
1110rxvt_scr_erase_line(pR_ int mode) 1224rxvt_term::scr_erase_line (int mode)
1111{ 1225{
1112 unsigned int row, col, num; 1226 unsigned int col, num;
1113 1227
1114 R->h->want_refresh = 1; 1228 want_refresh = 1;
1115 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row));
1116 ZERO_SCROLLBACK(R); 1229 ZERO_SCROLLBACK ();
1117 RESET_CHSTAT(R->h);
1118 1230
1119#ifdef RXVT_GRAPHICS
1120 if (rxvt_Gr_Displayed(aR))
1121 rxvt_Gr_scroll(aR_ 0);
1122#endif
1123
1124 rxvt_selection_check(aR_ 1); 1231 selection_check (1);
1125 1232
1126 R->screen.flags &= ~Screen_WrapNext; 1233 line_t &line = ROW(screen.cur.row);
1127 1234
1128 row = R->TermWin.saveLines + R->screen.cur.row; 1235 line.touch ();
1236 line.is_longer (0);
1237
1129 switch (mode) { 1238 switch (mode)
1130 case 0: /* erase to end of line */ 1239 {
1240 case 0: /* erase to end of line */
1131 col = R->screen.cur.col; 1241 col = screen.cur.col;
1132 num = R->TermWin.ncol - col; 1242 num = ncol - col;
1133 MIN_IT(R->screen.tlen[row], (int16_t)col); 1243 min_it (line.l, col);
1134 if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) 1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1135 || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) 1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1136 CLEAR_SELECTION(R); 1246 CLEAR_SELECTION ();
1137 break; 1247 break;
1138 case 1: /* erase to beginning of line */ 1248 case 1: /* erase to beginning of line */
1139 col = 0; 1249 col = 0;
1140 num = R->screen.cur.col + 1; 1250 num = screen.cur.col + 1;
1141 if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) 1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1142 || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) 1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1143 CLEAR_SELECTION(R); 1253 CLEAR_SELECTION ();
1144 break; 1254 break;
1145 case 2: /* erase whole line */ 1255 case 2: /* erase whole line */
1146 col = 0; 1256 col = 0;
1147 num = R->TermWin.ncol; 1257 num = ncol;
1148 R->screen.tlen[row] = 0; 1258 line.l = 0;
1149 if (R->selection.beg.row <= R->screen.cur.row 1259 if (selection.beg.row <= screen.cur.row
1150 && R->selection.end.row >= R->screen.cur.row) 1260 && selection.end.row >= screen.cur.row)
1151 CLEAR_SELECTION(R); 1261 CLEAR_SELECTION ();
1152 break; 1262 break;
1153 default: 1263 default:
1154 return; 1264 return;
1155 } 1265 }
1156 if (R->screen.text[row]) 1266
1157 rxvt_blank_line(aR_ 1267 scr_blank_line (line, col, num, rstyle);
1158 &(R->screen.text[row][col]),
1159 &(R->screen.rend[row][col]), num, R->h->rstyle);
1160 else
1161 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, row,
1162 R->h->rstyle);
1163} 1268}
1164 1269
1165/* ------------------------------------------------------------------------- */ 1270/* ------------------------------------------------------------------------- */
1166/* 1271/*
1167 * Erase part of whole of the screen 1272 * Erase part of whole of the screen
1168 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1169 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1170 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1171 */ 1276 */
1172/* EXTPROTO */
1173void 1277void
1174rxvt_scr_erase_screen(pR_ int mode) 1278rxvt_term::scr_erase_screen (int mode)
1175{ 1279{
1176 int num; 1280 int num;
1177 int32_t row, row_offset; 1281 int32_t row;
1178 rend_t ren; 1282 rend_t ren;
1179 XGCValues gcvalue; 1283 XGCValues gcvalue;
1180 1284
1181 R->h->want_refresh = 1; 1285 want_refresh = 1;
1182 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, R->screen.cur.row));
1183 ZERO_SCROLLBACK(R); 1286 ZERO_SCROLLBACK ();
1184 RESET_CHSTAT(R->h);
1185 row_offset = (int32_t)R->TermWin.saveLines;
1186 1287
1187 switch (mode) { 1288 switch (mode)
1289 {
1188 case 0: /* erase to end of screen */ 1290 case 0: /* erase to end of screen */
1189 rxvt_selection_check(aR_ 1); 1291 selection_check (1);
1190 rxvt_scr_erase_line(aR_ 0); 1292 scr_erase_line (0);
1191 row = R->screen.cur.row + 1; /* possible OOB */ 1293 row = screen.cur.row + 1; /* possible OOB */
1192 num = R->TermWin.nrow - row; 1294 num = nrow - row;
1193 break; 1295 break;
1194 case 1: /* erase to beginning of screen */ 1296 case 1: /* erase to beginning of screen */
1195 rxvt_selection_check(aR_ 3); 1297 selection_check (3);
1196 rxvt_scr_erase_line(aR_ 1); 1298 scr_erase_line (1);
1197 row = 0; 1299 row = 0;
1198 num = R->screen.cur.row; 1300 num = screen.cur.row;
1199 break; 1301 break;
1200 case 2: /* erase whole screen */ 1302 case 2: /* erase whole screen */
1201 rxvt_selection_check(aR_ 3); 1303 selection_check (3);
1202#ifdef RXVT_GRAPHICS 1304 row = 0;
1203 rxvt_Gr_ClearScreen(aR); 1305 num = nrow;
1204#endif 1306 break;
1205 row = 0;
1206 num = R->TermWin.nrow;
1207 break;
1208 default: 1307 default:
1209 return; 1308 return;
1210 } 1309 }
1211 R->h->refresh_type |= REFRESH_BOUNDS; 1310
1212 if (R->selection.op && R->h->current_screen == R->selection.screen 1311 if (selection.op && current_screen == selection.screen
1213 && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) 1312 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1214 || (R->selection.end.row >= row 1313 || (selection.end.row >= row
1215 && R->selection.end.row <= row + num))) 1314 && selection.end.row <= row + num)))
1216 CLEAR_SELECTION(R); 1315 CLEAR_SELECTION ();
1316
1217 if (row >= R->TermWin.nrow) /* Out Of Bounds */ 1317 if (row >= nrow) /* Out Of Bounds */
1218 return; 1318 return;
1219 MIN_IT(num, (R->TermWin.nrow - row)); 1319
1320 min_it (num, nrow - row);
1321
1220 if (R->h->rstyle & (RS_RVid | RS_Uline)) 1322 if (rstyle & (RS_RVid | RS_Uline))
1221 ren = (rend_t) ~RS_None; 1323 ren = (rend_t) ~RS_None;
1222 else if (GET_BASEBG(R->h->rstyle) == Color_bg) { 1324 else if (GET_BASEBG (rstyle) == Color_bg)
1325 {
1223 ren = DEFAULT_RSTYLE; 1326 ren = DEFAULT_RSTYLE;
1224 CLEAR_ROWS(row, num); 1327 CLEAR_ROWS (row, num);
1225 } else { 1328 }
1329 else
1330 {
1226 ren = (R->h->rstyle & (RS_fgMask | RS_bgMask)); 1331 ren = rstyle & (RS_fgMask | RS_bgMask);
1227 gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->h->rstyle)]; 1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1228 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1229 ERASE_ROWS(row, num); 1334 ERASE_ROWS (row, num);
1230 gcvalue.foreground = R->PixColors[Color_fg]; 1335 gcvalue.foreground = pix_colors[Color_fg];
1231 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1232 } 1337 }
1338
1233 for (; num--; row++) { 1339 for (; num--; row++)
1234 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend,
1235 (unsigned int)(row + row_offset), R->h->rstyle);
1236 R->screen.tlen[row + row_offset] = 0;
1237 rxvt_blank_line(aR_
1238 R->drawn_text[row], R->drawn_rend[row],
1239 (unsigned int)R->TermWin.ncol, ren);
1240 } 1340 {
1341 scr_blank_screen_mem (ROW(row), rstyle);
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 }
1241} 1344}
1345
1346#if ENABLE_FRILLS
1347void
1348rxvt_term::scr_erase_savelines ()
1349{
1350 want_refresh = 1;
1351 ZERO_SCROLLBACK ();
1352
1353 top_row = 0;
1354}
1355#endif
1242 1356
1243/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1244/* 1358/*
1245 * Fill the screen with `E's 1359 * Fill the screen with `E's
1246 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1247 */ 1361 */
1248/* EXTPROTO */
1249void 1362void
1250rxvt_scr_E(pR) 1363rxvt_term::scr_E ()
1251{ 1364{
1252 int i, j, k; 1365 rend_t fs;
1253 rend_t *r1, fs;
1254 1366
1255 R->h->want_refresh = 1; 1367 want_refresh = 1;
1256 R->h->num_scr_allow = 0;
1257 ZERO_SCROLLBACK(R); 1368 ZERO_SCROLLBACK ();
1258 RESET_CHSTAT(R->h); 1369
1370 num_scr_allow = 0;
1259 rxvt_selection_check(aR_ 3); 1371 selection_check (3);
1260 1372
1261 fs = SET_FONT (R->h->rstyle, R->TermWin.fontset->find_font ('E')); 1373 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1262 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1374 for (int row = nrow; row--; )
1263 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1375 {
1264 fill_text (R->screen.text[k], 'E', R->TermWin.ncol); 1376 line_t &line = ROW(row);
1265 for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) 1377
1378 fill_text (line.t, 'E', ncol);
1379 rend_t *r1 = line.r;
1380
1381 for (int j = ncol; j--; )
1266 *r1++ = fs; 1382 *r1++ = fs;
1383
1384 line.is_longer (0);
1385 line.touch (ncol);
1267 } 1386 }
1268} 1387}
1269 1388
1270/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1271/* 1390/*
1272 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1273 */ 1392 */
1274/* EXTPROTO */
1275void 1393void
1276rxvt_scr_insdel_lines(pR_ int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel)
1277{ 1395{
1278 int end; 1396 int end;
1279 1397
1280 ZERO_SCROLLBACK(R); 1398 ZERO_SCROLLBACK ();
1281 RESET_CHSTAT(R->h);
1282 1399
1283#ifdef RXVT_GRAPHICS
1284 if (rxvt_Gr_Displayed(aR))
1285 rxvt_Gr_scroll(aR_ 0);
1286#endif
1287
1288 rxvt_selection_check(aR_ 1); 1400 selection_check (1);
1289 1401
1290 if (R->screen.cur.row > R->screen.bscroll) 1402 if (screen.cur.row > screen.bscroll)
1291 return;
1292
1293 end = R->screen.bscroll - R->screen.cur.row + 1;
1294 if (count > end) {
1295 if (insdel == DELETE)
1296 return; 1403 return;
1404
1405 end = screen.bscroll - screen.cur.row + 1;
1406 if (count > end)
1407 {
1408 if (insdel == DELETE)
1409 return;
1297 else if (insdel == INSERT) 1410 else if (insdel == INSERT)
1298 count = end; 1411 count = end;
1299 } 1412 }
1300 R->screen.flags &= ~Screen_WrapNext;
1301 1413
1414 scr_do_wrap ();
1415
1302 rxvt_scroll_text(aR_ R->screen.cur.row, R->screen.bscroll, insdel * count, 1416 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1303 0);
1304} 1417}
1305 1418
1306/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1307/* 1420/*
1308 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1309 */ 1422 */
1310/* EXTPROTO */
1311void 1423void
1312rxvt_scr_insdel_chars(pR_ int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel)
1313{ 1425{
1314 int col, row; 1426 int col, row;
1315 rend_t tr; 1427 rend_t tr;
1316 text_t *stp;
1317 rend_t *srp;
1318 int16_t *slp;
1319 1428
1320 R->h->want_refresh = 1; 1429 want_refresh = 1;
1321 ZERO_SCROLLBACK(R); 1430 ZERO_SCROLLBACK ();
1322#if 0
1323 RESET_CHSTAT(R->h);
1324#endif
1325 1431
1326#ifdef RXVT_GRAPHICS
1327 if (rxvt_Gr_Displayed(aR))
1328 rxvt_Gr_scroll(aR_ 0);
1329#endif
1330
1331 if (count <= 0) 1432 if (count <= 0)
1332 return; 1433 return;
1333 1434
1435 scr_do_wrap ();
1436
1334 rxvt_selection_check(aR_ 1); 1437 selection_check (1);
1335 MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); 1438 min_it (count, ncol - screen.cur.col);
1336 1439
1337 row = R->screen.cur.row + R->TermWin.saveLines; 1440 row = screen.cur.row;
1338 R->screen.flags &= ~Screen_WrapNext;
1339 1441
1340 stp = R->screen.text[row]; 1442 line_t *line = &ROW(row);
1341 srp = R->screen.rend[row]; 1443
1342 slp = &(R->screen.tlen[row]); 1444 line->touch ();
1445 line->is_longer (0);
1446
1343 switch (insdel) { 1447 switch (insdel)
1448 {
1344 case INSERT: 1449 case INSERT:
1345 for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; 1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1346 col--) { 1451 {
1347 stp[col] = stp[col - count]; 1452 line->t[col] = line->t[col - count];
1348 srp[col] = srp[col - count]; 1453 line->r[col] = line->r[col - count];
1349 } 1454 }
1350 if (*slp != -1) { 1455
1351 *slp += count; 1456 line->l = min (line->l + count, ncol);
1352 MIN_IT(*slp, R->TermWin.ncol); 1457
1353 }
1354 if (R->selection.op && R->h->current_screen == R->selection.screen 1458 if (selection.op && current_screen == selection.screen
1355 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 {
1356 if (R->selection.end.row != R->screen.cur.row 1461 if (selection.end.row != screen.cur.row
1357 || (R->selection.end.col + count >= R->TermWin.ncol)) 1462 || (selection.end.col + count >= ncol))
1358 CLEAR_SELECTION(R); 1463 CLEAR_SELECTION ();
1359 else { /* shift selection */ 1464 else
1360 R->selection.beg.col += count; 1465 { /* shift selection */
1466 selection.beg.col += count;
1361 R->selection.mark.col += count; /* XXX: yes? */ 1467 selection.mark.col += count; /* XXX: yes? */
1362 R->selection.end.col += count; 1468 selection.end.col += count;
1363 } 1469 }
1364 } 1470 }
1365 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1471
1366 (unsigned int)count, R->h->rstyle); 1472 scr_blank_line (*line, screen.cur.col, count, rstyle);
1367 break; 1473 break;
1474
1368 case ERASE: 1475 case ERASE:
1369 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1476 screen.cur.col += count; /* don't worry if > ncol */
1370 rxvt_selection_check(aR_ 1); 1477 selection_check (1);
1371 R->screen.cur.col -= count; 1478 screen.cur.col -= count;
1372 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1479
1373 (unsigned int)count, R->h->rstyle); 1480 line->l = max (line->l - count, 0);
1374 break; 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1482 break;
1483
1375 case DELETE: 1484 case DELETE:
1376 tr = srp[R->TermWin.ncol - 1] 1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1377 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1486
1378 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1487 for (col = screen.cur.col; (col + count) < ncol; col++)
1379 stp[col] = stp[col + count]; 1488 {
1380 srp[col] = srp[col + count]; 1489 line->t[col] = line->t[col + count];
1381 } 1490 line->r[col] = line->r[col + count];
1382 rxvt_blank_line(aR_ 1491 }
1383 &(stp[R->TermWin.ncol - count]), 1492
1384 &(srp[R->TermWin.ncol - count]), 1493 line->l = max (line->l - count, 0);
1385 (unsigned int)count, tr); 1494 scr_blank_line (*line, ncol - count, count, tr);
1386 if (*slp == -1) /* break line continuation */ 1495
1387 *slp = R->TermWin.ncol;
1388 *slp -= count;
1389 MAX_IT(*slp, 0);
1390 if (R->selection.op && R->h->current_screen == R->selection.screen 1496 if (selection.op && current_screen == selection.screen
1391 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1498 {
1392 if (R->selection.end.row != R->screen.cur.row 1499 if (selection.end.row != screen.cur.row
1393 || (R->screen.cur.col >= R->selection.beg.col - count) 1500 || (screen.cur.col >= selection.beg.col - count)
1394 || R->selection.end.col >= R->TermWin.ncol) 1501 || selection.end.col >= ncol)
1395 CLEAR_SELECTION(R); 1502 CLEAR_SELECTION ();
1396 else { 1503 else
1397 /* shift selection */ 1504 {
1398 R->selection.beg.col -= count; 1505 /* shift selection */
1506 selection.beg.col -= count;
1399 R->selection.mark.col -= count; /* XXX: yes? */ 1507 selection.mark.col -= count; /* XXX: yes? */
1400 R->selection.end.col -= count; 1508 selection.end.col -= count;
1401 } 1509 }
1402 } 1510 }
1403 break; 1511
1512 break;
1404 } 1513 }
1405} 1514}
1406 1515
1407/* ------------------------------------------------------------------------- */ 1516/* ------------------------------------------------------------------------- */
1408/* 1517/*
1409 * Set the scrolling region 1518 * Set the scrolling region
1410 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1411 */ 1520 */
1412/* EXTPROTO */
1413void 1521void
1414rxvt_scr_scroll_region(pR_ int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot)
1415{ 1523{
1416 MAX_IT(top, 0); 1524 max_it (top, 0);
1417 MIN_IT(bot, (int)R->TermWin.nrow - 1); 1525 min_it (bot, nrow - 1);
1526
1418 if (top > bot) 1527 if (top > bot)
1419 return; 1528 return;
1529
1420 R->screen.tscroll = top; 1530 screen.tscroll = top;
1421 R->screen.bscroll = bot; 1531 screen.bscroll = bot;
1422 rxvt_scr_gotorc(aR_ 0, 0, 0); 1532 scr_gotorc (0, 0, 0);
1423} 1533}
1424 1534
1425/* ------------------------------------------------------------------------- */ 1535/* ------------------------------------------------------------------------- */
1426/* 1536/*
1427 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1428 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1429 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1430 */ 1540 */
1431/* EXTPROTO */
1432void 1541void
1433rxvt_scr_cursor_visible(pR_ int mode) 1542rxvt_term::scr_cursor_visible (int mode)
1434{ 1543{
1435 R->h->want_refresh = 1; 1544 want_refresh = 1;
1545
1436 if (mode) 1546 if (mode)
1437 R->screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
1438 else 1548 else
1439 R->screen.flags &= ~Screen_VisibleCursor; 1549 screen.flags &= ~Screen_VisibleCursor;
1440} 1550}
1441 1551
1442/* ------------------------------------------------------------------------- */ 1552/* ------------------------------------------------------------------------- */
1443/* 1553/*
1444 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1445 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1446 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1447 */ 1557 */
1448/* EXTPROTO */
1449void 1558void
1450rxvt_scr_autowrap(pR_ int mode) 1559rxvt_term::scr_autowrap (int mode)
1451{ 1560{
1452 if (mode) 1561 if (mode)
1453 R->screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1454 else 1563 else
1455 R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1456} 1565}
1457 1566
1458/* ------------------------------------------------------------------------- */ 1567/* ------------------------------------------------------------------------- */
1459/* 1568/*
1460 * Set/unset margin origin mode 1569 * Set/unset margin origin mode
… …
1463 * Relative mode: line numbers are relative to top margin of scrolling region 1572 * Relative mode: line numbers are relative to top margin of scrolling region
1464 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1465 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1466 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1467 */ 1576 */
1468/* EXTPROTO */
1469void 1577void
1470rxvt_scr_relative_origin(pR_ int mode) 1578rxvt_term::scr_relative_origin (int mode)
1471{ 1579{
1472 if (mode) 1580 if (mode)
1473 R->screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1474 else 1582 else
1475 R->screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
1584
1476 rxvt_scr_gotorc(aR_ 0, 0, 0); 1585 scr_gotorc (0, 0, 0);
1477} 1586}
1478 1587
1479/* ------------------------------------------------------------------------- */ 1588/* ------------------------------------------------------------------------- */
1480/* 1589/*
1481 * Set insert/replace mode 1590 * Set insert/replace mode
1482 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1483 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1484 */ 1593 */
1485/* EXTPROTO */
1486void 1594void
1487rxvt_scr_insert_mode(pR_ int mode) 1595rxvt_term::scr_insert_mode (int mode)
1488{ 1596{
1489 if (mode) 1597 if (mode)
1490 R->screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1491 else 1599 else
1492 R->screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
1493} 1601}
1494 1602
1495/* ------------------------------------------------------------------------- */ 1603/* ------------------------------------------------------------------------- */
1496/* 1604/*
1497 * Set/Unset tabs 1605 * Set/Unset tabs
1498 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1499 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1500 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1501 */ 1609 */
1502/* EXTPROTO */
1503void 1610void
1504rxvt_scr_set_tab(pR_ int mode) 1611rxvt_term::scr_set_tab (int mode)
1505{ 1612{
1506 if (mode < 0) 1613 if (mode < 0)
1507 MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1508 else if (R->screen.cur.col < R->TermWin.ncol) 1615 else if (screen.cur.col < ncol)
1509 R->tabs[R->screen.cur.col] = (mode ? 1 : 0); 1616 tabs [screen.cur.col] = !!mode;
1510} 1617}
1511 1618
1512/* ------------------------------------------------------------------------- */ 1619/* ------------------------------------------------------------------------- */
1513/* 1620/*
1514 * Set reverse/normal video 1621 * Set reverse/normal video
1515 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1516 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1517 */ 1624 */
1518/* EXTPROTO */
1519void 1625void
1520rxvt_scr_rvideo_mode(pR_ int mode) 1626rxvt_term::scr_rvideo_mode (int mode)
1521{ 1627{
1522 XGCValues gcvalue; 1628 XGCValues gcvalue;
1523 1629
1524 if (R->h->rvideo != mode) { 1630 if (rvideo != mode)
1525 R->h->rvideo = mode; 1631 {
1526 SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); 1632 rvideo = mode;
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1527#if defined(XPM_BACKGROUND) 1634#if XPM_BACKGROUND
1528 if (R->h->bgPixmap.pixmap == None) 1635 if (bgPixmap.pixmap == None)
1529#endif 1636#endif
1530#if defined(TRANSPARENT) 1637#if TRANSPARENT
1531 if (!(R->Options & Opt_transparent) || R->h->am_transparent == 0) 1638 if (! OPTION (Opt_transparent) || am_transparent == 0)
1532#endif 1639#endif
1533 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1640 XSetWindowBackground (display->display, vt,
1534 R->PixColors[Color_bg]); 1641 pix_colors[Color_bg]);
1535 1642
1536 gcvalue.foreground = R->PixColors[Color_fg]; 1643 gcvalue.foreground = pix_colors[Color_fg];
1537 gcvalue.background = R->PixColors[Color_bg]; 1644 gcvalue.background = pix_colors[Color_bg];
1538 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1645 XChangeGC (display->display, gc, GCBackground | GCForeground,
1539 &gcvalue); 1646 &gcvalue);
1540 rxvt_scr_clear(aR); 1647 scr_clear ();
1541 rxvt_scr_touch(aR_ True); 1648 scr_touch (true);
1542 } 1649 }
1543} 1650}
1544 1651
1545/* ------------------------------------------------------------------------- */ 1652/* ------------------------------------------------------------------------- */
1546/* 1653/*
1547 * Report current cursor position 1654 * Report current cursor position
1548 * XTERM_SEQ: Report position: ESC [ 6 n 1655 * XTERM_SEQ: Report position: ESC [ 6 n
1549 */ 1656 */
1550/* EXTPROTO */
1551void 1657void
1552rxvt_scr_report_position(pR) 1658rxvt_term::scr_report_position ()
1553{ 1659{
1554 rxvt_tt_printf(aR_ "\033[%d;%dR", R->screen.cur.row + 1, 1660 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1555 R->screen.cur.col + 1);
1556} 1661}
1557 1662
1558/* ------------------------------------------------------------------------- * 1663/* ------------------------------------------------------------------------- *
1559 * FONTS * 1664 * FONTS *
1560 * ------------------------------------------------------------------------- */ 1665 * ------------------------------------------------------------------------- */
1561 1666
1562/* 1667/*
1563 * Set font style 1668 * Set font style
1564 */ 1669 */
1565/* INTPROTO */
1566void 1670void
1567rxvt_set_font_style(pR) 1671rxvt_term::set_font_style ()
1568{ 1672{
1673#if 0
1569 switch (R->h->charsets[R->screen.charset]) { 1674 switch (charsets [screen.charset])
1675 {
1570 case '0': /* DEC Special Character & Line Drawing Set */ 1676 case '0': /* DEC Special Character & Line Drawing Set */
1571 break; 1677 break;
1572 case 'A': /* United Kingdom (UK) */ 1678 case 'A': /* United Kingdom (UK) */
1573 break; 1679 break;
1574 case 'B': /* United States (USASCII) */ 1680 case 'B': /* United States (USASCII) */
1575 break; 1681 break;
1576 case '<': /* Multinational character set */ 1682 case '<': /* Multinational character set */
1577 break; 1683 break;
1578 case '5': /* Finnish character set */ 1684 case '5': /* Finnish character set */
1579 break; 1685 break;
1580 case 'C': /* Finnish character set */ 1686 case 'C': /* Finnish character set */
1581 break; 1687 break;
1582 case 'K': /* German character set */ 1688 case 'K': /* German character set */
1583 break; 1689 break;
1584 } 1690 }
1691#endif
1585} 1692}
1586 1693
1587/* ------------------------------------------------------------------------- */ 1694/* ------------------------------------------------------------------------- */
1588/* 1695/*
1589 * Choose a font 1696 * Choose a font
1590 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1697 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1591 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1698 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1592 * XTERM_SEQ: Invoke G2 character set: ESC N 1699 * XTERM_SEQ: Invoke G2 character set: ESC N
1593 * XTERM_SEQ: Invoke G3 character set: ESC O 1700 * XTERM_SEQ: Invoke G3 character set: ESC O
1594 */ 1701 */
1595/* EXTPROTO */
1596void 1702void
1597rxvt_scr_charset_choose(pR_ int set) 1703rxvt_term::scr_charset_choose (int set)
1598{ 1704{
1599 R->screen.charset = set; 1705 screen.charset = set;
1600 rxvt_set_font_style(aR); 1706 set_font_style ();
1601} 1707}
1602 1708
1603/* ------------------------------------------------------------------------- */ 1709/* ------------------------------------------------------------------------- */
1604/* 1710/*
1605 * Set a font 1711 * Set a font
… …
1607 * XTERM_SEQ: Set G1 character set: ESC ) <C> 1713 * XTERM_SEQ: Set G1 character set: ESC ) <C>
1608 * XTERM_SEQ: Set G2 character set: ESC * <C> 1714 * XTERM_SEQ: Set G2 character set: ESC * <C>
1609 * XTERM_SEQ: Set G3 character set: ESC + <C> 1715 * XTERM_SEQ: Set G3 character set: ESC + <C>
1610 * See set_font_style for possible values for <C> 1716 * See set_font_style for possible values for <C>
1611 */ 1717 */
1612/* EXTPROTO */
1613void 1718void
1614rxvt_scr_charset_set(pR_ int set, unsigned int ch) 1719rxvt_term::scr_charset_set (int set, unsigned int ch)
1615{ 1720{
1616 R->h->charsets[set] = (unsigned char)ch; 1721 charsets[set] = (unsigned char)ch;
1617 rxvt_set_font_style(aR); 1722 set_font_style ();
1618} 1723}
1619 1724
1620
1621/* ------------------------------------------------------------------------- *
1622 * GRAPHICS COLOURS *
1623 * ------------------------------------------------------------------------- */
1624
1625#ifdef RXVT_GRAPHICS
1626/* EXTPROTO */
1627int
1628rxvt_scr_get_fgcolor(pR)
1629{
1630 return GET_FGCOLOR(R->h->rstyle);
1631}
1632
1633/* ------------------------------------------------------------------------- */
1634/* EXTPROTO */
1635int
1636rxvt_scr_get_bgcolor(pR)
1637{
1638 return GET_BGCOLOR(R->h->rstyle);
1639}
1640#endif
1641 1725
1642/* ------------------------------------------------------------------------- * 1726/* ------------------------------------------------------------------------- *
1643 * MAJOR SCREEN MANIPULATION * 1727 * MAJOR SCREEN MANIPULATION *
1644 * ------------------------------------------------------------------------- */ 1728 * ------------------------------------------------------------------------- */
1645 1729
1646/* 1730/*
1731 * refresh matching text.
1732 */
1733bool
1734rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1735{
1736 bool found = false;
1737
1738 for (int i = 0; i < nrow; i++)
1739 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r;
1742
1743 for (; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value)
1745 {
1746 found = true;
1747 *drp = ~value;
1748 }
1749 }
1750
1751 return found;
1752}
1753
1754/*
1647 * Refresh an area 1755 * Refresh an area
1648 */ 1756 */
1649enum { 1757enum {
1650 PART_BEG = 0, 1758 PART_BEG = 0,
1651 PART_END, 1759 PART_END,
1652 RC_COUNT 1760 RC_COUNT
1653}; 1761};
1654 1762
1655/* EXTPROTO */
1656void 1763void
1657rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) 1764rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1658{ 1765{
1659 int i; 1766 int i;
1660 row_col_t rc[RC_COUNT]; 1767 row_col_t rc[RC_COUNT];
1661 1768
1662 if (R->drawn_text == NULL) /* sanity check */ 1769 if (!drawn_buf) /* sanity check */
1663 return; 1770 return;
1664 1771
1665#ifdef DEBUG_STRICT 1772#ifndef NO_SLOW_LINK_SUPPORT
1666 x = max(x, (int)R->TermWin.int_bwidth); 1773 if (refresh_type == FAST_REFRESH && !display->is_local)
1667 x = min(x, (int)R->TermWin.width); 1774 {
1668 y = max(y, (int)R->TermWin.int_bwidth); 1775 y = 0;
1669 y = min(y, (int)R->TermWin.height); 1776 eheight = height;
1777 }
1670#endif 1778#endif
1671 1779
1672/* round down */ 1780 /* round down */
1673 rc[PART_BEG].col = Pixel2Col(x); 1781 rc[PART_BEG].col = Pixel2Col (x);
1674 rc[PART_BEG].row = Pixel2Row(y); 1782 rc[PART_BEG].row = Pixel2Row (y);
1675/* round up */ 1783 /* round up */
1676 rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); 1784 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1677 rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); 1785 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1678 1786
1679/* sanity checks */ 1787 /* sanity checks */
1680 for (i = PART_BEG; i < RC_COUNT; i++) { 1788 for (i = PART_BEG; i < RC_COUNT; i++)
1681 MIN_IT(rc[i].col, R->TermWin.ncol - 1);
1682 MIN_IT(rc[i].row, R->TermWin.nrow - 1);
1683 } 1789 {
1790 min_it (rc[i].col, ncol - 1);
1791 min_it (rc[i].row, nrow - 1);
1792 }
1684 1793
1685 D_SCREEN((stderr, "rxvt_scr_expose(x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)-(c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1686
1687 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1688 fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, 1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1689 (rc[PART_END].col - rc[PART_BEG].col + 1));
1690 1796
1797 num_scr_allow = 0;
1798
1691 if (refresh) 1799 if (refresh)
1692 rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); 1800 scr_refresh ();
1693} 1801}
1694 1802
1695/* ------------------------------------------------------------------------- */ 1803/* ------------------------------------------------------------------------- */
1696/* 1804/*
1697 * Refresh the entire screen 1805 * Refresh the entire screen
1698 */ 1806 */
1699/* EXTPROTO */
1700void 1807void
1701rxvt_scr_touch(pR_ Bool refresh) 1808rxvt_term::scr_touch (bool refresh)
1702{ 1809{
1703 rxvt_scr_expose(aR_ 0, 0, R->TermWin.width, R->TermWin.height, refresh); 1810 scr_expose (0, 0, width, height, refresh);
1704} 1811}
1705 1812
1706/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1707/* 1814/*
1708 * Move the display so that the line represented by scrollbar value Y is at 1815 * Move the display so that the line represented by scrollbar value Y is at
1709 * the top of the screen 1816 * the top of the screen
1710 */ 1817 */
1711/* EXTPROTO */ 1818void
1712int
1713rxvt_scr_move_to(pR_ int y, int len) 1819rxvt_term::scr_move_to (int y, int len)
1714{ 1820{
1715 long p = 0; 1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1716 uint16_t oldviewstart;
1717
1718 oldviewstart = R->TermWin.view_start;
1719 if (y < len) {
1720 p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len;
1721 p -= (long)(R->TermWin.nrow - 1);
1722 p = max(p, 0);
1723 }
1724 R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled);
1725 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, R->TermWin.view_start));
1726
1727 return rxvt_scr_changeview(aR_ oldviewstart);
1728} 1822}
1729 1823
1730/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1731/* 1825/*
1732 * Page the screen up/down nlines 1826 * Page the screen up/down nlines
1733 * direction should be UP or DN 1827 * direction should be UP or DN
1734 */ 1828 */
1735/* EXTPROTO */ 1829bool
1736int
1737rxvt_scr_page(pR_ enum page_dirn direction, int nlines) 1830rxvt_term::scr_page (enum page_dirn direction, int nlines)
1738{ 1831{
1739 int n; 1832 int new_view_start =
1740 uint16_t oldviewstart; 1833 direction == UP ? view_start - nlines
1834 : view_start + nlines;
1741 1835
1742 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, R->TermWin.view_start));
1743#ifdef DEBUG_STRICT
1744 assert((nlines >= 0) && (nlines <= R->TermWin.nrow));
1745#endif
1746 oldviewstart = R->TermWin.view_start;
1747 if (direction == UP) {
1748 n = R->TermWin.view_start + nlines;
1749 R->TermWin.view_start = min(n, R->TermWin.nscrolled);
1750 } else {
1751 n = R->TermWin.view_start - nlines;
1752 R->TermWin.view_start = max(n, 0);
1753 }
1754 return rxvt_scr_changeview(aR_ oldviewstart); 1836 return scr_changeview (new_view_start);
1755} 1837}
1756 1838
1757/* INTPROTO */ 1839bool
1758int 1840rxvt_term::scr_changeview (int new_view_start)
1759rxvt_scr_changeview(pR_ uint16_t oldviewstart)
1760{ 1841{
1761 if (R->TermWin.view_start != oldviewstart) { 1842 clamp_it (new_view_start, top_row, 0);
1843
1844 if (new_view_start == view_start)
1845 return false;
1846
1847 num_scr += new_view_start - view_start;
1848 view_start = new_view_start;
1762 R->h->want_refresh = 1; 1849 want_refresh = 1;
1763#ifdef RXVT_GRAPHICS
1764 if (rxvt_Gr_Displayed(aR))
1765 rxvt_Gr_scroll(aR_ 0);
1766#endif
1767 R->h->num_scr -= (R->TermWin.view_start - oldviewstart);
1768 }
1769 return (int)(R->TermWin.view_start - oldviewstart);
1770}
1771 1850
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852
1853 return true;
1854}
1855
1772/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1773/* EXTPROTO */
1774void 1857void
1775rxvt_scr_bell(pR) 1858rxvt_term::scr_bell ()
1776{ 1859{
1777#ifndef NO_BELL 1860#ifndef NO_BELL
1861
1778# ifndef NO_MAPALERT 1862# ifndef NO_MAPALERT
1779# ifdef MAPALERT_OPTION 1863# ifdef MAPALERT_OPTION
1780 if (R->Options & Opt_mapAlert) 1864 if (OPTION (Opt_mapAlert))
1781# endif 1865# endif
1782 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 1866 XMapWindow (display->display, parent[0]);
1783# endif 1867# endif
1784 if (R->Options & Opt_visualBell) { 1868
1869 if (OPTION (Opt_visualBell))
1870 {
1785 rxvt_scr_rvideo_mode(aR_ !R->h->rvideo); /* refresh also done */ 1871 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 display->flush ();
1873 rxvt_usleep (VISUAL_BELL_DURATION);
1786 rxvt_scr_rvideo_mode(aR_ !R->h->rvideo); /* refresh also done */ 1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1875 }
1787 } else 1876 else
1788 XBell(R->Xdisplay, 0); 1877 XBell (display->display, 0);
1878
1789#endif 1879#endif
1790} 1880}
1791 1881
1792/* ------------------------------------------------------------------------- */ 1882/* ------------------------------------------------------------------------- */
1793/* ARGSUSED */ 1883/* ARGSUSED */
1794/* EXTPROTO */
1795void 1884void
1796rxvt_scr_printscreen(pR_ int fullhist) 1885rxvt_term::scr_printscreen (int fullhist)
1797{ 1886{
1798#ifdef PRINTPIPE 1887#ifdef PRINTPIPE
1799 int i, r1, nrows, row_offset; 1888 int nrows, row_start;
1800 text_t *t; 1889 FILE *fd;
1801 FILE *fd;
1802 1890
1803 if ((fd = rxvt_popen_printer(aR)) == NULL) 1891 if ((fd = popen_printer ()) == NULL)
1804 return; 1892 return;
1805 nrows = R->TermWin.nrow; 1893
1806 row_offset = R->TermWin.saveLines;
1807 if (!fullhist) 1894 if (fullhist)
1808 row_offset -= R->TermWin.view_start;
1809 else {
1810 nrows += R->TermWin.nscrolled;
1811 row_offset -= R->TermWin.nscrolled;
1812 } 1895 {
1896 nrows = nrow - top_row;
1897 row_start = top_row;
1898 }
1899 else
1900 {
1901 nrows = nrow;
1902 row_start = view_start;
1903 }
1813 1904
1905 wctomb (0, 0);
1906
1814 for (r1 = 0; r1 < nrows; r1++) { 1907 for (int r1 = 0; r1 < nrows; r1++)
1815 t = R->screen.text[r1 + row_offset];
1816 for (i = R->TermWin.ncol - 1; i >= 0; i--)
1817 if (!isspace(t[i]))
1818 break;
1819 fprintf(fd, "%.*s\n", (i + 1), t);
1820 } 1908 {
1909 text_t *tp = ROW(r1).t;
1910 int len = ROW(r1).l;
1911
1912 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1913 {
1914 char mb[MB_LEN_MAX];
1915 text_t t = *tp++;
1916 if (t == NOCHAR)
1917 continue;
1918
1919 len = wctomb (mb, t);
1920
1921 if (len <= 0)
1922 {
1923 mb[0] = ' ';
1924 len = 1;
1925 }
1926
1927 fwrite (mb, 1, len, fd);
1928 }
1929
1930 fputc ('\n', fd);
1931 }
1932
1821 rxvt_pclose_printer(fd); 1933 pclose_printer (fd);
1822#endif 1934#endif
1823} 1935}
1824 1936
1825/* ------------------------------------------------------------------------- */ 1937/* ------------------------------------------------------------------------- */
1826/* 1938/*
1827 * Refresh the screen 1939 * Refresh the screen
1828 * R->drawn_text/R->drawn_rend contain the screen information before the update. 1940 * drawn_text/drawn_rend contain the screen information before the update.
1829 * R->screen.text/R->screen.rend contain what the screen will change to. 1941 * screen.text/screen.rend contain what the screen will change to.
1830 */ 1942 */
1831
1832#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD)
1833# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink))
1834# define MONO_BOLD_FG(x, fg) MONO_BOLD(x)
1835#else
1836# define MONO_BOLD(x) \
1837 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg))
1838# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg)
1839#endif
1840
1841#define FONT_WIDTH(X, Y) \
1842 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1843#define FONT_RBEAR(X, Y) \
1844 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
1845#define FONT_LBEAR(X, Y) \
1846 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing
1847#define IS_FONT_CHAR(X, Y) \
1848 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1849
1850/* EXTPROTO */
1851void 1943void
1852rxvt_scr_refresh(pR_ unsigned char refresh_type) 1944rxvt_term::scr_refresh ()
1853{ 1945{
1854 unsigned char clearfirst, /* first character writes before cell */
1855 clearlast, /* last character writes beyond cell */
1856 must_clear, /* use draw_string not draw_image_string */ 1946 unsigned char must_clear, /* use draw_string not draw_image_string */
1857#ifndef NO_BOLDFONT
1858 bfont, /* we've changed font to bold font */
1859#endif
1860 rvid, /* reverse video this position */
1861 wbyte, /* we're in multibyte */
1862 showcursor; /* show the cursor */ 1947 showcursor; /* show the cursor */
1863 int fore, back; /* desired foreground/background */
1864 int16_t col, row, /* column/row we're processing */ 1948 int16_t col, row, /* column/row we're processing */
1865 ocrow; /* old cursor row */ 1949 ocrow; /* old cursor row */
1866 int cursorwidth;
1867 int i, /* tmp */ 1950 int i; /* tmp */
1868 row_offset; /* basic offset in screen structure */
1869#ifndef NO_CURSORCOLOR 1951#ifndef NO_CURSORCOLOR
1870 rend_t cc1; /* store colours at cursor position(s) */ 1952 rend_t cc1; /* store colours at cursor position (s) */
1871 rend_t cc2; /* store colours at cursor position(s) */
1872#endif 1953#endif
1873 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1954 rend_t *crp; // cursor rendition pointer
1874 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1875 char *buffer; /* local copy of R->h->buffer */
1876 struct rxvt_hidden *h = R->h;
1877 1955
1956 want_refresh = 0; /* screen is current */
1957
1878 if (refresh_type == NO_REFRESH || !R->TermWin.mapped) 1958 if (refresh_type == NO_REFRESH || !mapped)
1879 return; 1959 return;
1880 1960
1881/* 1961 /*
1882 * A: set up vars 1962 * A: set up vars
1883 */ 1963 */
1884 clearfirst = clearlast = must_clear = wbyte = 0; 1964 must_clear = 0;
1885#ifndef NO_BOLDFONT
1886 bfont = 0;
1887#endif
1888
1889 if (h->currmaxcol < R->TermWin.ncol) {
1890 h->currmaxcol = R->TermWin.ncol;
1891 h->buffer = (char *)rxvt_realloc (h->buffer,
1892 sizeof(char) * (h->currmaxcol + 1) * MB_CUR_MAX);
1893 }
1894 buffer = h->buffer;
1895 h->refresh_count = 0; 1965 refresh_count = 0;
1896 1966
1897 row_offset = R->TermWin.saveLines - R->TermWin.view_start;
1898
1899 if ((refresh_type & REFRESH_BOUNDS)) {
1900 clearfirst = clearlast = 1;
1901 h->refresh_type &= ~REFRESH_BOUNDS;
1902 }
1903#if defined(XPM_BACKGROUND) 1967#if XPM_BACKGROUND
1904 must_clear |= (h->bgPixmap.pixmap != None); 1968 must_clear |= bgPixmap.pixmap != None;
1905#endif 1969#endif
1906#if defined(TRANSPARENT) 1970#if TRANSPARENT
1907 must_clear |= ((R->Options & Opt_transparent) && h->am_transparent); 1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1908#endif 1972#endif
1909 ocrow = h->oldcursor.row; /* is there an old outline cursor on screen? */ 1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1910 1974
1911/* 1975 /*
1912 * B: reverse any characters which are selected 1976 * B: reverse any characters which are selected
1913 */ 1977 */
1914 rxvt_scr_reverse_selection(aR); 1978 scr_reverse_selection ();
1915 1979
1916/* 1980 /*
1917 * C: set the cursor character(s) 1981 * C: set the cursor character (s)
1918 */ 1982 */
1919 { 1983 {
1920 unsigned char setoldcursor; 1984 unsigned char setoldcursor;
1921 rend_t ccol1, /* Cursor colour */ 1985 rend_t ccol1, /* Cursor colour */
1922 ccol2; /* Cursor colour2 */ 1986 ccol2; /* Cursor colour2 */
1923 1987
1924 showcursor = (R->screen.flags & Screen_VisibleCursor); 1988 showcursor = (screen.flags & Screen_VisibleCursor);
1925 cursorwidth = 0;
1926#ifdef CURSOR_BLINK 1989#ifdef CURSOR_BLINK
1927 if (R->h->hidden_cursor) 1990 if (hidden_cursor)
1928 showcursor = 0; 1991 showcursor = 0;
1929#endif 1992#endif
1930 1993
1931 cursorwidth = 0;
1932
1933 if (showcursor) 1994 if (showcursor)
1995 {
1996 int col = screen.cur.col;
1997
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--;
2000
2001 crp = &ROW(screen.cur.row).r[col];
2002
2003 if (showcursor && focus)
1934 { 2004 {
1935 cursorwidth++; 2005 if (OPTION (Opt_cursorUnderline))
1936 2006 *crp ^= RS_Uline;
1937 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 2007 else
1938 [R->screen.cur.col]);
1939
1940 if (showcursor && R->TermWin.focus)
1941 { 2008 {
1942 *srp ^= RS_RVid; 2009 *crp ^= RS_RVid;
2010
1943#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1944 cc1 = *srp & (RS_fgMask | RS_bgMask); 2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
1945 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_cursor)) 2013 if (ISSET_PIXCOLOR (Color_cursor))
1946 ccol1 = Color_cursor; 2014 ccol1 = Color_cursor;
1947 else 2015 else
1948#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1949 ccol1 = GET_FGCOLOR(h->rstyle); 2017 ccol1 = fgcolor_of (rstyle);
1950#else 2018#else
1951 ccol1 = Color_fg; 2019 ccol1 = Color_fg;
1952#endif 2020#endif
1953 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_cursor2)) 2021 if (ISSET_PIXCOLOR (Color_cursor2))
1954 ccol2 = Color_cursor2; 2022 ccol2 = Color_cursor2;
1955 else 2023 else
1956#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1957 ccol2 = GET_BGCOLOR(h->rstyle); 2025 ccol2 = bgcolor_of (rstyle);
1958#else 2026#else
1959 ccol2 = Color_bg; 2027 ccol2 = Color_bg;
1960#endif 2028#endif
1961 *srp = SET_FGCOLOR(*srp, ccol1); 2029 *crp = SET_FGCOLOR (*crp, ccol1);
1962 *srp = SET_BGCOLOR(*srp, ccol2); 2030 *crp = SET_BGCOLOR (*crp, ccol2);
1963#endif 2031#endif
1964 } 2032 }
1965
1966 while (IS_WIDE (*srp))
1967 cursorwidth++, srp++;
1968 } 2033 }
2034 }
1969 2035
1970 /* make sure no outline cursor is left around */ 2036 /* make sure no outline cursor is left around */
1971 setoldcursor = 0;
1972 if (ocrow != -1) {
1973 if (R->screen.cur.row + R->TermWin.view_start != ocrow
1974 || R->screen.cur.col != h->oldcursor.col) {
1975 if (ocrow < R->TermWin.nrow
1976 && h->oldcursor.col < R->TermWin.ncol) {
1977 R->drawn_rend[ocrow][h->oldcursor.col] ^= (RS_RVid | RS_Uline);
1978 }
1979 if (R->TermWin.focus || !showcursor)
1980 h->oldcursor.row = -1;
1981 else
1982 setoldcursor = 1; 2037 setoldcursor = 0;
2038 if (ocrow != -1)
2039 {
2040 if (screen.cur.row - view_start != ocrow
2041 || screen.cur.col != oldcursor.col)
2042 {
2043 if (ocrow < nrow
2044 && oldcursor.col < ncol)
2045 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2046
2047 if (focus || !showcursor)
2048 oldcursor.row = -1;
2049 else
2050 setoldcursor = 1;
2051 }
1983 } 2052 }
1984 } else if (!R->TermWin.focus) 2053 else if (!focus)
1985 setoldcursor = 1; 2054 setoldcursor = 1;
2055
1986 if (setoldcursor) { 2056 if (setoldcursor)
1987 if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow) 2057 {
1988 h->oldcursor.row = -1; 2058 if (screen.cur.row - view_start >= nrow)
1989 else { 2059 oldcursor.row = -1;
1990 h->oldcursor.row = R->screen.cur.row + R->TermWin.view_start; 2060 else
2061 {
2062 oldcursor.row = screen.cur.row - view_start;
1991 h->oldcursor.col = R->screen.cur.col; 2063 oldcursor.col = screen.cur.col;
1992 } 2064 }
1993 }
1994 } 2065 }
2066 }
2067
2068 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2069#if ENABLE_OVERLAY
2070 scr_swap_overlay ();
2071#endif
1995 2072
1996#ifndef NO_SLOW_LINK_SUPPORT 2073#ifndef NO_SLOW_LINK_SUPPORT
1997/* 2074 /*
1998 * D: CopyArea pass - very useful for slower links 2075 * D: CopyArea pass - very useful for slower links
1999 * This has been deliberately kept simple. 2076 * This has been deliberately kept simple.
2000 */ 2077 */
2001 i = h->num_scr; 2078 if (!display->is_local
2002 if (refresh_type == FAST_REFRESH && h->num_scr_allow && i 2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2003 && abs(i) < R->TermWin.nrow && !must_clear) { 2080 && abs (num_scr) < nrow && !must_clear)
2004 int16_t nits; 2081 {
2005 int j; 2082 int16_t nits;
2006 rend_t *drp2; 2083 int j;
2007 text_t *dtp2; 2084 int len, wlen;
2008 int len, wlen; 2085 dLocal (int, num_scr);
2009 2086
2010 j = R->TermWin.nrow; 2087 j = nrow;
2011 wlen = len = -1; 2088 wlen = len = -1;
2012 row = i > 0 ? 0 : j - 1; 2089 row = i > 0 ? 0 : j - 1;
2013 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) { 2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 {
2014 if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) { 2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2015 stp = R->screen.text[row + row_offset]; 2093 {
2016 srp = R->screen.rend[row + row_offset]; 2094 line_t s = ROW(view_start + row);
2017 dtp = R->drawn_text[row]; 2095 line_t d = drawn_buf[row];
2018 dtp2 = R->drawn_text[row + i]; 2096 line_t d2 = drawn_buf[row + i];
2019 drp = R->drawn_rend[row]; 2097
2020 drp2 = R->drawn_rend[row + i]; 2098 for (nits = 0, col = ncol; col--; )
2021 for (nits = 0, col = R->TermWin.ncol; col--; )
2022 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2099 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2023 nits--; 2100 nits--;
2024 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2101 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2025 nits++; 2102 nits++;
2103
2026 if (nits > 8) { /* XXX: arbitrary choice */ 2104 if (nits > 8) /* XXX: arbitrary choice */
2027 for (col = R->TermWin.ncol; col--; ) { 2105 {
2028 *dtp++ = *dtp2++; 2106 for (col = ncol; col--; )
2029 *drp++ = *drp2++; 2107 {
2030 } 2108 *d.t++ = *d2.t++;
2109 *d.r++ = *d2.r++;
2110 }
2111
2112 if (len == -1)
2113 len = row;
2114
2115 wlen = row;
2116 continue;
2117 }
2118 }
2119
2031 if (len == -1) 2120 if (len != -1)
2032 len = row; 2121 {
2033 wlen = row; 2122 /* also comes here at end if needed because of >= above */
2034 continue; 2123 if (wlen < len)
2035 } 2124 ::swap (wlen, len);
2125
2126 XCopyArea (display->display, vt, vt,
2127 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len));
2131 len = -1;
2132 }
2133 }
2036 } 2134 }
2037 if (len != -1) {
2038 /* also comes here at end if needed because of >= above */
2039 if (wlen < len)
2040 SWAP_IT(wlen, len, int);
2041 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2042 XCopyArea(R->Xdisplay, R->TermWin.vt, R->TermWin.vt,
2043 R->TermWin.gc, 0, Row2Pixel(len + i),
2044 (unsigned int)TermWin_TotalWidth(),
2045 (unsigned int)Height2Pixel(wlen - len + 1),
2046 0, Row2Pixel(len));
2047 len = -1;
2048 }
2049 }
2050 }
2051#endif 2135#endif
2052 2136
2053/* 2137 /*
2054 * E: main pass across every character 2138 * E: main pass across every character
2055 */ 2139 */
2056 for (row = 0; row < R->TermWin.nrow; row++) 2140 for (row = 0; row < nrow; row++)
2057 { 2141 {
2058 stp = R->screen.text[row + row_offset]; 2142 text_t *stp = ROW(view_start + row).t;
2059 srp = R->screen.rend[row + row_offset]; 2143 rend_t *srp = ROW(view_start + row).r;
2060 dtp = R->drawn_text[row]; 2144 text_t *dtp = drawn_buf[row].t;
2061 drp = R->drawn_rend[row]; 2145 rend_t *drp = drawn_buf[row].r;
2062 2146
2063/* 2147 /*
2064 * E2: OK, now the real pass 2148 * E2: OK, now the real pass
2065 */ 2149 */
2066 int ypixel = (int)Row2Pixel(row); 2150 int ypixel = (int)Row2Pixel (row);
2067 2151
2068 for (col = 0; col < R->TermWin.ncol; col++) { 2152 for (col = 0; col < ncol; col++)
2153 {
2069 /* compare new text with old - if exactly the same then continue */ 2154 /* compare new text with old - if exactly the same then continue */
2070 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2071
2072 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2155 if (stp[col] == dtp[col] /* Must match characters to skip. */
2073 && (rend == drp[col] /* Either rendition the same or */ 2156 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2074 || (stp[col] == ' ' /* space w/ no background change */ 2157 || (stp[col] == ' ' /* space w/ no background change */
2075 && GET_BGATTR(rend) == GET_BGATTR(drp[col])))) 2158 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2076 continue; 2159 continue;
2077 2160
2161 // redraw one or more characters
2162
2163 // seek to the beginning of wide characters
2164 while (stp[col] == NOCHAR && col > 0)
2165 --col;
2166
2167 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2078 text_t *text = stp + col; 2168 text_t *text = stp + col;
2079 int count = 1; 2169 int count = 1;
2080 2170
2081 /* redraw one or more characters */
2082
2083 dtp[col] = stp[col]; 2171 dtp[col] = stp[col];
2084 drp[col] = rend; 2172 drp[col] = rend;
2085 2173
2086 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2087 continue;
2088
2089 int xpixel = Col2Pixel(col); 2174 int xpixel = Col2Pixel (col);
2090 2175
2091 // this loop looks very messy, it can probably be optimized
2092 // and cleaned a bit by you?
2093 for (i = 0; ++col < R->TermWin.ncol; ) 2176 for (i = 0; ++col < ncol; )
2094 { 2177 {
2095 if (stp[col] == NOCHAR) 2178 if (stp[col] == NOCHAR)
2096 { 2179 {
2097 dtp[col] = stp[col]; 2180 dtp[col] = stp[col];
2098 drp[col] = rend; 2181 drp[col] = rend;
2099 count++; 2182 count++;
2100
2101 if (i) // only possible skip if char unchanged
2102 i++; 2183 i++;
2103 2184
2104 continue; 2185 continue;
2105 } 2186 }
2106 2187
2107 if (((rend ^ srp[col]) & ~RS_wide) != 0) 2188 if (!RS_SAME (rend, srp[col]))
2108 break; 2189 break;
2109 2190
2110 count++; 2191 count++;
2111 2192
2112 if (stp[col] != dtp[col] 2193 if (stp[col] != dtp[col]
2113 || srp[col] != drp[col]) 2194 || !RS_SAME (srp[col], drp[col]))
2114 { 2195 {
2115 if (must_clear && (i++ > (count / 2))) 2196 if (must_clear && (i++ > count / 2))
2116 break; 2197 break;
2117 2198
2118 dtp[col] = stp[col]; 2199 dtp[col] = stp[col];
2119 drp[col] = rend; 2200 drp[col] = rend;
2120 i = 0; 2201 i = 0;
2121 } 2202 }
2122 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2203 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2123 break; 2204 break;
2124 } 2205 }
2125 2206
2126 col--; /* went one too far. move back */ 2207 col--; /* went one too far. move back */
2127 count -= i; /* dump any matching trailing chars */ 2208 count -= i; /* dump any matching trailing chars */
2128 2209
2129/* 2210 // sometimes we optimize away the trailing NOCHAR's, add them back
2211 while (i && text[count] == NOCHAR)
2212 count++, i--;
2213
2214 /*
2130 * Determine the attributes for the string 2215 * Determine the attributes for the string
2131 */ 2216 */
2132 int fid = GET_FONT(rend); 2217 int fore = fgcolor_of (rend); // desired foreground
2133 fore = GET_FGCOLOR(rend); 2218 int back = bgcolor_of (rend); // desired background
2134 back = GET_BGCOLOR(rend);
2135 rend = GET_ATTR(rend);
2136 2219
2137 rvid = (rend & RS_RVid) ? 1 : 0; 2220 // only do special processing if any attributes are set, which is unlikely
2138#ifdef OPTION_HC 2221 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2139 if (!rvid && (rend & RS_Blink))
2140 { 2222 {
2141 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_HC)) 2223#if ENABLE_STYLES
2142 back = Color_HC; 2224 // force redraw after "careful" characters to avoid pixel droppings
2143 else 2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2144 rvid = !rvid; /* fall back */ 2226 drp[col + 1] = ~srp[col + 1];
2145 } 2227
2228 // include previous careful character(s) if possible, looks nicer (best effort...)
2229 while (text > stp
2230 && srp[text - stp - 1] & RS_Careful
2231 && RS_SAME (rend, srp[text - stp - 1]))
2232 text--, count++, xpixel -= fwidth;
2146#endif 2233#endif
2147 if (rvid) 2234
2148 { 2235 bool invert = rend & RS_RVid;
2149 SWAP_IT(fore, back, int);
2150 2236
2151#ifndef NO_BOLD_UNDERLINE_REVERSE 2237#ifndef NO_BOLD_UNDERLINE_REVERSE
2152 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_RV) 2238 if (rend & RS_Bold
2153# ifndef NO_CURSORCOLOR 2239 && fore == Color_fg)
2154 && !ISSET_PIXCOLOR(h, Color_cursor) 2240 {
2241 if (ISSET_PIXCOLOR (Color_BD))
2242 fore = Color_BD;
2243# if !ENABLE_STYLES
2244 else
2245 invert = !invert;
2155# endif 2246# endif
2156 ) 2247 }
2157 back = Color_RV; 2248
2249 if (rend & RS_Italic
2250 && fore == Color_fg)
2251 {
2252 if (ISSET_PIXCOLOR (Color_IT))
2253 fore = Color_IT;
2254# if !ENABLE_STYLES
2255 else
2256 invert = !invert;
2158#endif 2257# endif
2159 } 2258 }
2259
2260 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2261 fore = Color_UL;
2262#endif
2263
2264 if (invert)
2265 {
2266 ::swap (fore, back);
2267
2160#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2161 else if (rend & RS_Bold) 2269 if (ISSET_PIXCOLOR (Color_RV))
2162 { 2270 back = Color_RV;
2163 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_BD)) 2271
2272 if (fore == back)
2164 { 2273 {
2165 fore = Color_BD; 2274 fore = Color_bg;
2166# ifndef VERYBOLD 2275 back = Color_fg;
2167 rend &= ~RS_Bold; /* we've taken care of it */
2168# endif
2169 } 2276 }
2170 } 2277#endif
2171 else if (rend & RS_Uline) 2278 }
2279
2280#ifdef TEXT_BLINK
2281 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2172 { 2282 {
2173 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_UL)) 2283 if (!text_blink_ev.active)
2174 { 2284 {
2175 fore = Color_UL; 2285 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2176 rend &= ~RS_Uline; /* we've taken care of it */ 2286 hidden_text = 0;
2177 } 2287 }
2178 } 2288 else if (hidden_text)
2289 fore = back;
2290 }
2179#endif 2291#endif
2292 }
2180 2293
2181/* 2294 /*
2182 * Actually do the drawing of the string here 2295 * Actually do the drawing of the string here
2183 */ 2296 */
2184 rxvt_font *font = (*R->TermWin.fontset)[fid]; 2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2185 2298
2299 if (back == fore)
2300 font->clear_rect (*drawable, xpixel, ypixel,
2301 fwidth * count, fheight,
2302 back);
2186 if (back == Color_bg) 2303 else if (back == Color_bg)
2187 { 2304 {
2188 if (must_clear) 2305 if (must_clear)
2189 { 2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308
2190 for (i = 0; i < count; i++) /* don't draw empty strings */ 2309 for (i = 0; i < count; i++) /* don't draw empty strings */
2191 if (text[i] != ' ') { 2310 if (text[i] != ' ')
2311 {
2192 font->draw (xpixel, ypixel, text, count, fore, -1); 2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2193 goto nodraw; 2313 break;
2194 } 2314 }
2195 CLEAR_CHARS(xpixel, ypixel, count);
2196nodraw: ;
2197 } 2315 }
2198 else 2316 else
2199 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2200 } else 2318 }
2319 else
2201 font->draw (xpixel, ypixel, text, count, fore, back); 2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2202 2321
2203 if ((rend & RS_Uline) && (font->descent > 1)) 2322 if (rend & RS_Uline && font->descent > 1 && fore != back)
2204 XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc, 2323 {
2205 xpixel, ypixel + font->ascent + 1, 2324#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2327 else
2328#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]);
2330
2331 XDrawLine (display->display, drawBuffer, gc,
2332 xpixel, ypixel + font->ascent + 1,
2206 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2207 } /* for (col....) */ 2334 }
2208 } /* for (row....) */ 2335 } /* for (col....) */
2336 } /* for (row....) */
2209 2337
2210/* 2338#if ENABLE_OVERLAY
2339 scr_swap_overlay ();
2340#endif
2341 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2342
2343 /*
2211 * G: cleanup cursor and display outline cursor if necessary 2344 * G: cleanup cursor and display outline cursor if necessary
2212 */ 2345 */
2213 if (showcursor) { 2346 if (showcursor)
2214 if (R->TermWin.focus) { 2347 {
2215 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 2348 if (focus)
2216 [R->screen.cur.col]); 2349 {
2217 *srp ^= RS_RVid; 2350 if (OPTION (Opt_cursorUnderline))
2351 *crp ^= RS_Uline;
2352 else
2353 {
2354 *crp ^= RS_RVid;
2218#ifndef NO_CURSORCOLOR 2355#ifndef NO_CURSORCOLOR
2219 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2356 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2220#endif 2357#endif
2358 }
2359 }
2221 } else if (h->oldcursor.row >= 0) { 2360 else if (oldcursor.row >= 0)
2361 {
2362 int cursorwidth = 1;
2363 int col = oldcursor.col;
2364
2365 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2366 col--;
2367
2368 while (col + cursorwidth < ncol
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++;
2371
2222#ifndef NO_CURSORCOLOR 2372#ifndef NO_CURSORCOLOR
2223 unsigned long gcmask; /* Graphics Context mask */ 2373 if (ISSET_PIXCOLOR (Color_cursor))
2224
2225 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_cursor)) {
2226 XSetForeground (R->Xdisplay, R->TermWin.gc, R->PixColors[Color_cursor]); 2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2375#endif
2376
2377 XDrawRectangle (display->display, drawBuffer, gc,
2378 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 }
2227 } 2383 }
2228#endif 2384
2229 XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, 2385 /*
2230 Col2Pixel(h->oldcursor.col),
2231 Row2Pixel(h->oldcursor.row),
2232 (unsigned int)(Width2Pixel(cursorwidth) - 1),
2233 (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1));
2234 }
2235 }
2236/*
2237 * H: cleanup selection 2386 * H: cleanup selection
2238 */ 2387 */
2239 rxvt_scr_reverse_selection(aR); 2388 scr_reverse_selection ();
2240 2389
2241/*
2242 * I: other general cleanup
2243 */
2244 if (clearfirst && R->TermWin.int_bwidth)
2245 /*
2246 * clear the whole screen height, note that width == 0 is treated
2247 * specially by XClearArea
2248 */
2249 XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0,
2250 (unsigned int)R->TermWin.int_bwidth,
2251 (unsigned int)TermWin_TotalHeight(), False);
2252 if (clearlast && R->TermWin.int_bwidth)
2253 /*
2254 * clear the whole screen height, note that width == 0 is treated
2255 * specially by XClearArea
2256 */
2257 XClearArea(R->Xdisplay, R->TermWin.vt,
2258 R->TermWin.width + R->TermWin.int_bwidth, 0,
2259 (unsigned int)R->TermWin.int_bwidth,
2260 (unsigned int)TermWin_TotalHeight(), False);
2261 if (refresh_type & SMOOTH_REFRESH)
2262 XSync(R->Xdisplay, False);
2263
2264 h->num_scr = 0; 2390 num_scr = 0;
2265 h->num_scr_allow = 1; 2391 num_scr_allow = 1;
2266 h->want_refresh = 0; /* screen is current */
2267} 2392}
2268/* ------------------------------------------------------------------------- */
2269 2393
2270/* EXTPROTO */
2271void 2394void
2272rxvt_scr_clear(pR) 2395rxvt_term::scr_remap_chars (line_t &l)
2273{ 2396{
2274 if (!R->TermWin.mapped) 2397 if (!l.t)
2275 return; 2398 return;
2276 R->h->num_scr_allow = 0; 2399
2277 R->h->want_refresh = 1; 2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2401
2402 for (int i = ncol; i--; )
2403 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2404}
2405
2406void
2407rxvt_term::scr_remap_chars ()
2408{
2409 for (int i = total_rows; i--; )
2410 scr_remap_chars (row_buf [i]);
2411
2412 for (int i = nrow; i--; )
2413 {
2414 scr_remap_chars (drawn_buf [i]);
2415 scr_remap_chars (swap_buf [i]);
2416 }
2417}
2418
2419void
2420rxvt_term::scr_recolour ()
2421{
2422 if (1
2278#ifdef TRANSPARENT 2423#if TRANSPARENT
2279 if ((R->Options & Opt_transparent) && (R->h->am_pixmap_trans == 0)) { 2424 && !am_transparent
2280 int i; 2425#endif
2281 2426#if XPM_BACKGROUND
2282 if (!(R->Options & Opt_transparent_all)) 2427 && !bgPixmap.pixmap
2283 i = 0; 2428#endif
2284 else 2429 )
2285 i = (int)(sizeof(R->TermWin.parent) / sizeof(Window));
2286 for (; i--;)
2287 if (R->TermWin.parent[i] != None)
2288 XClearWindow(R->Xdisplay, R->TermWin.parent[i]);
2289 } 2430 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2434#if HAVE_SCROLLBARS
2435 if (scrollBar.win)
2436 {
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle ();
2439 scrollbar_show (0);
2440 }
2290#endif 2441#endif
2442 }
2443
2444 scr_clear ();
2445 scr_touch (true);
2446 want_refresh = 1;
2447}
2448
2449/* ------------------------------------------------------------------------- */
2450void
2451rxvt_term::scr_clear (bool really)
2452{
2453 if (!mapped)
2454 return;
2455
2456 num_scr_allow = 0;
2457 want_refresh = 1;
2458
2459 if (really)
2291 XClearWindow(R->Xdisplay, R->TermWin.vt); 2460 XClearWindow (display->display, vt);
2292} 2461}
2293 2462
2294/* ------------------------------------------------------------------------- */
2295/* INTPROTO */
2296void 2463void
2297rxvt_scr_reverse_selection(pR) 2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2298{ 2465{
2299 int i, col, row, end_row; 2466 int view_end = view_start + nrow;
2300 rend_t *srp; 2467 int row, col;
2301 2468
2302 if (R->selection.op && R->h->current_screen == R->selection.screen) { 2469 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2303 end_row = R->TermWin.saveLines - R->TermWin.view_start; 2470 {
2304 i = R->selection.beg.row + R->TermWin.saveLines; 2471 text_t *stp = ROW(row).t;
2305 row = R->selection.end.row + R->TermWin.saveLines; 2472 rend_t *srp = ROW(row).r;
2306 if (i >= end_row) 2473
2307 col = R->selection.beg.col; 2474 for (col = beg_col; col < end_col; col++)
2308 else { 2475 srp[col] ^= rstyle1;
2476
2477 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2478 srp[col] ^= rstyle2;
2479
2480 if (++col < end_col)
2481 srp[col] ^= rstyle2;
2482 }
2483}
2484
2485void
2486rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2487{
2488 int view_end = view_start + nrow;
2489 int row, col;
2490
2491 if (beg_row >= view_start)
2492 {
2493 col = beg_col;
2494 row = beg_row;
2495 }
2496 else
2497 {
2309 col = 0; 2498 col = 0;
2310 i = end_row; 2499 row = view_start;
2311 } 2500 }
2312 end_row += R->TermWin.nrow; 2501
2313 for (; i < row && i < end_row; i++, col = 0) 2502 for (; row < min (end_row, view_end); row++, col = 0)
2314 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) 2503 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2315#ifndef OPTION_HC 2504 srp[col] ^= rstyle;
2316 srp[col] ^= RS_RVid; 2505
2317#else 2506 if (row == end_row)
2318 srp[col] ^= RS_Blink; 2507 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2508 srp[col] ^= rstyle;
2509}
2510
2511/* ------------------------------------------------------------------------- */
2512void
2513rxvt_term::scr_reverse_selection ()
2514{
2515 if (selection.op
2516 && current_screen == selection.screen
2517 && selection.end.row >= view_start)
2518 {
2519#if ENABLE_FRILLS
2520 if (selection.rect)
2521 scr_xor_rect (selection.beg.row, selection.beg.col,
2522 selection.end.row, selection.end.col,
2523 RS_RVid, RS_RVid | RS_Uline);
2524 else
2319#endif 2525#endif
2320 if (i == row && i < end_row) 2526 scr_xor_span (selection.beg.row, selection.beg.col,
2321 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) 2527 selection.end.row, selection.end.col,
2322#ifndef OPTION_HC 2528 RS_RVid);
2323 srp[col] ^= RS_RVid;
2324#else
2325 srp[col] ^= RS_Blink;
2326#endif
2327 } 2529 }
2328} 2530}
2329 2531
2330/* ------------------------------------------------------------------------- */ 2532/* ------------------------------------------------------------------------- */
2331/* 2533/*
2332 * Dump the whole scrollback and screen to the passed filedescriptor. The 2534 * Dump the whole scrollback and screen to the passed filedescriptor. The
2333 * invoking routine must close the fd. 2535 * invoking routine must close the fd.
2334 */ 2536 */
2335#if 0 2537#if 0
2336/* EXTPROTO */
2337void 2538void
2338rxvt_scr_dump(pR_ int fd) 2539rxvt_term::scr_dump (int fd)
2339{ 2540{
2340 int row, wrote; 2541 int row, wrote;
2341 unsigned int width, towrite; 2542 unsigned int width, towrite;
2342 char r1[] = "\n"; 2543 char r1[] = "\n";
2343 2544
2344 for (row = R->TermWin.saveLines - R->TermWin.nscrolled; 2545 for (row = saveLines - nsaved;
2345 row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { 2546 row < saveLines + nrow - 1; row++)
2346 width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] 2547 {
2347 : R->TermWin.ncol; 2548 width = row_buf[row].l >= 0 ? row_buf[row].l
2549 : ncol;
2348 for (towrite = width; towrite; towrite -= wrote) { 2550 for (towrite = width; towrite; towrite -= wrote)
2551 {
2349 wrote = write(fd, &(R->screen.text[row][width - towrite]), 2552 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2350 towrite); 2553 towrite);
2351 if (wrote < 0) 2554 if (wrote < 0)
2352 return; /* XXX: death, no report */ 2555 return; /* XXX: death, no report */
2353 } 2556 }
2354 if (R->screen.tlen[row] >= 0) 2557 if (row_buf[row].l >= 0)
2355 if (write(fd, r1, 1) <= 0) 2558 if (write (fd, r1, 1) <= 0)
2356 return; /* XXX: death, no report */ 2559 return; /* XXX: death, no report */
2357 } 2560 }
2358} 2561}
2359#endif 2562#endif
2360 2563
2361/* ------------------------------------------------------------------------- * 2564/* ------------------------------------------------------------------------- *
2362 * CHARACTER SELECTION * 2565 * CHARACTER SELECTION *
2363 * ------------------------------------------------------------------------- */ 2566 * ------------------------------------------------------------------------- */
2364
2365/*
2366 * -R->TermWin.nscrolled <= (selection row) <= R->TermWin.nrow - 1
2367 */
2368/* EXTPROTO */
2369void 2567void
2370rxvt_selection_check(pR_ int check_more) 2568rxvt_term::selection_check (int check_more)
2371{ 2569{
2372 row_col_t pos; 2570 row_col_t pos;
2373 2571
2374 if (!R->selection.op) 2572 if (!selection.op)
2375 return; 2573 return;
2376 2574
2377 pos.row = pos.col = 0; 2575 pos.row = pos.col = 0;
2378 if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) 2576 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2379 || (R->selection.beg.row >= R->TermWin.nrow) 2577 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2380 || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) 2578 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2381 || (R->selection.mark.row >= R->TermWin.nrow)
2382 || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled)
2383 || (R->selection.end.row >= R->TermWin.nrow)
2384 || (check_more == 1 2579 || (check_more == 1
2385 && R->h->current_screen == R->selection.screen 2580 && current_screen == selection.screen
2386 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 2581 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2387 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) 2582 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2388 || (check_more == 2 2583 || (check_more == 2
2389 && ROWCOL_IS_BEFORE(R->selection.beg, pos) 2584 && ROWCOL_IS_BEFORE (selection.beg, pos)
2390 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2585 && ROWCOL_IS_AFTER (selection.end, pos))
2391 || (check_more == 3 2586 || (check_more == 3
2392 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2587 && ROWCOL_IS_AFTER (selection.end, pos))
2393 || (check_more == 4 /* screen width change */ 2588 || (check_more == 4 /* screen width change */
2394 && (R->selection.beg.row != R->selection.end.row 2589 && (selection.beg.row != selection.end.row
2395 || R->selection.end.col > R->TermWin.ncol))) 2590 || selection.end.col > ncol)))
2396 CLEAR_SELECTION(R); 2591 CLEAR_SELECTION ();
2397} 2592}
2398 2593
2399/* ------------------------------------------------------------------------- */ 2594/* ------------------------------------------------------------------------- */
2400/* 2595/*
2401 * Paste a selection direct to the command fd 2596 * Paste a selection direct to the command fd
2402 */ 2597 */
2403/* INTPROTO */
2404void 2598void
2405rxvt_PasteIt(pR_ const unsigned char *data, unsigned int nitems) 2599rxvt_term::paste (char *data, unsigned int len)
2406{ 2600{
2407 unsigned int i, j, n;
2408 unsigned char *ds = (unsigned char *)rxvt_malloc(PROP_SIZE);
2409
2410/* convert normal newline chars into common keyboard Return key sequence */ 2601 /* convert normal newline chars into common keyboard Return key sequence */
2411 for (i = 0; i < nitems; i += PROP_SIZE) { 2602 for (unsigned int i = 0; i < len; i++)
2412 n = min(nitems - i, PROP_SIZE); 2603 if (data[i] == C0_LF)
2413 MEMCPY(ds, data + i, n); 2604 data[i] = C0_CR;
2414 for (j = 0; j < n; j++) 2605
2415 if (ds[j] == '\n') 2606 tt_write (data, len);
2416 ds[j] = '\r';
2417 rxvt_tt_write(aR_ ds, (int)n);
2418 }
2419 free(ds);
2420} 2607}
2421 2608
2422/* ------------------------------------------------------------------------- */ 2609/* ------------------------------------------------------------------------- */
2423/* 2610/*
2424 * Respond to a notification that a primary selection has been sent 2611 * Respond to a notification that a primary selection has been sent
2425 * EXT: SelectionNotify 2612 * EXT: SelectionNotify
2426 */ 2613 */
2427/* EXTPROTO */ 2614void
2428int
2429rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2615rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2430{ 2616{
2431 long nread = 0; 2617 if (prop == None) /* check for failed XConvertSelection */
2618 {
2619 if ((selection_type & Sel_CompoundText))
2620 {
2621 int selnum = selection_type & Sel_whereMask;
2622
2623 selection_type = 0;
2624 if (selnum != Sel_direct)
2625 selection_request_other (XA_STRING, selnum);
2626 }
2627
2628 if ((selection_type & Sel_UTF8String))
2629 {
2630 int selnum = selection_type & Sel_whereMask;
2631
2632 selection_type = Sel_CompoundText;
2633 if (selnum != Sel_direct)
2634 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2635 else
2636 selection_type = 0;
2637 }
2638
2639 return;
2640 }
2641
2432 unsigned long bytes_after; 2642 unsigned long bytes_after;
2433 XTextProperty ct; 2643 XTextProperty ct;
2434#ifdef MULTICHAR_SET
2435 int dummy_count;
2436 char **cl;
2437#endif
2438 2644
2439 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->h->selection_wait)); 2645 if (XGetWindowProperty (display->display, win, prop,
2440 2646 0, PROP_SIZE / 4,
2441 if (prop == None) { /* check for failed XConvertSelection */ 2647 delete_prop, AnyPropertyType,
2442#ifdef MULTICHAR_SET 2648 &ct.encoding, &ct.format,
2443 if ((R->h->selection_type & Sel_CompoundText)) { 2649 &ct.nitems, &bytes_after,
2444 int selnum = R->h->selection_type & Sel_whereMask; 2650 &ct.value) != Success)
2445
2446 R->h->selection_type = 0;
2447 if (selnum != Sel_direct)
2448 rxvt_selection_request_other(aR_ XA_STRING, selnum);
2449 }
2450#endif
2451 return 0;
2452 } 2651 {
2453 for (;;) { 2652 ct.value = 0;
2454 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2653 goto bailout;
2455 (long)(PROP_SIZE / 4), delete_prop, 2654 }
2456 AnyPropertyType, &ct.encoding, &ct.format, 2655
2457 &ct.nitems, &bytes_after,
2458 &ct.value) != Success)
2459 break;
2460 if (ct.encoding == 0) { 2656 if (ct.encoding == None)
2461 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2657 goto bailout;
2462 break; 2658
2463 } 2659 if (bytes_after)
2660 {
2661 // fetch and append remaining data
2662 XTextProperty ct2;
2663
2664 if (XGetWindowProperty (display->display, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success)
2670 goto bailout;
2671
2672 // realloc should be compatible to XFree, here, and elsewhere, too
2673 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2674 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2675 ct.nitems += ct2.nitems;
2676
2677 XFree (ct2.value);
2678 }
2679
2464 if (ct.value == NULL) { 2680 if (ct.value == 0)
2465 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); 2681 goto bailout;
2466 continue; 2682
2467 } 2683 if (ct.encoding == xa[XA_INCR])
2684 {
2685 // INCR selection, start handshake
2686 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop);
2688
2689 selection_wait = Sel_incr;
2690 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10);
2692
2693 goto bailout;
2694 }
2695
2468 if (ct.nitems == 0) { 2696 if (ct.nitems == 0)
2469 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2697 {
2470 if (R->h->selection_wait == Sel_normal && nread == 0) { 2698 if (selection_wait == Sel_incr)
2471 /* 2699 {
2700 XFree (ct.value);
2701
2702 // finally complete, now paste the whole thing
2703 selection_wait = Sel_normal;
2704 ct.value = (unsigned char *)incr_buf;
2705 ct.nitems = incr_buf_fill;
2706 incr_buf = 0;
2707 incr_buf_size = 0;
2708 incr_ev.stop ();
2709 }
2710 else
2711 {
2712 if (selection_wait == Sel_normal
2713 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2714 {
2715 /*
2472 * pass through again trying CUT_BUFFER0 if we've come from 2716 * pass through again trying CUT_BUFFER0 if we've come from
2473 * XConvertSelection() but nothing was presented 2717 * XConvertSelection () but nothing was presented
2474 */ 2718 */
2475 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2719 selection_paste (display->root, XA_CUT_BUFFER0, False);
2476 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2720 }
2721
2722 goto bailout;
2723 }
2477 } 2724 }
2478 nread = -1; /* discount any previous stuff */ 2725 else if (selection_wait == Sel_incr)
2479 break; 2726 {
2480 } 2727 incr_ev.start (NOW + 10);
2481 nread += ct.nitems; 2728
2482#ifdef MULTICHAR_SET 2729 while (incr_buf_fill + ct.nitems > incr_buf_size)
2730 {
2731 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2732 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2733 }
2734
2735 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2736 incr_buf_fill += ct.nitems;
2737
2738 goto bailout;
2739 }
2740
2741 char **cl;
2742 int cr;
2743
2744#if ENABLE_FRILLS
2745 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2746 // so recode it manually
2747 if (ct.encoding == xa[XA_UTF8_STRING])
2748 {
2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2750 char *s = rxvt_wcstombs (w);
2751 free (w);
2752 // TODO: strlen == only the first element will be converted. well...
2753 paste (s, strlen (s));
2754 free (s);
2755 }
2756 else
2757#endif
2483 if (XmbTextPropertyToTextList(R->Xdisplay, &ct, &cl, 2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2484 &dummy_count) == Success && cl) { 2759 && cl)
2485 rxvt_PasteIt(aR_ cl[0], STRLEN(cl[0])); 2760 {
2761 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i]));
2763
2486 XFreeStringList(cl); 2764 XFreeStringList (cl);
2765 }
2487 } else 2766 else
2488#endif 2767 paste ((char *)ct.value, ct.nitems); // paste raw
2489 rxvt_PasteIt(aR_ ct.value, (unsigned int)ct.nitems); 2768
2490 if (bytes_after == 0) 2769bailout:
2491 break;
2492 XFree(ct.value); 2770 XFree (ct.value);
2493 } 2771
2494 if (ct.value)
2495 XFree(ct.value);
2496 if (R->h->selection_wait == Sel_normal) 2772 if (selection_wait == Sel_normal)
2773 selection_wait = Sel_none;
2774}
2775
2776void
2777rxvt_term::incr_cb (time_watcher &w)
2778{
2497 R->h->selection_wait = Sel_none; 2779 selection_wait = Sel_none;
2498 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2499 return (int)nread;
2500}
2501 2780
2502/* 2781 incr_buf_size = 0;
2503 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2782 free (incr_buf);
2504 */ 2783
2505/* EXTPROTO */ 2784 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2785}
2786
2506void 2787void
2507rxvt_selection_property(pR_ Window win, Atom prop) 2788rxvt_term::selection_property (Window win, Atom prop)
2508{ 2789{
2509 int reget_time = 0; 2790 if (prop == None || selection_wait != Sel_incr)
2510
2511 if (prop == None)
2512 return;
2513 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2514 if (R->h->selection_wait == Sel_normal) {
2515 int a, afmt;
2516 Atom atype;
2517 unsigned long bytes_after, nitems;
2518 unsigned char *s = NULL;
2519
2520 a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False,
2521 R->h->xa[XA_INCR], &atype, &afmt, &nitems,
2522 &bytes_after, &s);
2523 if (s)
2524 XFree(s);
2525 if (a != Success)
2526 return; 2791 return;
2527#ifndef __CYGWIN32__ 2792
2528 if (atype == R->h->xa[XA_INCR]) { /* start an INCR transfer */ 2793 selection_paste (win, prop, true);
2529 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2530 XDeleteProperty(R->Xdisplay, win, prop);
2531 XFlush(R->Xdisplay);
2532 reget_time = 1;
2533 R->h->selection_wait = Sel_incr;
2534 }
2535#endif
2536 } else if (R->h->selection_wait == Sel_incr) {
2537 reget_time = 1;
2538 if (rxvt_selection_paste(aR_ win, prop, True) == -1) {
2539 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2540 R->h->selection_wait = Sel_none;
2541 R->h->timeout[TIMEOUT_INCR].tv_sec = 0; /* turn off timer */
2542 }
2543 }
2544 if (reget_time) { /* received more data so reget time */
2545 (void)gettimeofday(&(R->h->timeout[TIMEOUT_INCR]), NULL);
2546 R->h->timeout[TIMEOUT_INCR].tv_sec += 10; /* ten seconds wait */
2547 }
2548} 2794}
2795
2549/* ------------------------------------------------------------------------- */ 2796/* ------------------------------------------------------------------------- */
2550/* 2797/*
2551 * Request the current selection: 2798 * Request the current selection:
2552 * Order: > internal selection if available 2799 * Order: > internal selection if available
2553 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2800 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2554 * > CUT_BUFFER0 2801 * > CUT_BUFFER0
2555 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2556 * will auto fallback to CUT_BUFFER0 2803 * will auto fallback to CUT_BUFFER0
2557 * EXT: button 2 release 2804 * EXT: button 2 release
2558 */ 2805 */
2559/* EXTPROTO */
2560void 2806void
2561rxvt_selection_request(pR_ Time tm, int x, int y) 2807rxvt_term::selection_request (Time tm)
2562{ 2808{
2563 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2809 if (selection.text)
2564 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2810 { /* internal selection */
2565 return; /* outside window */ 2811 char *str = rxvt_wcstombs (selection.text, selection.len);
2812 paste (str, strlen (str));
2813 free (str);
2814 return;
2815 }
2816 else
2817 {
2818 int i;
2566 2819
2567 if (R->selection.text != NULL) { /* internal selection */
2568 D_SELECT((stderr, "rxvt_selection_request: pasting internal"));
2569 rxvt_PasteIt(aR_ R->selection.text, R->selection.len);
2570 return;
2571 } else {
2572 int i;
2573
2574 R->h->selection_request_time = tm; 2820 selection_request_time = tm;
2575 R->h->selection_wait = Sel_normal; 2821 selection_wait = Sel_normal;
2822
2576 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2823 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2577#ifdef MULTICHAR_SET 2824 {
2578 R->h->selection_type = Sel_CompoundText; 2825#if X_HAVE_UTF8_STRING
2826 selection_type = Sel_UTF8String;
2827 if (selection_request_other (xa[XA_UTF8_STRING], i))
2828 return;
2579#else 2829#else
2580 R->h->selection_type = 0; 2830 selection_type = Sel_CompoundText;
2831 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2832 return;
2581#endif 2833#endif
2582 if (rxvt_selection_request_other(aR_ 2834 }
2583#ifdef MULTICHAR_SET
2584 R->h->xa[XA_COMPOUND_TEXT],
2585#else
2586 XA_STRING,
2587#endif
2588 i))
2589 return;
2590 }
2591 } 2835 }
2836
2592 R->h->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2837 selection_wait = Sel_none; /* don't loop in selection_paste () */
2593 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2594 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2838 selection_paste (display->root, XA_CUT_BUFFER0, false);
2595} 2839}
2596 2840
2597/* INTPROTO */
2598int 2841int
2599rxvt_selection_request_other(pR_ Atom target, int selnum) 2842rxvt_term::selection_request_other (Atom target, int selnum)
2600{ 2843{
2601 Atom sel; 2844 Atom sel;
2602#ifdef DEBUG_SELECT
2603 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2604#endif
2605 2845
2606 R->h->selection_type |= selnum; 2846 selection_type |= selnum;
2847
2607 if (selnum == Sel_Primary) 2848 if (selnum == Sel_Primary)
2608 sel = XA_PRIMARY; 2849 sel = XA_PRIMARY;
2609 else if (selnum == Sel_Secondary) 2850 else if (selnum == Sel_Secondary)
2610 sel = XA_SECONDARY; 2851 sel = XA_SECONDARY;
2611 else 2852 else
2612 sel = R->h->xa[XA_CLIPBOARD]; 2853 sel = xa[XA_CLIPBOARD];
2854
2613 if (XGetSelectionOwner(R->Xdisplay, sel) != None) { 2855 if (XGetSelectionOwner (display->display, sel) != None)
2614 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2856 {
2615 XConvertSelection(R->Xdisplay, sel, target, R->h->xa[XA_VT_SELECTION], 2857 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2616 R->TermWin.vt, R->h->selection_request_time); 2858 vt, selection_request_time);
2617 return 1; 2859 return 1;
2618 } 2860 }
2861
2619 return 0; 2862 return 0;
2620} 2863}
2621 2864
2622/* ------------------------------------------------------------------------- */ 2865/* ------------------------------------------------------------------------- */
2623/* 2866/*
2624 * Clear all selected text 2867 * Clear all selected text
2625 * EXT: SelectionClear 2868 * EXT: SelectionClear
2626 */ 2869 */
2627/* EXTPROTO */
2628void 2870void
2629rxvt_selection_clear(pR) 2871rxvt_term::selection_clear ()
2630{ 2872{
2631 D_SELECT((stderr, "rxvt_selection_clear()"));
2632
2633 R->h->want_refresh = 1; 2873 want_refresh = 1;
2634 if (R->selection.text)
2635 free(R->selection.text); 2874 free (selection.text);
2636 R->selection.text = NULL; 2875 selection.text = NULL;
2637 R->selection.len = 0; 2876 selection.len = 0;
2638 CLEAR_SELECTION(R); 2877 CLEAR_SELECTION ();
2878
2879 if (display->selection_owner == this)
2880 display->selection_owner = 0;
2639} 2881}
2640 2882
2641/* ------------------------------------------------------------------------- */ 2883/* ------------------------------------------------------------------------- */
2642/* 2884/*
2643 * Copy a selection into the cut buffer 2885 * Copy a selection into the cut buffer
2644 * EXT: button 1 or 3 release 2886 * EXT: button 1 or 3 release
2645 */ 2887 */
2646/* EXTPROTO */
2647void 2888void
2648rxvt_selection_make(pR_ Time tm) 2889rxvt_term::selection_make (Time tm)
2649{ 2890{
2650 int i, col, end_col, row, end_row; 2891 int i;
2651 unsigned char *new_selection_text; 2892 wchar_t *new_selection_text;
2652 char *str; 2893 text_t *t;
2653 text_t *t;
2654#ifdef ACS_ASCII
2655 rend_t *re;
2656#endif
2657 2894
2658 D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks));
2659 switch (R->selection.op) { 2895 switch (selection.op)
2896 {
2660 case SELECTION_CONT: 2897 case SELECTION_CONT:
2661 break; 2898 break;
2662 case SELECTION_INIT: 2899 case SELECTION_INIT:
2663 CLEAR_SELECTION(R); 2900 CLEAR_SELECTION ();
2664 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2665 case SELECTION_BEGIN: 2902 case SELECTION_BEGIN:
2666 R->selection.op = SELECTION_DONE; 2903 selection.op = SELECTION_DONE;
2667 /* FALLTHROUGH */ 2904 /* FALLTHROUGH */
2668 default: 2905 default:
2669 return; 2906 return;
2670 } 2907 }
2908
2671 R->selection.op = SELECTION_DONE; 2909 selection.op = SELECTION_DONE;
2672 2910
2673 if (R->selection.clicks == 4) 2911 if (selection.clicks == 4)
2674 return; /* nothing selected, go away */ 2912 return; /* nothing selected, go away */
2675 2913
2914 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2915 return;
2916
2676 i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; 2917 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2677 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2918 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2678 2919
2679 new_selection_text = (unsigned char *)str; 2920 int ofs = 0;
2921 int extra = 0;
2680 2922
2681 col = R->selection.beg.col; 2923 int col = selection.beg.col;
2682 MAX_IT(col, 0); 2924 int row = selection.beg.row;
2683 row = R->selection.beg.row + R->TermWin.saveLines;
2684 end_row = R->selection.end.row + R->TermWin.saveLines;
2685 2925
2926 int end_col;
2927
2686 for (; row <= end_row; row++, col = 0) 2928 for (; row <= selection.end.row; row++, col = 0)
2929 {
2930#if ENABLE_FRILLS
2931 if (selection.rect)
2687 { 2932 {
2688 t = &(R->screen.text[row][col]); 2933 col = selection.beg.col;
2934 end_col = ncol + 1;
2935 }
2936 else
2937#endif
2938 end_col = ROW(row).l;
2689 2939
2690 end_col = R->screen.tlen[row]; 2940 col = max (col, 0);
2691 2941
2692 if (end_col == -1)
2693 end_col = R->TermWin.ncol;
2694
2695 if (row == end_row) 2942 if (row == selection.end.row
2943#if ENABLE_FRILLS
2944 || selection.rect
2945#endif
2946 )
2696 MIN_IT (end_col, R->selection.end.col); 2947 min_it (end_col, selection.end.col);
2697 2948
2949 t = ROW(row).t + col;
2950
2698 for (; col < end_col; col++) 2951 for (; col < end_col; col++)
2952 {
2699 if (*t == NOCHAR) 2953 if (*t == NOCHAR)
2700 t++; 2954 t++;
2955#if ENABLE_COMBINING
2956 else if (IS_COMPOSE (*t))
2957 {
2958 int len = rxvt_composite.expand (*t, 0);
2959
2960 extra -= (len - 1);
2961
2962 if (extra < 0)
2963 {
2964 extra += i;
2965 i += i;
2966 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2967 }
2968
2969 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2970 }
2971#endif
2701 else 2972 else
2702 { 2973 new_selection_text[ofs++] = *t++;
2703 int len = wctomb (str, *t++);
2704 if (len > 0)
2705 str += len;
2706 }
2707
2708 if (R->screen.tlen[row] != -1 && row != end_row)
2709 *str++ = '\n';
2710 } 2974 }
2711 2975
2712#ifndef NO_OLD_SELECTION 2976#if ENABLE_FRILLS
2713 if (R->selection_style == OLD_SELECT) 2977 if (selection.rect)
2714 if (end_col == R->TermWin.ncol) 2978 {
2715 *str++ = '\n'; 2979 while (ofs
2980 && new_selection_text[ofs - 1] != C0_LF
2981 && unicode::is_space (new_selection_text[ofs - 1]))
2982 --ofs;
2983
2984 new_selection_text[ofs++] = C0_LF;
2985 }
2986 else
2716#endif 2987#endif
2717#ifndef NO_NEW_SELECTION 2988 if (!ROW(row).is_longer () && row != selection.end.row)
2718 if (R->selection_style != OLD_SELECT) 2989 new_selection_text[ofs++] = C0_LF;
2990 }
2991
2719 if (end_col != R->selection.end.col) 2992 if (end_col != selection.end.col)
2720 *str++ = '\n'; 2993 new_selection_text[ofs++] = C0_LF;
2721#endif
2722 *str = '\0';
2723 2994
2724 i = str - (char *)new_selection_text; 2995 new_selection_text[ofs] = 0;
2996
2725 if (i == 0) 2997 if (ofs == 0)
2726 { 2998 {
2727 free (new_selection_text); 2999 free (new_selection_text);
2728 return; 3000 return;
2729 } 3001 }
2730 3002
2731 // due to MB_MAX_CUR, selection wastage is usually high
2732 if (str - (char *)new_selection_text > 1024)
2733 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2734
2735 R->selection.len = i;
2736 if (R->selection.text)
2737 free (R->selection.text); 3003 free (selection.text);
2738 3004
2739 R->selection.text = new_selection_text; 3005 // we usually allocate much more than necessary, so realloc it smaller again
3006 selection.len = ofs;
3007 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2740 3008
2741 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 3009 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2742 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 3010 return;
2743 rxvt_print_error("can't get primary selection"); 3011
2744 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 3012 selection_grab (tm);
2745 PropModeReplace, R->selection.text, (int)R->selection.len); 3013}
3014
3015bool
3016rxvt_term::selection_grab (Time tm)
3017{
2746 R->h->selection_time = tm; 3018 selection_time = tm;
2747 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); 3019
3020 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3021 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3022 {
3023 display->set_selection_owner (this);
3024 return true;
3025 }
3026 else
3027 {
3028 selection_clear ();
3029 return false;
3030 }
3031
3032#if 0
3033 XTextProperty ct;
3034
3035 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3036 {
3037 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3038 XFree (ct.value);
3039 }
3040#endif
2748} 3041}
2749 3042
2750/* ------------------------------------------------------------------------- */ 3043/* ------------------------------------------------------------------------- */
2751/* 3044/*
2752 * Mark or select text based upon number of clicks: 1, 2, or 3 3045 * Mark or select text based upon number of clicks: 1, 2, or 3
2753 * EXT: button 1 press 3046 * EXT: button 1 press
2754 */ 3047 */
2755/* EXTPROTO */
2756void 3048void
2757rxvt_selection_click(pR_ int clicks, int x, int y) 3049rxvt_term::selection_click (int clicks, int x, int y)
2758{ 3050{
2759 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2760
2761 clicks = ((clicks - 1) % 3) + 1; 3051 clicks = ((clicks - 1) % 3) + 1;
2762 R->selection.clicks = clicks; /* save clicks so extend will work */ 3052 selection.clicks = clicks; /* save clicks so extend will work */
2763 3053
3054 if (clicks == 2 && !selection.rect
3055 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3056 {
3057 MEvent.clicks = 1; // what a mess
3058 selection.screen = current_screen;
3059 selection.op = SELECTION_CONT;
3060 return;
3061 }
3062
2764 rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); 3063 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3064
2765 if (clicks == 2 || clicks == 3) 3065 if (clicks == 2 || clicks == 3)
2766 rxvt_selection_extend_colrow(aR_ R->selection.mark.col, 3066 selection_extend_colrow (selection.mark.col,
2767 R->selection.mark.row 3067 selection.mark.row - view_start,
2768 + R->TermWin.view_start, 3068 0, /* button 3 */
2769 0, /* button 3 */ 3069 1, /* button press */
2770 1, /* button press */ 3070 0); /* click change */
2771 0); /* click change */
2772} 3071}
2773 3072
2774/* ------------------------------------------------------------------------- */ 3073/* ------------------------------------------------------------------------- */
2775/* 3074/*
2776 * Mark a selection at the specified col/row 3075 * Mark a selection at the specified col/row
2777 */ 3076 */
2778/* INTPROTO */
2779void 3077void
2780rxvt_selection_start_colrow(pR_ int col, int row) 3078rxvt_term::selection_start_colrow (int col, int row)
2781{ 3079{
2782 R->h->want_refresh = 1; 3080 want_refresh = 1;
3081
3082 selection.mark.row = row + view_start;
2783 R->selection.mark.col = col; 3083 selection.mark.col = col;
2784 R->selection.mark.row = row - R->TermWin.view_start; 3084
2785 MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); 3085 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2786 MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); 3086 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3087
3088 while (selection.mark.col > 0
3089 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2787 MAX_IT(R->selection.mark.col, 0); 3090 --selection.mark.col;
2788 MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); 3091
2789 3092 if (selection.op)
2790 if (R->selection.op) { /* clear the old selection */ 3093 { /* clear the old selection */
2791 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3094 selection.beg.row = selection.end.row = selection.mark.row;
2792 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3095 selection.beg.col = selection.end.col = selection.mark.col;
2793 } 3096 }
3097
2794 R->selection.op = SELECTION_INIT; 3098 selection.op = SELECTION_INIT;
2795 R->selection.screen = R->h->current_screen; 3099 selection.screen = current_screen;
2796} 3100}
2797 3101
2798/* ------------------------------------------------------------------------- */ 3102/* ------------------------------------------------------------------------- */
2799/* 3103/*
2800 * Word select: select text for 2 clicks 3104 * Word select: select text for 2 clicks
2801 * We now only find out the boundary in one direction 3105 * We now only find out the boundary in one direction
2802 */ 3106 */
2803 3107
2804/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3108/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2805#define DELIMIT_TEXT(x) \ 3109#define DELIMIT_TEXT(x) \
2806 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->h->rs[Rs_cutchars], (x)) != NULL)) 3110 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2807#ifdef MULTICHAR_SET
2808# define DELIMIT_REND(x) (((x) & RS_multiMask) ? 1 : 0)
2809#else
2810# define DELIMIT_REND(x) 1 3111#define DELIMIT_REND(x) 1
2811#endif
2812 3112
2813/* INTPROTO */
2814void 3113void
2815rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3114rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2816{ 3115{
2817 int col, row, dirnadd, tcol, trow, w1, w2; 3116 int col, row, dirnadd, tcol, trow, w1, w2;
2818 row_col_t bound; 3117 row_col_t bound;
2819 text_t *stp; 3118 text_t *stp;
2820 rend_t *srp; 3119 rend_t *srp;
2821 3120
2822 if (dirn == UP) { 3121 if (dirn == UP)
2823 bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1;
2824 bound.col = 0;
2825 dirnadd = -1;
2826 } else {
2827 bound.row = R->TermWin.saveLines + R->TermWin.nrow;
2828 bound.col = R->TermWin.ncol - 1;
2829 dirnadd = 1;
2830 } 3122 {
2831 row = mark->row + R->TermWin.saveLines; 3123 bound.row = top_row - 1;
3124 bound.col = 0;
3125 dirnadd = -1;
3126 }
3127 else
3128 {
3129 bound.row = nrow;
3130 bound.col = ncol - 1;
3131 dirnadd = 1;
3132 }
3133
3134 row = mark->row;
2832 col = mark->col; 3135 col = max (mark->col, 0);
2833 MAX_IT(col, 0); 3136
2834/* find the edge of a word */ 3137 /* find the edge of a word */
2835 stp = &(R->screen.text[row][col]); 3138 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
2836 w1 = DELIMIT_TEXT(*stp); 3139 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
2837 3140
2838 if (R->selection_style != NEW_SELECT) {
2839 if (w1 == 1) {
2840 stp += dirnadd;
2841 if (DELIMIT_TEXT(*stp) == 1)
2842 goto Old_Word_Selection_You_Die;
2843 col += dirnadd;
2844 }
2845 w1 = 0;
2846 }
2847 srp = (&R->screen.rend[row][col]);
2848 w2 = DELIMIT_REND(*srp);
2849
2850 for (;;) { 3141 for (;;)
3142 {
2851 for (; col != bound.col; col += dirnadd) { 3143 for (; col != bound.col; col += dirnadd)
3144 {
2852 stp += dirnadd; 3145 stp += dirnadd;
3146 srp += dirnadd;
3147
3148 if (*stp == NOCHAR)
3149 continue;
3150
2853 if (DELIMIT_TEXT(*stp) != w1) 3151 if (DELIMIT_TEXT (*stp) != w1)
2854 break; 3152 break;
2855 srp += dirnadd;
2856 if (DELIMIT_REND(*srp) != w2) 3153 if (DELIMIT_REND (*srp) != w2)
2857 break; 3154 break;
2858 } 3155 }
3156
2859 if ((col == bound.col) && (row != bound.row)) { 3157 if ((col == bound.col) && (row != bound.row))
2860 if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) { 3158 {
2861 trow = row + dirnadd; 3159 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
2862 tcol = dirn == UP ? R->TermWin.ncol - 1 : 0; 3160 {
2863 if (R->screen.text[trow] == NULL) 3161 trow = row + dirnadd;
2864 break; 3162 tcol = dirn == UP ? ncol - 1 : 0;
2865 stp = &(R->screen.text[trow][tcol]); 3163
2866 srp = &(R->screen.rend[trow][tcol]); 3164 if (!ROW(trow).t)
3165 break;
3166
3167 stp = ROW(trow).t + tcol;
3168 srp = ROW(trow).r + tcol;
3169
2867 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) 3170 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3171 break;
3172
3173 row = trow;
3174 col = tcol;
3175 continue;
3176 }
3177 }
2868 break; 3178 break;
2869 row = trow;
2870 col = tcol;
2871 continue;
2872 } 3179 }
2873 }
2874 break;
2875 }
2876 Old_Word_Selection_You_Die:
2877 D_SELECT((stderr, "rxvt_selection_delimit_word(%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - R->TermWin.saveLines, col));
2878 3180
2879 if (dirn == DN) 3181 if (dirn == DN)
2880 col++; /* put us on one past the end */ 3182 col++; /* put us on one past the end */
2881 3183
2882/* Poke the values back in */ 3184 /* Poke the values back in */
2883 ret->row = row - R->TermWin.saveLines; 3185 ret->row = row;
2884 ret->col = col; 3186 ret->col = col;
2885} 3187}
2886 3188
2887/* ------------------------------------------------------------------------- */ 3189/* ------------------------------------------------------------------------- */
2888/* 3190/*
2889 * Extend the selection to the specified x/y pixel location 3191 * Extend the selection to the specified x/y pixel location
2890 * EXT: button 3 press; button 1 or 3 drag 3192 * EXT: button 3 press; button 1 or 3 drag
2891 * flag == 0 ==> button 1 3193 * flag == 0 ==> button 1
2892 * flag == 1 ==> button 3 press 3194 * flag == 1 ==> button 3 press
2893 * flag == 2 ==> button 3 motion 3195 * flag == 2 ==> button 3 motion
2894 */ 3196 */
2895/* EXTPROTO */
2896void 3197void
2897rxvt_selection_extend(pR_ int x, int y, int flag) 3198rxvt_term::selection_extend (int x, int y, int flag)
2898{ 3199{
2899 int col, row; 3200 int col = clamp (Pixel2Col (x), 0, ncol);
3201 int row = clamp (Pixel2Row (y), 0, nrow - 1);
2900 3202
2901 col = Pixel2Col(x); 3203 /*
2902 row = Pixel2Row(y);
2903 MAX_IT(row, 0);
2904 MIN_IT(row, (int)R->TermWin.nrow - 1);
2905 MAX_IT(col, 0);
2906 MIN_IT(col, (int)R->TermWin.ncol);
2907#ifndef NO_NEW_SELECTION
2908/*
2909 * If we're selecting characters (single click) then we must check first 3204 * If we're selecting characters (single click) then we must check first
2910 * if we are at the same place as the original mark. If we are then 3205 * if we are at the same place as the original mark. If we are then
2911 * select nothing. Otherwise, if we're to the right of the mark, you have to 3206 * select nothing. Otherwise, if we're to the right of the mark, you have to
2912 * be _past_ a character for it to be selected. 3207 * be _past_ a character for it to be selected.
2913 */ 3208 */
2914 if (R->selection_style != OLD_SELECT) {
2915 if (((R->selection.clicks % 3) == 1) && !flag 3209 if (((selection.clicks % 3) == 1) && !flag
2916 && (col == R->selection.mark.col 3210 && (col == selection.mark.col
2917 && (row == R->selection.mark.row + R->TermWin.view_start))) { 3211 && (row == selection.mark.row - view_start)))
3212 {
2918 /* select nothing */ 3213 /* select nothing */
2919 R->selection.beg.row = R->selection.end.row = 0; 3214 selection.beg.row = selection.end.row = 0;
2920 R->selection.beg.col = R->selection.end.col = 0; 3215 selection.beg.col = selection.end.col = 0;
2921 R->selection.clicks = 4; 3216 selection.clicks = 4;
2922 R->h->want_refresh = 1; 3217 want_refresh = 1;
2923 D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4"));
2924 return; 3218 return;
2925 }
2926 } 3219 }
2927#endif 3220
2928 if (R->selection.clicks == 4) 3221 if (selection.clicks == 4)
2929 R->selection.clicks = 1; 3222 selection.clicks = 1;
3223
2930 rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ 3224 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2931 flag == 1 ? 1 : 0, /* ? button press */ 3225 flag == 1 ? 1 : 0, /* ? button press */
2932 0); /* no click change */ 3226 0); /* no click change */
2933} 3227}
2934 3228
2935/* ------------------------------------------------------------------------- */ 3229/* ------------------------------------------------------------------------- */
2936/* 3230/*
2937 * Extend the selection to the specified col/row 3231 * Extend the selection to the specified col/row
2938 */ 3232 */
2939/* INTPROTO */
2940void 3233void
2941rxvt_selection_extend_colrow(pR_ int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3234rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
2942{ 3235{
2943 int16_t ncol = R->TermWin.ncol;
2944 int end_col;
2945 row_col_t pos; 3236 row_col_t pos;
2946 enum { 3237 enum {
2947 LEFT, RIGHT 3238 LEFT, RIGHT
2948 } closeto = RIGHT; 3239 } closeto = RIGHT;
2949 3240
2950 D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, R->selection.clicks, R->selection.op));
2951 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col));
2952
2953 R->h->want_refresh = 1; 3241 want_refresh = 1;
3242
2954 switch (R->selection.op) { 3243 switch (selection.op)
3244 {
2955 case SELECTION_INIT: 3245 case SELECTION_INIT:
2956 CLEAR_SELECTION(R); 3246 CLEAR_SELECTION ();
2957 R->selection.op = SELECTION_BEGIN; 3247 selection.op = SELECTION_BEGIN;
2958 /* FALLTHROUGH */ 3248 /* FALLTHROUGH */
2959 case SELECTION_BEGIN: 3249 case SELECTION_BEGIN:
2960 if (row != R->selection.mark.row || col != R->selection.mark.col 3250 if (row != selection.mark.row || col != selection.mark.col
2961 || (!button3 && buttonpress)) 3251 || (!button3 && buttonpress))
2962 R->selection.op = SELECTION_CONT; 3252 selection.op = SELECTION_CONT;
2963 break; 3253 break;
2964 case SELECTION_DONE: 3254 case SELECTION_DONE:
2965 R->selection.op = SELECTION_CONT; 3255 selection.op = SELECTION_CONT;
2966 /* FALLTHROUGH */ 3256 /* FALLTHROUGH */
2967 case SELECTION_CONT: 3257 case SELECTION_CONT:
2968 break; 3258 break;
2969 case SELECTION_CLEAR: 3259 case SELECTION_CLEAR:
2970 rxvt_selection_start_colrow(aR_ col, row); 3260 selection_start_colrow (col, row);
2971 /* FALLTHROUGH */ 3261 /* FALLTHROUGH */
2972 default: 3262 default:
2973 return; 3263 return;
2974 } 3264 }
3265
2975 if (R->selection.beg.col == R->selection.end.col 3266 if (selection.beg.col == selection.end.col
2976 && R->selection.beg.col != R->selection.mark.col 3267 && selection.beg.col != selection.mark.col
2977 && R->selection.beg.row == R->selection.end.row 3268 && selection.beg.row == selection.end.row
2978 && R->selection.beg.row != R->selection.mark.row) { 3269 && selection.beg.row != selection.mark.row)
3270 {
2979 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3271 selection.beg.col = selection.end.col = selection.mark.col;
2980 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3272 selection.beg.row = selection.end.row = selection.mark.row;
2981 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col));
2982 } 3273 }
2983 3274
2984 pos.col = col; 3275 pos.col = col;
2985 pos.row = row; 3276 pos.row = view_start + row;
2986 3277
2987 pos.row -= R->TermWin.view_start; /* adjust for scroll */ 3278 /*
2988
2989#ifndef NO_OLD_SELECTION
2990/*
2991 * This mimics some of the selection behaviour of version 2.20 and before.
2992 * There are no ``selection modes'', button3 is always character extension.
2993 * Note: button3 drag is always available, c.f. v2.20
2994 * Selection always terminates (left or right as appropriate) at the mark.
2995 */
2996 if (R->selection_style == OLD_SELECT) {
2997 if (R->selection.clicks == 1 || button3) {
2998 if (R->h->hate_those_clicks) {
2999 R->h->hate_those_clicks = 0;
3000 if (R->selection.clicks == 1) {
3001 R->selection.beg.row = R->selection.mark.row;
3002 R->selection.beg.col = R->selection.mark.col;
3003 } else {
3004 R->selection.mark.row = R->selection.beg.row;
3005 R->selection.mark.col = R->selection.beg.col;
3006 }
3007 }
3008 if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) {
3009 R->selection.end.row = R->selection.mark.row;
3010 R->selection.end.col = R->selection.mark.col + 1;
3011 R->selection.beg.row = pos.row;
3012 R->selection.beg.col = pos.col;
3013 } else {
3014 R->selection.beg.row = R->selection.mark.row;
3015 R->selection.beg.col = R->selection.mark.col;
3016 R->selection.end.row = pos.row;
3017 R->selection.end.col = pos.col + 1;
3018 }
3019 } else if (R->selection.clicks == 2) {
3020 rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark),
3021 &(R->selection.beg));
3022 rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark),
3023 &(R->selection.end));
3024 R->h->hate_those_clicks = 1;
3025 } else if (R->selection.clicks == 3) {
3026 R->selection.beg.row = R->selection.end.row = R->selection.mark.row;
3027 R->selection.beg.col = 0;
3028 R->selection.end.col = ncol;
3029 R->h->hate_those_clicks = 1;
3030 }
3031 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col));
3032 return;
3033 }
3034#endif /* ! NO_OLD_SELECTION */
3035#ifndef NO_NEW_SELECTION
3036/* selection_style must not be OLD_SELECT to get here */
3037/*
3038 * This is mainly xterm style selection with a couple of differences, mainly 3279 * This is mainly xterm style selection with a couple of differences, mainly
3039 * in the way button3 drag extension works. 3280 * in the way button3 drag extension works.
3040 * We're either doing: button1 drag; button3 press; or button3 drag 3281 * We're either doing: button1 drag; button3 press; or button3 drag
3041 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3282 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3042 * is always at the left/right edge of the R->selection. 3283 * is always at the left/right edge of the selection.
3043 * b) button3 press: extend/contract character/word/line at whichever edge of 3284 * b) button3 press: extend/contract character/word/line at whichever edge of
3044 * the selection we are closest to. 3285 * the selection we are closest to.
3045 * c) button3 drag : extend/contract character/word/line - we select around 3286 * c) button3 drag : extend/contract character/word/line - we select around
3046 * a point/word/line which is either the start or end of the selection 3287 * a point/word/line which is either the start or end of the selection
3047 * and it was decided by whichever point/word/line was `fixed' at the 3288 * and it was decided by whichever point/word/line was `fixed' at the
3048 * time of the most recent button3 press 3289 * time of the most recent button3 press
3049 */ 3290 */
3050 if (button3 && buttonpress) { /* button3 press */ 3291 if (button3 && buttonpress)
3051 /* 3292 { /* button3 press */
3293 /*
3052 * first determine which edge of the selection we are closest to 3294 * first determine which edge of the selection we are closest to
3053 */ 3295 */
3054 if (ROWCOL_IS_BEFORE(pos, R->selection.beg) 3296 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3055 || (!ROWCOL_IS_AFTER(pos, R->selection.end) 3297 || (!ROWCOL_IS_AFTER (pos, selection.end)
3056 && (((pos.col - R->selection.beg.col) 3298 && (((pos.col - selection.beg.col)
3057 + ((pos.row - R->selection.beg.row) * ncol)) 3299 + ((pos.row - selection.beg.row) * ncol))
3058 < ((R->selection.end.col - pos.col) 3300 < ((selection.end.col - pos.col)
3059 + ((R->selection.end.row - pos.row) * ncol))))) 3301 + ((selection.end.row - pos.row) * ncol)))))
3060 closeto = LEFT; 3302 closeto = LEFT;
3303
3061 if (closeto == LEFT) { 3304 if (closeto == LEFT)
3305 {
3062 R->selection.beg.row = pos.row; 3306 selection.beg.row = pos.row;
3063 R->selection.beg.col = pos.col; 3307 selection.beg.col = pos.col;
3064 R->selection.mark.row = R->selection.end.row; 3308 selection.mark.row = selection.end.row;
3065 R->selection.mark.col = R->selection.end.col 3309 selection.mark.col = selection.end.col - (selection.clicks == 2);
3066 - (R->selection.clicks == 2); 3310 }
3067 } else {
3068 R->selection.end.row = pos.row;
3069 R->selection.end.col = pos.col;
3070 R->selection.mark.row = R->selection.beg.row;
3071 R->selection.mark.col = R->selection.beg.col;
3072 }
3073 } else { /* button1 drag or button3 drag */
3074 if (ROWCOL_IS_AFTER(R->selection.mark, pos)) {
3075 if ((R->selection.mark.row == R->selection.end.row)
3076 && (R->selection.mark.col == R->selection.end.col)
3077 && clickchange && R->selection.clicks == 2)
3078 R->selection.mark.col--;
3079 R->selection.beg.row = pos.row;
3080 R->selection.beg.col = pos.col;
3081 R->selection.end.row = R->selection.mark.row;
3082 R->selection.end.col = R->selection.mark.col
3083 + (R->selection.clicks == 2);
3084 } else {
3085 R->selection.beg.row = R->selection.mark.row;
3086 R->selection.beg.col = R->selection.mark.col;
3087 R->selection.end.row = pos.row;
3088 R->selection.end.col = pos.col;
3089 }
3090 }
3091
3092 if (R->selection.clicks == 1) {
3093 end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines];
3094 if (end_col != -1 && R->selection.beg.col > end_col) {
3095#if 1
3096 R->selection.beg.col = ncol;
3097#else
3098 if (R->selection.beg.row != R->selection.end.row)
3099 R->selection.beg.col = ncol;
3100 else 3311 else
3101 R->selection.beg.col = R->selection.mark.col; 3312 {
3102#endif 3313 selection.end.row = pos.row;
3103 } 3314 selection.end.col = pos.col;
3104 end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines]; 3315 selection.mark.row = selection.beg.row;
3105 if (end_col != -1 && R->selection.end.col > end_col) 3316 selection.mark.col = selection.beg.col;
3106 R->selection.end.col = ncol; 3317 }
3107
3108 } else if (R->selection.clicks == 2) {
3109 if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg))
3110 R->selection.end.col--;
3111 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3112 &(R->selection.beg));
3113 rxvt_selection_delimit_word(aR_ DN, &(R->selection.end),
3114 &(R->selection.end));
3115 } else if (R->selection.clicks == 3) {
3116#ifndef NO_FRILLS
3117 if ((R->Options & Opt_tripleclickwords)) {
3118 int end_row;
3119
3120 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3121 &(R->selection.beg));
3122 end_row = R->screen.tlen[R->selection.mark.row
3123 + R->TermWin.saveLines];
3124 for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow;
3125 end_row++) {
3126 end_col = R->screen.tlen[end_row + R->TermWin.saveLines];
3127 if (end_col != -1) {
3128 R->selection.end.row = end_row;
3129 R->selection.end.col = end_col;
3130 rxvt_selection_remove_trailing_spaces(aR);
3131 break;
3132 }
3133 } 3318 }
3134 } else 3319 else
3320 { /* button1 drag or button3 drag */
3321 if (ROWCOL_IS_AFTER (selection.mark, pos))
3322 {
3323 if (selection.mark.row == selection.end.row
3324 && selection.mark.col == selection.end.col
3325 && clickchange
3326 && selection.clicks == 2)
3327 selection.mark.col--;
3328
3329 selection.beg.row = pos.row;
3330 selection.beg.col = pos.col;
3331 selection.end.row = selection.mark.row;
3332 selection.end.col = selection.mark.col + (selection.clicks == 2);
3333 }
3334 else
3335 {
3336 selection.beg.row = selection.mark.row;
3337 selection.beg.col = selection.mark.col;
3338 selection.end.row = pos.row;
3339 selection.end.col = pos.col;
3340 }
3341 }
3342
3343 if (selection.clicks == 1)
3344 {
3345 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3346 && !ROW(selection.beg.row).is_longer ()
3347#if ENABLE_FRILLS
3348 && !selection.rect
3135#endif 3349#endif
3136 { 3350 )
3351 selection.beg.col = ncol;
3352
3353 if (
3354 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3355 && !ROW(selection.end.row).is_longer ()
3356#if ENABLE_FRILLS
3357 && !selection.rect
3358#endif
3359 )
3360 selection.end.col = ncol;
3361 }
3362 else if (selection.clicks == 2)
3363 {
3364 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3365 selection.end.col--;
3366
3367 selection_delimit_word (UP, &selection.beg, &selection.beg);
3368 selection_delimit_word (DN, &selection.end, &selection.end);
3369 }
3370 else if (selection.clicks == 3)
3371 {
3372#if ENABLE_FRILLS
3373 if (OPTION (Opt_tripleclickwords))
3374 {
3375 selection_delimit_word (UP, &selection.beg, &selection.beg);
3376
3377 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3378 {
3379 if (!ROW(end_row).is_longer ())
3380 {
3381 selection.end.row = end_row;
3382 selection.end.col = ROW(end_row).l;
3383 selection_remove_trailing_spaces ();
3384 break;
3385 }
3386 }
3387 }
3388 else
3389#endif
3390 {
3137 if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg)) 3391 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3138 R->selection.mark.col++; 3392 selection.mark.col++;
3139 R->selection.beg.col = 0; 3393
3140 R->selection.end.col = ncol; 3394 selection.beg.col = 0;
3141 } 3395 selection.end.col = ncol;
3396
3397 // select a complete logical line
3398 while (selection.beg.row > -saveLines
3399 && ROW(selection.beg.row - 1).is_longer ())
3400 selection.beg.row--;
3401
3402 while (selection.end.row < nrow
3403 && ROW(selection.end.row).is_longer ())
3404 selection.end.row++;
3405 }
3142 } 3406 }
3143 if (button3 && buttonpress) { /* mark may need to be changed */ 3407
3408 if (button3 && buttonpress)
3409 { /* mark may need to be changed */
3144 if (closeto == LEFT) { 3410 if (closeto == LEFT)
3411 {
3145 R->selection.mark.row = R->selection.end.row; 3412 selection.mark.row = selection.end.row;
3146 R->selection.mark.col = R->selection.end.col 3413 selection.mark.col = selection.end.col - (selection.clicks == 2);
3147 - (R->selection.clicks == 2); 3414 }
3148 } else { 3415 else
3416 {
3149 R->selection.mark.row = R->selection.beg.row; 3417 selection.mark.row = selection.beg.row;
3150 R->selection.mark.col = R->selection.beg.col; 3418 selection.mark.col = selection.beg.col;
3151 } 3419 }
3152 } 3420 }
3153 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col));
3154#endif /* ! NO_NEW_SELECTION */
3155}
3156 3421
3157#ifndef NO_FRILLS 3422#if ENABLE_FRILLS
3158/* INTPROTO */ 3423 if (selection.rect && selection.beg.col > selection.end.col)
3424 ::swap (selection.beg.col, selection.end.col);
3425#endif
3426}
3427
3428#if ENABLE_FRILLS
3159void 3429void
3160rxvt_selection_remove_trailing_spaces(pR) 3430rxvt_term::selection_remove_trailing_spaces ()
3161{ 3431{
3162 int32_t end_col, end_row; 3432 int32_t end_col, end_row;
3163 text_t *stp; 3433 text_t *stp;
3164 3434
3165 end_col = R->selection.end.col; 3435 end_col = selection.end.col;
3166 end_row = R->selection.end.row; 3436 end_row = selection.end.row;
3437
3167 for ( ; end_row >= R->selection.beg.row; ) { 3438 for (; end_row >= selection.beg.row; )
3168 stp = R->screen.text[end_row + R->TermWin.saveLines]; 3439 {
3440 stp = ROW(end_row).t;
3441
3169 while (--end_col >= 0) { 3442 while (--end_col >= 0)
3170 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3443 {
3171 break; 3444 if (stp[end_col] != NOCHAR
3172 } 3445 && !unicode::is_space (stp[end_col]))
3446 break;
3447 }
3448
3173 if (end_col >= 0 3449 if (end_col >= 0
3174 || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { 3450 || !ROW(end_row - 1).is_longer ())
3451 {
3175 R->selection.end.col = end_col + 1; 3452 selection.end.col = end_col + 1;
3176 R->selection.end.row = end_row; 3453 selection.end.row = end_row;
3177 break; 3454 break;
3178 } 3455 }
3179 end_row--; 3456
3180 end_col = R->TermWin.ncol; 3457 end_row--;
3458 end_col = ncol;
3181 } 3459 }
3460
3182 if (R->selection.mark.row > R->selection.end.row) { 3461 if (selection.mark.row > selection.end.row)
3462 {
3183 R->selection.mark.row = R->selection.end.row; 3463 selection.mark.row = selection.end.row;
3184 R->selection.mark.col = R->selection.end.col; 3464 selection.mark.col = selection.end.col;
3465 }
3185 } else if (R->selection.mark.row == R->selection.end.row 3466 else if (selection.mark.row == selection.end.row
3186 && R->selection.mark.col > R->selection.end.col) 3467 && selection.mark.col > selection.end.col)
3187 R->selection.mark.col = R->selection.end.col; 3468 selection.mark.col = selection.end.col;
3188} 3469}
3189#endif 3470#endif
3190 3471
3191/* ------------------------------------------------------------------------- */ 3472/* ------------------------------------------------------------------------- */
3192/* 3473/*
3193 * Double click on button 3 when already selected 3474 * Double click on button 3 when already selected
3194 * EXT: button 3 double click 3475 * EXT: button 3 double click
3195 */ 3476 */
3196/* EXTPROTO */
3197void 3477void
3198rxvt_selection_rotate(pR_ int x, int y) 3478rxvt_term::selection_rotate (int x, int y)
3199{ 3479{
3200 R->selection.clicks = R->selection.clicks % 3 + 1; 3480 selection.clicks = selection.clicks % 3 + 1;
3201 rxvt_selection_extend_colrow(aR_ Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3481 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3202} 3482}
3203
3204/* ------------------------------------------------------------------------- */
3205/*
3206 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3207 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3208 * the X11 protocol.
3209 */
3210typedef CARD32 Atom32;
3211 3483
3212/* ------------------------------------------------------------------------- */ 3484/* ------------------------------------------------------------------------- */
3213/* 3485/*
3214 * Respond to a request for our current selection 3486 * Respond to a request for our current selection
3215 * EXT: SelectionRequest 3487 * EXT: SelectionRequest
3216 */ 3488 */
3217/* EXTPROTO */
3218void 3489void
3219rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3490rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3220{ 3491{
3221 XSelectionEvent ev; 3492 XSelectionEvent ev;
3222#ifdef USE_XIM 3493 dDisp;
3494
3495 ev.type = SelectionNotify;
3496 ev.property = None;
3497 ev.display = rq.display;
3498 ev.requestor = rq.requestor;
3499 ev.selection = rq.selection;
3500 ev.target = rq.target;
3501 ev.time = rq.time;
3502
3503 if (rq.target == xa[XA_TARGETS])
3504 {
3223 Atom32 target_list[4]; 3505 Atom target_list[6];
3506 Atom *target = target_list;
3507
3508 *target++ = xa[XA_TARGETS];
3509 *target++ = xa[XA_TIMESTAMP];
3510 *target++ = XA_STRING;
3511 *target++ = xa[XA_TEXT];
3512 *target++ = xa[XA_COMPOUND_TEXT];
3513#if X_HAVE_UTF8_STRING
3514 *target++ = xa[XA_UTF8_STRING];
3515#endif
3516
3517 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3518 32, PropModeReplace,
3519 (unsigned char *)target_list, target - target_list);
3520 ev.property = rq.property;
3521 }
3522#if TODO // TODO
3523 else if (rq.target == xa[XA_MULTIPLE])
3524 {
3525 /* TODO: Handle MULTIPLE */
3526 }
3527#endif
3528 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3529 {
3530 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3531 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3532 ev.property = rq.property;
3533 }
3534 else if (rq.target == XA_STRING
3535 || rq.target == xa[XA_TEXT]
3536 || rq.target == xa[XA_COMPOUND_TEXT]
3537 || rq.target == xa[XA_UTF8_STRING]
3538 )
3539 {
3540 XTextProperty ct;
3541 Atom target = rq.target;
3542 short freect = 0;
3543 int selectlen;
3544 wchar_t *cl;
3545 enum {
3546 enc_string = XStringStyle,
3547 enc_text = XStdICCTextStyle,
3548 enc_compound_text = XCompoundTextStyle,
3549#ifdef X_HAVE_UTF8_STRING
3550 enc_utf8 = XUTF8StringStyle,
3224#else 3551#else
3225 Atom32 target_list[3]; 3552 enc_utf8 = -1,
3226#endif 3553#endif
3227 Atom target; 3554 } style;
3228 XTextProperty ct;
3229 XICCEncodingStyle style;
3230 char *cl[2], dummy[1];
3231 3555
3232 ev.type = SelectionNotify;
3233 ev.property = None;
3234 ev.display = rq->display;
3235 ev.requestor = rq->requestor;
3236 ev.selection = rq->selection;
3237 ev.target = rq->target;
3238 ev.time = rq->time;
3239
3240 if (rq->target == R->h->xa[XA_TARGETS]) {
3241 target_list[0] = (Atom32) R->h->xa[XA_TARGETS];
3242 target_list[1] = (Atom32) XA_STRING;
3243 target_list[2] = (Atom32) R->h->xa[XA_TEXT];
3244#ifdef USE_XIM
3245 target_list[3] = (Atom32) R->h->xa[XA_COMPOUND_TEXT];
3246#endif
3247 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM,
3248 (8 * sizeof(target_list[0])), PropModeReplace,
3249 (unsigned char *)target_list,
3250 (sizeof(target_list) / sizeof(target_list[0])));
3251 ev.property = rq->property;
3252 } else if (rq->target == R->h->xa[XA_MULTIPLE]) {
3253 /* TODO: Handle MULTIPLE */
3254 } else if (rq->target == R->h->xa[XA_TIMESTAMP] && R->selection.text) {
3255 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
3256 (8 * sizeof(Time)), PropModeReplace,
3257 (unsigned char *)&R->h->selection_time, 1);
3258 ev.property = rq->property;
3259 } else if (rq->target == XA_STRING 3556 if (target == XA_STRING)
3260 || rq->target == R->h->xa[XA_COMPOUND_TEXT] 3557 // we actually don't do XA_STRING, but who cares, as i18n clients
3261 || rq->target == R->h->xa[XA_TEXT]) { 3558 // will ask for another format anyways.
3262#ifdef USE_XIM 3559 style = enc_string;
3263 short freect = 0; 3560 else if (target == xa[XA_TEXT])
3561 style = enc_text;
3562 else if (target == xa[XA_COMPOUND_TEXT])
3563 style = enc_compound_text;
3564#if ENABLE_FRILLS
3565 else if (target == xa[XA_UTF8_STRING])
3566 style = enc_utf8;
3264#endif 3567#endif
3265 int selectlen; 3568 else
3266 3569 {
3267#ifdef USE_XIM
3268 if (rq->target != XA_STRING) {
3269 target = R->h->xa[XA_COMPOUND_TEXT]; 3570 target = xa[XA_COMPOUND_TEXT];
3270 style = (rq->target == R->h->xa[XA_COMPOUND_TEXT]) 3571 style = enc_compound_text;
3271 ? XCompoundTextStyle : XStdICCTextStyle; 3572 }
3272 } else 3573
3273#endif
3274 {
3275 target = XA_STRING;
3276 style = XStringStyle;
3277 }
3278 if (R->selection.text) { 3574 if (selection.text)
3279 cl[0] = (char *)R->selection.text; 3575 {
3576 cl = selection.text;
3280 selectlen = R->selection.len; 3577 selectlen = selection.len;
3281 } else { 3578 }
3282 cl[0] = dummy; 3579 else
3283 *dummy = '\0'; 3580 {
3581 cl = L"";
3284 selectlen = 0; 3582 selectlen = 0;
3285 } 3583 }
3286#ifdef USE_XIM 3584
3287 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) 3585#if ENABLE_FRILLS
3288 == Success) /* if we failed to convert then send it raw */ 3586 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3587 // so recode it manually
3588 if (style == enc_utf8)
3589 {
3590 freect = 1;
3591 ct.encoding = target;
3592 ct.format = 8;
3593 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3594 ct.nitems = strlen ((char *)ct.value);
3595 }
3596 else
3597#endif
3598 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3289 freect = 1; 3599 freect = 1;
3290 else 3600 else
3291#endif 3601 {
3292 { 3602 /* if we failed to convert then send it raw */
3293 ct.value = (unsigned char *)cl[0]; 3603 ct.value = (unsigned char *)cl;
3294 ct.nitems = selectlen; 3604 ct.nitems = selectlen;
3295 } 3605 ct.encoding = target;
3606 }
3607
3296 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3608 XChangeProperty (disp, rq.requestor, rq.property,
3297 target, 8, PropModeReplace, 3609 ct.encoding, 8, PropModeReplace,
3298 ct.value, (int)ct.nitems); 3610 ct.value, (int)ct.nitems);
3299 ev.property = rq->property; 3611 ev.property = rq.property;
3300#ifdef USE_XIM 3612
3301 if (freect) 3613 if (freect)
3302 XFree(ct.value); 3614 XFree (ct.value);
3303#endif
3304 } 3615 }
3616
3305 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3617 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3306} 3618}
3307 3619
3308/* ------------------------------------------------------------------------- * 3620/* ------------------------------------------------------------------------- *
3309 * MOUSE ROUTINES * 3621 * MOUSE ROUTINES *
3310 * ------------------------------------------------------------------------- */ 3622 * ------------------------------------------------------------------------- */
3311 3623
3312/* 3624/*
3313 * return col/row values corresponding to x/y pixel values 3625 * return col/row values corresponding to x/y pixel values
3314 */ 3626 */
3315/* EXTPROTO */
3316void 3627void
3317rxvt_pixel_position(pR_ int *x, int *y) 3628rxvt_term::pixel_position (int *x, int *y)
3318{ 3629{
3319 *x = Pixel2Col(*x); 3630 *x = Pixel2Col (*x);
3320/* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3631 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3321 *y = Pixel2Row(*y); 3632 *y = Pixel2Row (*y);
3322/* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3633 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3323} 3634}
3635
3324/* ------------------------------------------------------------------------- */ 3636/* ------------------------------------------------------------------------- */
3325#ifdef USE_XIM 3637#ifdef USE_XIM
3326/* EXTPROTO */
3327void 3638void
3328rxvt_setPosition(pR_ XPoint *pos) 3639rxvt_term::im_set_position (XPoint &pos)
3329{ 3640{
3330 XWindowAttributes xwa; 3641 XWindowAttributes xwa;
3331 3642
3332 XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); 3643 XGetWindowAttributes (display->display, vt, &xwa);
3333 pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; 3644
3334 pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y 3645 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3335 - R->TermWin.lineSpace; 3646 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3336} 3647}
3337#endif 3648#endif
3338/* ------------------------------------------------------------------------- */ 3649
3339 3650#if ENABLE_OVERLAY
3651void
3652rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3653{
3654 if (nrow < 1 || ncol < 1)
3655 return;
3656
3657 want_refresh = 1;
3658
3659 scr_overlay_off ();
3660
3661 if (x < 0) x = ncol - w;
3662 if (y < 0) y = nrow - h;
3663
3664 // make space for border
3665 w += 2; min_it (w, ncol);
3666 h += 2; min_it (h, nrow);
3667
3668 x -= 1; clamp_it (x, 0, ncol - w);
3669 y -= 1; clamp_it (y, 0, nrow - h);
3670
3671 ov_x = x; ov_y = y;
3672 ov_w = w; ov_h = h;
3673
3674 ov_text = new text_t *[h];
3675 ov_rend = new rend_t *[h];
3676
3677 for (y = 0; y < h; y++)
3678 {
3679 text_t *tp = ov_text[y] = new text_t[w];
3680 rend_t *rp = ov_rend[y] = new rend_t[w];
3681
3682 text_t t0, t1, t2;
3683 rend_t r = OVERLAY_RSTYLE;
3684
3685 if (y == 0)
3686 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3687 else if (y < h - 1)
3688 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3689 else
3690 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3691
3692 *tp++ = t0;
3693 *rp++ = r;
3694
3695 for (x = w - 2; x > 0; --x)
3696 {
3697 *tp++ = t1;
3698 *rp++ = r;
3699 }
3700
3701 *tp = t2;
3702 *rp = r;
3703 }
3704}
3705
3706void
3707rxvt_term::scr_overlay_off ()
3708{
3709 if (!ov_text)
3710 return;
3711
3712 want_refresh = 1;
3713
3714 for (int y = 0; y < ov_h; y++)
3715 {
3716 delete [] ov_text[y];
3717 delete [] ov_rend[y];
3718 }
3719
3720 delete [] ov_text; ov_text = 0;
3721 delete [] ov_rend; ov_rend = 0;
3722}
3723
3724void
3725rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3726{
3727 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3728 return;
3729
3730 x++, y++;
3731
3732 ov_text[y][x] = text;
3733 ov_rend[y][x] = rend;
3734}
3735
3736void
3737rxvt_term::scr_overlay_set (int x, int y, const char *s)
3738{
3739 while (*s)
3740 scr_overlay_set (x++, y, *s++);
3741}
3742
3743void
3744rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3745{
3746 while (*s)
3747 {
3748 text_t t = *s++;
3749 int width = wcwidth (t);
3750
3751 while (width--)
3752 {
3753 scr_overlay_set (x++, y, t);
3754 t = NOCHAR;
3755 }
3756 }
3757}
3758
3759void
3760rxvt_term::scr_swap_overlay ()
3761{
3762 if (!ov_text)
3763 return;
3764
3765 // swap screen mem with overlay
3766 for (int y = ov_h; y--; )
3767 {
3768 text_t *t1 = ov_text[y];
3769 rend_t *r1 = ov_rend[y];
3770
3771 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3772 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3773
3774 for (int x = ov_w; x--; )
3775 {
3776 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3777 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3778 }
3779 }
3780}
3781
3782#endif
3340/* ------------------------------------------------------------------------- * 3783/* ------------------------------------------------------------------------- */
3341 * DEBUG ROUTINES *
3342 * ------------------------------------------------------------------------- */
3343#if 0
3344/* INTPROTO */
3345void
3346rxvt_debug_colors(void)
3347{
3348 int color;
3349 const char *name[] = {
3350 "fg", "bg",
3351 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3352 };
3353 3784
3354 fprintf(stderr, "Color ( ");
3355 if (R->h->rstyle & RS_RVid)
3356 fprintf(stderr, "rvid ");
3357 if (R->h->rstyle & RS_Bold)
3358 fprintf(stderr, "bold ");
3359 if (R->h->rstyle & RS_Blink)
3360 fprintf(stderr, "blink ");
3361 if (R->h->rstyle & RS_Uline)
3362 fprintf(stderr, "uline ");
3363 fprintf(stderr, "): ");
3364
3365 color = GET_FGCOLOR(R->h->rstyle);
3366#ifndef NO_BRIGHTCOLOR
3367 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3368 color -= (minBrightCOLOR - minCOLOR);
3369 fprintf(stderr, "bright ");
3370 }
3371#endif
3372 fprintf(stderr, "%s on ", name[color]);
3373
3374 color = GET_BGCOLOR(R->h->rstyle);
3375#ifndef NO_BRIGHTCOLOR
3376 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3377 color -= (minBrightCOLOR - minCOLOR);
3378 fprintf(stderr, "bright ");
3379 }
3380#endif
3381 fprintf(stderr, "%s\n", name[color]);
3382}
3383#endif

Diff Legend

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