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

Diff Legend

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