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

Diff Legend

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