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

Diff Legend

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