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

Diff Legend

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