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

Diff Legend

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