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

Diff Legend

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