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

Diff Legend

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