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