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

Diff Legend

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