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

Diff Legend

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