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

Diff Legend

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