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

Diff Legend

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