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

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

Diff Legend

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