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

Diff Legend

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