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.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 2006 UTC

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

Diff Legend

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