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.34 by pcg, Tue Feb 24 00:44:23 2004 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

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

Diff Legend

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