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.155 by root, Thu Feb 3 07:45:39 2005 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

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

Diff Legend

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