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

Diff Legend

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