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.169 by root, Tue Oct 25 19:04:46 2005 UTC vs.
Revision 1.454 by sf-exg, Sun Jan 18 13:08:46 2015 UTC

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

Diff Legend

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