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

Diff Legend

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