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

Diff Legend

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