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

Diff Legend

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