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

Diff Legend

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