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

Diff Legend

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