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.158 by root, Sat Feb 19 19:37:34 2005 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 2013 UTC

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

Diff Legend

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