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.153 by root, Fri Jan 14 17:15:26 2005 UTC vs.
Revision 1.440 by root, Wed Mar 27 17:24:16 2013 UTC

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

Diff Legend

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