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.148 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 12 07:54:15 2013 UTC

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

Diff Legend

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