ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.150 by root, Mon Dec 13 19:16:36 2004 UTC vs.
Revision 1.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC

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

Diff Legend

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