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