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

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

Diff Legend

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