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.151 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC

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

Diff Legend

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