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.149 by root, Mon Dec 13 06:44:18 2004 UTC vs.
Revision 1.422 by root, Thu Jun 28 15:19:15 2012 UTC

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

Diff Legend

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