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.37 by pcg, Tue Feb 24 23:58:13 2004 UTC vs.
Revision 1.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC

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

Diff Legend

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