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.150 by root, Mon Dec 13 19:16:36 2004 UTC vs.
Revision 1.250 by root, Wed Jan 25 13:24:45 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 min_it (minlines, screen.cur.row - top_row);
764
804 if ((nlines > 0) 765 if (minlines > 0
805 && (screen.tscroll == 0) 766 && screen.tscroll == 0
806 && (screen.bscroll == (TermWin.nrow - 1))) 767 && screen.bscroll == nrow - 1)
807 { 768 {
808 /* _at least_ this many lines need to be scrolled */ 769 /* _at least_ this many lines need to be scrolled */
809 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
810 screen.cur.row -= nlines; 771 screen.cur.row -= minlines;
811 } 772 }
812 } 773 }
813 774
814#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
815 assert (screen.cur.col < last_col); 776 assert (screen.cur.col < ncol);
816 assert ((screen.cur.row < TermWin.nrow) 777 assert (screen.cur.row < nrow
817 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 778 && 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 779#endif
823 row = screen.cur.row + TermWin.saveLines; 780 int row = screen.cur.row;
824 781
825 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
826 783
827 stp = screen.text[row]; 784 line_t *line = &ROW(row);
828 srp = screen.rend[row];
829 785
830 while (len--) 786 while (str < strend)
831 { 787 {
832 c = *str++; 788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
833 789
834 if (c < 0x20) 790 if (c < 0x20)
835 switch (c) 791 if (c == C0_LF)
836 { 792 {
837 case C0_HT: 793 max_it (line->l, screen.cur.col);
838 scr_tab (1, true);
839 continue;
840 794
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; 795 screen.flags &= ~Screen_WrapNext;
846 796
847 if (screen.cur.row == screen.bscroll) 797 if (screen.cur.row == screen.bscroll)
848 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 798 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
849 else if (screen.cur.row < (TermWin.nrow - 1)) 799 else if (screen.cur.row < (nrow - 1))
850 row = (++screen.cur.row) + TermWin.saveLines; 800 row = ++screen.cur.row;
851 801
852 stp = screen.text[row]; /* _must_ refresh */ 802 line = &ROW(row); /* _must_ refresh */
853 srp = screen.rend[row]; /* _must_ refresh */
854 continue; 803 continue;
804 }
805 else if (c == C0_CR)
806 {
807 max_it (line->l, screen.cur.col);
855 808
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; 809 screen.flags &= ~Screen_WrapNext;
861 screen.cur.col = 0; 810 screen.cur.col = 0;
862 continue; 811 continue;
812 }
813 else if (c == C0_HT)
814 {
815 scr_tab (1, true);
816 continue;
863 } 817 }
864 818
865 if (checksel /* see if we're writing within selection */ 819 if (checksel /* see if we're writing within selection */
866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 821 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
875 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
876 } 830 }
877 831
878 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
879 { 833 {
880 screen.tlen[row] = -1; 834 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 } 835
836 line->l = ncol;
837 line->is_longer (1);
887 838
839 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */
841 }
842
843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
845 c = 0xfffd;
846
888 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, do wcwidth before
889 // do wcwidth before further replacements, as wcwidth says that line-drawing 848 // further replacements, as wcwidth might return -1 for the line
890 // characters have width -1 (DOH!) on GNU/Linux sometimes. 849 // drawing characters below as they might be invalid in the current
891 int width = c < 0x100 ? 1 : wcwidth (c); 850 // locale.
851 int width = WCWIDTH (c);
892 852
893 if (charsets[screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
894 { 854 {
895 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
896 // 5f-7e standard vt100 856 // 5f-7e standard vt100
897 // 40-5e rxvt extension for extra curses acs chars 857 // 40-5e rxvt extension for extra curses acs chars
898 static uint16_t vt100_0[63] = { // 40 .. 7e 858 static uint16_t vt100_0[62] = { // 41 .. 7e
899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 859 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 860 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 861 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 862 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 863 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 864 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 865 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 866 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
907 }; 867 };
908 868
909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 869 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
910 { 870 {
911 c = vt100_0[c - 0x40]; 871 c = vt100_0[c - 0x41];
912 width = 1; 872 width = 1; // vt100 line drawing characters are always single-width
913 } 873 }
914 } 874 }
915 875
916 if (screen.flags & Screen_Insert) 876 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT); 877 scr_insdel_chars (width, INSERT);
918 878
919 if (width != 0) 879 if (width != 0)
920 { 880 {
921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
925#if !UNICODE_3 881#if !UNICODE_3
926 // trim characters we can't store directly :( 882 // trim characters we can't store directly :(
927 if (c >= 0x10000) 883 if (c >= 0x10000)
928# if ENABLE_COMBINING 884# if ENABLE_COMBINING
929 c = rxvt_composite.compose (c); // map to lower 16 bits 885 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
931 c = 0xfffd; 887 c = 0xfffd;
932# endif 888# endif
933#endif 889#endif
934 890
935 // nuke the character at this position, if required 891 // nuke the character at this position, if required
936 if (stp[screen.cur.col] == NOCHAR 892 if (line->t[screen.cur.col] == NOCHAR
937 || (screen.cur.col < TermWin.ncol - 1 893 || (screen.cur.col < ncol - 1
938 && stp[screen.cur.col + 1] == NOCHAR)) 894 && line->t[screen.cur.col + 1] == NOCHAR))
939 { 895 {
940 int col = screen.cur.col; 896 int col = screen.cur.col;
941 897
942 // find begin 898 // find begin
943 while (col > 0 && stp[col] == NOCHAR) 899 while (col > 0 && line->t[col] == NOCHAR)
944 col--; 900 col--;
945 901
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
947 903
948 // found begin, nuke 904 // found begin, nuke
949 do { 905 do {
950 stp[col] = ' '; 906 line->t[col] = ' ';
951 srp[col] = rend; 907 line->r[col] = rend;
952 col++; 908 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR); 909 } while (col < ncol && line->t[col] == NOCHAR);
954 } 910 }
955 911
956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' ';
919 // and try the same character next loop iteration
920 --str;
921 }
922
923 line->touch ();
957 924
958 do 925 do
959 { 926 {
960 stp[screen.cur.col] = c; 927 line->t[screen.cur.col] = c;
961 srp[screen.cur.col] = rend; 928 line->r[screen.cur.col] = rend;
962 929
963 if (screen.cur.col < last_col - 1) 930 if (screen.cur.col < ncol - 1)
964 screen.cur.col++; 931 screen.cur.col++;
965 else 932 else
966 { 933 {
967 screen.tlen[row] = last_col; 934 line->l = ncol;
968 if (screen.flags & Screen_Autowrap) 935 if (screen.flags & Screen_Autowrap)
969 screen.flags |= Screen_WrapNext; 936 screen.flags |= Screen_WrapNext;
970 break; 937 break;
971 } 938 }
972 939
… …
974 } 941 }
975 while (--width > 0); 942 while (--width > 0);
976 943
977 // pad with spaces when overwriting wide character with smaller one 944 // pad with spaces when overwriting wide character with smaller one
978 if (!width) 945 if (!width)
946 {
947 line->touch ();
948
979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
980 { 950 {
981 stp[c] = ' '; 951 line->t[c] = ' ';
982 srp[c] = rend; 952 line->r[c] = rend;
983 } 953 }
984 } 954 }
955 }
985 else if (width == 0) 956 else // width == 0
986 { 957 {
987#if ENABLE_COMBINING 958#if ENABLE_COMBINING
988 // handle combining characters 959 // handle combining characters
989 // we just tag the accent on the previous on-screen character. 960 // we just tag the accent on the previous on-screen character.
990 // this is arguably not correct, but also arguably not wrong. 961 // this is arguably not correct, but also arguably not wrong.
991 // we don't handle double-width characters nicely yet. 962 // we don't handle double-width characters nicely yet.
992 963 line_t *linep;
993 text_t *tp; 964 text_t *tp;
994 rend_t *rp; 965 rend_t *rp;
995 966
996 if (screen.cur.col > 0) 967 if (screen.cur.col > 0)
997 { 968 {
969 linep = line;
998 tp = stp + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
999 rp = srp + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
1000
1001 while (*tp == NOCHAR && tp > stp)
1002 tp--, rp--;
1003 } 972 }
1004 else if (screen.cur.row > 0 973 else if (screen.cur.row > 0
1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 974 && ROW(screen.cur.row - 1).is_longer ())
1006 { 975 {
1007 int line = screen.cur.row - 1 + TermWin.saveLines; 976 linep = &ROW(screen.cur.row - 1);
1008
1009 tp = screen.text[line] + last_col - 1; 977 tp = line->t + ncol - 1;
1010 rp = screen.rend[line] + last_col - 1; 978 rp = line->r + ncol - 1;
1011
1012 while (*tp == NOCHAR && tp > screen.text[line])
1013 tp--, rp--;
1014 } 979 }
1015 else 980 else
1016 continue; 981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
1017 987
1018 // first try to find a precomposed character 988 // first try to find a precomposed character
1019 unicode_t n = rxvt_compose (*tp, c); 989 unicode_t n = rxvt_compose (*tp, c);
1020 if (n == NOCHAR) 990 if (n == NOCHAR)
1021 n = rxvt_composite.compose (*tp, c); 991 n = rxvt_composite.compose (*tp, c);
… …
1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1025#endif 995#endif
1026 } 996 }
1027 } 997 }
1028 998
1029 if (screen.tlen[row] != -1) /* XXX: think about this */ 999 max_it (line->l, screen.cur.col);
1030 MAX_IT (screen.tlen[row], screen.cur.col);
1031 1000
1032#ifdef DEBUG_STRICT 1001#ifdef DEBUG_STRICT
1033 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
1034#else /* drive with your eyes closed */
1035 MAX_IT (screen.cur.row, 0);
1036#endif 1003#endif
1037} 1004}
1038 1005
1039/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1040/* 1007/*
1041 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
1042 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1043 */ 1010 */
1044void 1011void
1045rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
1046{ 1013{
1047 want_refresh = 1; 1014 want_refresh = 1;
1048 1015
1049 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
1050 { 1017 {
1051 if (screen.cur.row > 0) 1018 if (screen.cur.row > 0)
1052 { 1019 {
1053#ifdef TERMCAP_HAS_BW 1020#ifdef TERMCAP_HAS_BW
1054 screen.cur.col = TermWin.ncol - 1; 1021 screen.cur.col = ncol - 1;
1055 screen.cur.row--; 1022 screen.cur.row--;
1056 return; 1023 return;
1057#endif 1024#endif
1058 } 1025 }
1059 } 1026 }
… …
1068 * Process Horizontal Tab 1035 * Process Horizontal Tab
1069 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
1070 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
1071 */ 1038 */
1072void 1039void
1073rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
1074{ 1041{
1075 int i, x; 1042 int i, x;
1076 1043
1077 want_refresh = 1; 1044 want_refresh = 1;
1078 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
1079 1046
1080 if (count == 0) 1047 if (count == 0)
1081 return; 1048 return;
1082 else if (count > 0) 1049 else if (count > 0)
1083 { 1050 {
1084 int row = TermWin.saveLines + screen.cur.row; 1051 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]; 1052 rend_t base_rend = l.r[i];
1088 ht &= tp[i] == ' '; 1053 ht &= l.t[i] == ' ';
1089 1054
1090 for (; ++i < TermWin.ncol; ) 1055 for (; ++i < ncol; )
1091 if (tabs[i]) 1056 if (tabs[i])
1092 { 1057 {
1093 x = i; 1058 x = i;
1059
1094 if (!--count) 1060 if (!--count)
1095 break; 1061 break;
1096 } 1062 }
1097 else 1063 else
1098 ht &= tp[i] == ' ' 1064 ht &= l.t[i] == ' '
1099 && RS_SAME (rp[i], base_rend); 1065 && RS_SAME (l.r[i], base_rend);
1100 1066
1101 if (count) 1067 if (count)
1102 x = TermWin.ncol - 1; 1068 x = ncol - 1;
1103 1069
1104 // store horizontal tab commands as characters inside the text 1070 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted. 1071 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs) 1072 if (ht && OPTION (Opt_pastableTabs))
1107 { 1073 {
1108 base_rend = SET_FONT (base_rend, 0); 1074 base_rend = SET_FONT (base_rend, 0);
1109 1075
1110 if (screen.tlen[row] != -1) /* XXX: think about this */ 1076 l.touch (x);
1111 MAX_IT (screen.tlen[row], x);
1112 1077
1113 i = screen.cur.col; 1078 i = screen.cur.col;
1114 1079
1115 tp[i] = '\t'; 1080 l.t[i] = '\t';
1116 rp[i] = base_rend; 1081 l.r[i] = base_rend;
1117 1082
1118 while (++i < x) 1083 while (++i < x)
1119 { 1084 {
1120 tp[i] = NOCHAR; 1085 l.t[i] = NOCHAR;
1121 rp[i] = base_rend; 1086 l.r[i] = base_rend;
1122 } 1087 }
1123 } 1088 }
1124 } 1089 }
1125 else /* if (count < 0) */ 1090 else /* if (count < 0) */
1126 { 1091 {
… …
1147 * Move cursor left in row. If we're at the left boundary, shift everything 1112 * Move cursor left in row. If we're at the left boundary, shift everything
1148 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1149 */ 1114 */
1150#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1151void 1116void
1152rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1153{ 1118{
1154 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1156 else 1121 else
1157 {
1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1159 return; /* um, yeah? */
1160
1161 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
1162 }
1163} 1123}
1164#endif 1124#endif
1165/* ------------------------------------------------------------------------- */ 1125/* ------------------------------------------------------------------------- */
1166/* 1126/*
1167 * Process DEC Forward Index 1127 * Process DEC Forward Index
… …
1169 * Move cursor right in row. If we're at the right boundary, shift everything 1129 * Move cursor right in row. If we're at the right boundary, shift everything
1170 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1171 */ 1131 */
1172#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1173void 1133void
1174rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1175{ 1135{
1176 int row;
1177
1178 if (screen.cur.col < TermWin.ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1180 else 1138 else
1181 { 1139 {
1182 row = screen.cur.row + TermWin.saveLines; 1140 line_t &l = ROW(screen.cur.row);
1183 1141
1184 if (screen.tlen[row] == 0) 1142 l.touch ();
1185 return; /* um, yeah? */ 1143 l.is_longer (0);
1186 else if (screen.tlen[row] == -1)
1187 screen.tlen[row] = TermWin.ncol;
1188 1144
1189 scr_gotorc (0, 0, R_RELATIVE); 1145 scr_gotorc (0, 0, R_RELATIVE);
1190 scr_insdel_chars (1, DELETE); 1146 scr_insdel_chars (1, DELETE);
1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1147 scr_gotorc (0, ncol - 1, R_RELATIVE);
1192 } 1148 }
1193} 1149}
1194#endif 1150#endif
1195 1151
1196/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1197/* 1153/*
1198 * Goto Row/Column 1154 * Goto Row/Column
1199 */ 1155 */
1200void 1156void
1201rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1202{ 1158{
1203 want_refresh = 1; 1159 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1205 1161
1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1207 MAX_IT (screen.cur.col, 0); 1163 clamp_it (screen.cur.col, 0, ncol - 1);
1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1209 1164
1210 screen.flags &= ~Screen_WrapNext; 1165 screen.flags &= ~Screen_WrapNext;
1211 1166
1212 if (relative & R_RELATIVE) 1167 if (relative & R_RELATIVE)
1213 { 1168 {
… …
1231 else 1186 else
1232 { 1187 {
1233 if (screen.flags & Screen_Relative) 1188 if (screen.flags & Screen_Relative)
1234 { /* relative origin mode */ 1189 { /* relative origin mode */
1235 screen.cur.row = row + screen.tscroll; 1190 screen.cur.row = row + screen.tscroll;
1236 MIN_IT (screen.cur.row, screen.bscroll); 1191 min_it (screen.cur.row, screen.bscroll);
1237 } 1192 }
1238 else 1193 else
1239 screen.cur.row = row; 1194 screen.cur.row = row;
1240 } 1195 }
1241 1196
1242 MAX_IT (screen.cur.row, 0); 1197 clamp_it (screen.cur.row, 0, nrow - 1);
1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1244} 1198}
1245 1199
1246/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1247/* 1201/*
1248 * direction should be UP or DN 1202 * direction should be UP or DN
1249 */ 1203 */
1250void 1204void
1251rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1252{ 1206{
1253 int dirn; 1207 int dirn;
1254 1208
1255 want_refresh = 1; 1209 want_refresh = 1;
1256 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1259 1213
1260 screen.flags &= ~Screen_WrapNext; 1214 screen.flags &= ~Screen_WrapNext;
1261 1215
1262 if ((screen.cur.row == screen.bscroll && direction == UP) 1216 if ((screen.cur.row == screen.bscroll && direction == UP)
1263 || (screen.cur.row == screen.tscroll && direction == DN)) 1217 || (screen.cur.row == screen.tscroll && direction == DN))
1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1218 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1265 else 1219 else
1266 screen.cur.row += dirn; 1220 screen.cur.row += dirn;
1267 1221
1268 MAX_IT (screen.cur.row, 0); 1222 clamp_it (screen.cur.row, 0, nrow - 1);
1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1270 selection_check (0); 1223 selection_check (0);
1271} 1224}
1272 1225
1273/* ------------------------------------------------------------------------- */ 1226/* ------------------------------------------------------------------------- */
1274/* 1227/*
… …
1276 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1277 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1278 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1279 */ 1232 */
1280void 1233void
1281rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1282{ 1235{
1283 unsigned int row, col, num; 1236 unsigned int col, num;
1284 1237
1285 want_refresh = 1; 1238 want_refresh = 1;
1286 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
1287 1240
1288 selection_check (1); 1241 selection_check (1);
1289 1242
1290 row = TermWin.saveLines + screen.cur.row; 1243 line_t &line = ROW(screen.cur.row);
1244
1245 line.touch ();
1246 line.is_longer (0);
1247
1291 switch (mode) 1248 switch (mode)
1292 { 1249 {
1293 case 0: /* erase to end of line */ 1250 case 0: /* erase to end of line */
1294 col = screen.cur.col; 1251 col = screen.cur.col;
1295 num = TermWin.ncol - col; 1252 num = ncol - col;
1296 MIN_IT (screen.tlen[row], (int16_t)col); 1253 min_it (line.l, col);
1297 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1298 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1299 CLEAR_SELECTION (); 1256 CLEAR_SELECTION ();
1300 break; 1257 break;
1301 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
… …
1305 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1306 CLEAR_SELECTION (); 1263 CLEAR_SELECTION ();
1307 break; 1264 break;
1308 case 2: /* erase whole line */ 1265 case 2: /* erase whole line */
1309 col = 0; 1266 col = 0;
1310 num = TermWin.ncol; 1267 num = ncol;
1311 screen.tlen[row] = 0; 1268 line.l = 0;
1312 if (selection.beg.row <= screen.cur.row 1269 if (selection.beg.row <= screen.cur.row
1313 && selection.end.row >= screen.cur.row) 1270 && selection.end.row >= screen.cur.row)
1314 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1315 break; 1272 break;
1316 default: 1273 default:
1317 return; 1274 return;
1318 } 1275 }
1319 1276
1320 if (screen.text[row]) 1277 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} 1278}
1325 1279
1326/* ------------------------------------------------------------------------- */ 1280/* ------------------------------------------------------------------------- */
1327/* 1281/*
1328 * Erase part of whole of the screen 1282 * Erase part of whole of the screen
1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1332 */ 1286 */
1333void 1287void
1334rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1335{ 1289{
1336 int num; 1290 int num;
1337 int32_t row, row_offset; 1291 int32_t row;
1338 rend_t ren; 1292 rend_t ren;
1339 XGCValues gcvalue; 1293 XGCValues gcvalue;
1340 1294
1341 want_refresh = 1; 1295 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1296 ZERO_SCROLLBACK ();
1343
1344 row_offset = (int32_t)TermWin.saveLines;
1345 1297
1346 switch (mode) 1298 switch (mode)
1347 { 1299 {
1348 case 0: /* erase to end of screen */ 1300 case 0: /* erase to end of screen */
1349 selection_check (1); 1301 selection_check (1);
1350 scr_erase_line (0); 1302 scr_erase_line (0);
1351 row = screen.cur.row + 1; /* possible OOB */ 1303 row = screen.cur.row + 1; /* possible OOB */
1352 num = TermWin.nrow - row; 1304 num = nrow - row;
1353 break; 1305 break;
1354 case 1: /* erase to beginning of screen */ 1306 case 1: /* erase to beginning of screen */
1355 selection_check (3); 1307 selection_check (3);
1356 scr_erase_line (1); 1308 scr_erase_line (1);
1357 row = 0; 1309 row = 0;
1358 num = screen.cur.row; 1310 num = screen.cur.row;
1359 break; 1311 break;
1360 case 2: /* erase whole screen */ 1312 case 2: /* erase whole screen */
1361 selection_check (3); 1313 selection_check (3);
1362 row = 0; 1314 row = 0;
1363 num = TermWin.nrow; 1315 num = nrow;
1364 break; 1316 break;
1365 default: 1317 default:
1366 return; 1318 return;
1367 } 1319 }
1368 1320
… …
1370 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1322 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1371 || (selection.end.row >= row 1323 || (selection.end.row >= row
1372 && selection.end.row <= row + num))) 1324 && selection.end.row <= row + num)))
1373 CLEAR_SELECTION (); 1325 CLEAR_SELECTION ();
1374 1326
1375 if (row >= TermWin.nrow) /* Out Of Bounds */ 1327 if (row >= nrow) /* Out Of Bounds */
1376 return; 1328 return;
1377 1329
1378 MIN_IT (num, (TermWin.nrow - row)); 1330 min_it (num, nrow - row);
1379 1331
1380 if (rstyle & (RS_RVid | RS_Uline)) 1332 if (rstyle & (RS_RVid | RS_Uline))
1381 ren = (rend_t) ~RS_None; 1333 ren = (rend_t) ~RS_None;
1382 else if (GET_BASEBG (rstyle) == Color_bg) 1334 else if (GET_BASEBG (rstyle) == Color_bg)
1383 { 1335 {
… …
1385 CLEAR_ROWS (row, num); 1337 CLEAR_ROWS (row, num);
1386 } 1338 }
1387 else 1339 else
1388 { 1340 {
1389 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1343 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1392 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1393 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1346 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1395 } 1347 }
1396 1348
1397 for (; num--; row++) 1349 for (; num--; row++)
1398 { 1350 {
1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
1400 screen.tlen[row + row_offset] = 0; 1352 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 } 1353 }
1403} 1354}
1355
1356#if ENABLE_FRILLS
1357void
1358rxvt_term::scr_erase_savelines () NOTHROW
1359{
1360 want_refresh = 1;
1361 ZERO_SCROLLBACK ();
1362
1363 top_row = 0;
1364}
1365#endif
1404 1366
1405/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1406/* 1368/*
1407 * Fill the screen with `E's 1369 * Fill the screen with `E's
1408 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1409 */ 1371 */
1410void 1372void
1411rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1412{ 1374{
1413 int i, j, k; 1375 rend_t fs;
1414 rend_t *r1, fs;
1415 1376
1416 want_refresh = 1; 1377 want_refresh = 1;
1417 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
1418 1379
1419 num_scr_allow = 0; 1380 num_scr_allow = 0;
1420 selection_check (3); 1381 selection_check (3);
1421 1382
1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1383 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1384 for (int row = nrow; row--; )
1424 { 1385 {
1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1386 line_t &line = ROW(row);
1387
1426 fill_text (screen.text[k], 'E', TermWin.ncol); 1388 fill_text (line.t, 'E', ncol);
1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1389 rend_t *r1 = line.r;
1390
1391 for (int j = ncol; j--; )
1428 *r1++ = fs; 1392 *r1++ = fs;
1393
1394 line.is_longer (0);
1395 line.touch (ncol);
1429 } 1396 }
1430} 1397}
1431 1398
1432/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1433/* 1400/*
1434 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1435 */ 1402 */
1436void 1403void
1437rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1438{ 1405{
1439 int end; 1406 int end;
1440 1407
1441 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1442 1409
… …
1454 count = end; 1421 count = end;
1455 } 1422 }
1456 1423
1457 scr_do_wrap (); 1424 scr_do_wrap ();
1458 1425
1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1426 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1460} 1427}
1461 1428
1462/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1463/* 1430/*
1464 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1465 */ 1432 */
1466void 1433void
1467rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1468{ 1435{
1469 int col, row; 1436 int col, row;
1470 rend_t tr; 1437 rend_t tr;
1471 text_t *stp;
1472 rend_t *srp;
1473 int16_t *slp;
1474 1438
1475 want_refresh = 1; 1439 want_refresh = 1;
1476 ZERO_SCROLLBACK (); 1440 ZERO_SCROLLBACK ();
1477 1441
1478 if (count <= 0) 1442 if (count <= 0)
1479 return; 1443 return;
1480 1444
1481 scr_do_wrap (); 1445 scr_do_wrap ();
1482 1446
1483 selection_check (1); 1447 selection_check (1);
1484 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1448 min_it (count, ncol - screen.cur.col);
1485 1449
1486 row = screen.cur.row + TermWin.saveLines;
1487
1488 stp = screen.text[row];
1489 srp = screen.rend[row]; 1450 row = screen.cur.row;
1490 slp = &screen.tlen[row]; 1451
1452 line_t *line = &ROW(row);
1453
1454 line->touch ();
1455 line->is_longer (0);
1491 1456
1492 switch (insdel) 1457 switch (insdel)
1493 { 1458 {
1494 case INSERT: 1459 case INSERT:
1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1496 { 1461 {
1497 stp[col] = stp[col - count]; 1462 line->t[col] = line->t[col - count];
1498 srp[col] = srp[col - count]; 1463 line->r[col] = line->r[col - count];
1499 } 1464 }
1500 1465
1501 if (*slp != -1) 1466 line->l = min (line->l + count, ncol);
1502 {
1503 *slp += count;
1504 MIN_IT (*slp, TermWin.ncol);
1505 }
1506 1467
1507 if (selection.op && current_screen == selection.screen 1468 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1470 {
1510 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
1511 || (selection.end.col + count >= TermWin.ncol)) 1472 || (selection.end.col + count >= ncol))
1512 CLEAR_SELECTION (); 1473 CLEAR_SELECTION ();
1513 else 1474 else
1514 { /* shift selection */ 1475 { /* shift selection */
1515 selection.beg.col += count; 1476 selection.beg.col += count;
1516 selection.mark.col += count; /* XXX: yes? */ 1477 selection.mark.col += count; /* XXX: yes? */
1517 selection.end.col += count; 1478 selection.end.col += count;
1518 } 1479 }
1519 } 1480 }
1520 1481
1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1482 scr_blank_line (*line, screen.cur.col, count, rstyle);
1522 (unsigned int)count, rstyle);
1523 break; 1483 break;
1524 1484
1525 case ERASE: 1485 case ERASE:
1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1486 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1487 selection_check (1);
1528 screen.cur.col -= count; 1488 screen.cur.col -= count;
1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1489
1530 (unsigned int)count, rstyle); 1490 line->l = max (line->l - count, 0);
1491 scr_blank_line (*line, screen.cur.col, count, rstyle);
1531 break; 1492 break;
1532 1493
1533 case DELETE: 1494 case DELETE:
1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1535 1496
1536 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1497 for (col = screen.cur.col; (col + count) < ncol; col++)
1537 { 1498 {
1538 stp[col] = stp[col + count]; 1499 line->t[col] = line->t[col + count];
1539 srp[col] = srp[col + count]; 1500 line->r[col] = line->r[col + count];
1540 } 1501 }
1541 1502
1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1503 line->l = max (line->l - count, 0);
1543 (unsigned int)count, tr); 1504 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 1505
1551 if (selection.op && current_screen == selection.screen 1506 if (selection.op && current_screen == selection.screen
1552 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1553 { 1508 {
1554 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
1555 || (screen.cur.col >= selection.beg.col - count) 1510 || (screen.cur.col >= selection.beg.col - count)
1556 || selection.end.col >= TermWin.ncol) 1511 || selection.end.col >= ncol)
1557 CLEAR_SELECTION (); 1512 CLEAR_SELECTION ();
1558 else 1513 else
1559 { 1514 {
1560 /* shift selection */ 1515 /* shift selection */
1561 selection.beg.col -= count; 1516 selection.beg.col -= count;
… …
1572/* 1527/*
1573 * Set the scrolling region 1528 * Set the scrolling region
1574 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1575 */ 1530 */
1576void 1531void
1577rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1578{ 1533{
1579 MAX_IT (top, 0); 1534 max_it (top, 0);
1580 MIN_IT (bot, (int)TermWin.nrow - 1); 1535 min_it (bot, nrow - 1);
1581 1536
1582 if (top > bot) 1537 if (top > bot)
1583 return; 1538 return;
1584 1539
1585 screen.tscroll = top; 1540 screen.tscroll = top;
… …
1592 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1593 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1594 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1595 */ 1550 */
1596void 1551void
1597rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1598{ 1553{
1599 want_refresh = 1; 1554 want_refresh = 1;
1600 1555
1601 if (mode) 1556 if (mode)
1602 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1609 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1610 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1611 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1612 */ 1567 */
1613void 1568void
1614rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1615{ 1570{
1616 if (mode) 1571 if (mode)
1617 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1618 else 1573 else
1619 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1628 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1629 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1630 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1631 */ 1586 */
1632void 1587void
1633rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1634{ 1589{
1635 if (mode) 1590 if (mode)
1636 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1637 else 1592 else
1638 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1645 * Set insert/replace mode 1600 * Set insert/replace mode
1646 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1647 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1648 */ 1603 */
1649void 1604void
1650rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1651{ 1606{
1652 if (mode) 1607 if (mode)
1653 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1654 else 1609 else
1655 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1661 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1662 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1663 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1664 */ 1619 */
1665void 1620void
1666rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1667{ 1622{
1668 if (mode < 0) 1623 if (mode < 0)
1669 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1670 else if (screen.cur.col < TermWin.ncol) 1625 else if (screen.cur.col < ncol)
1671 tabs[screen.cur.col] = (mode ? 1 : 0); 1626 tabs [screen.cur.col] = !!mode;
1672} 1627}
1673 1628
1674/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
1675/* 1630/*
1676 * Set reverse/normal video 1631 * Set reverse/normal video
1677 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1678 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1679 */ 1634 */
1680void 1635void
1681rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1682{ 1637{
1683 XGCValues gcvalue; 1638 rvideo_mode = on;
1684 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1685 if (rvideo != mode) 1644 if (rvideo_state != on)
1686 { 1645 {
1687 rvideo = mode; 1646 rvideo_state = on;
1647
1688 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1690 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1691#endif 1651#endif
1692#if TRANSPARENT 1652#if TRANSPARENT
1693 if (! (options & Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1694#endif 1654#endif
1695 XSetWindowBackground (display->display, TermWin.vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1696 pix_colors[Color_bg]);
1697 1656
1657 XGCValues gcvalue;
1698 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1699 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1701 &gcvalue); 1661
1702 scr_clear (); 1662 scr_clear ();
1703 scr_touch (true); 1663 scr_touch (true);
1704 } 1664 }
1705} 1665}
1706 1666
… …
1708/* 1668/*
1709 * Report current cursor position 1669 * Report current cursor position
1710 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1711 */ 1671 */
1712void 1672void
1713rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1714{ 1674{
1715 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1675 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1716} 1676}
1717 1677
1718/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1721 1681
1722/* 1682/*
1723 * Set font style 1683 * Set font style
1724 */ 1684 */
1725void 1685void
1726rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1727{ 1687{
1688#if 0
1728 switch (charsets[screen.charset]) 1689 switch (charsets [screen.charset])
1729 { 1690 {
1730 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
1731 break; 1692 break;
1732 case 'A': /* United Kingdom (UK) */ 1693 case 'A': /* United Kingdom (UK) */
1733 break; 1694 break;
… …
1740 case 'C': /* Finnish character set */ 1701 case 'C': /* Finnish character set */
1741 break; 1702 break;
1742 case 'K': /* German character set */ 1703 case 'K': /* German character set */
1743 break; 1704 break;
1744 } 1705 }
1706#endif
1745} 1707}
1746 1708
1747/* ------------------------------------------------------------------------- */ 1709/* ------------------------------------------------------------------------- */
1748/* 1710/*
1749 * Choose a font 1711 * Choose a font
… …
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1716 */
1755void 1717void
1756rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1719{
1758 screen.charset = set; 1720 screen.charset = set;
1759 set_font_style (); 1721 set_font_style ();
1760} 1722}
1761 1723
… …
1767 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1768 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1769 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1770 */ 1732 */
1771void 1733void
1772rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1773{ 1735{
1774 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1775 set_font_style (); 1737 set_font_style ();
1776} 1738}
1777 1739
… …
1782 1744
1783/* 1745/*
1784 * refresh matching text. 1746 * refresh matching text.
1785 */ 1747 */
1786bool 1748bool
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1750{
1789 bool found = false; 1751 bool found = false;
1790 1752
1791 for (int i = 0; i < TermWin.nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1792 { 1754 {
1793 int col = 0; 1755 int col = 0;
1794 rend_t *drp = drawn_rend [i]; 1756 rend_t *drp = drawn_buf[i].r;
1795 1757
1796 for (; col < TermWin.ncol; col++, drp++) 1758 for (; col < ncol; col++, drp++)
1797 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1798 { 1760 {
1799 found = true; 1761 found = true;
1800 *drp = ~value; 1762 *drp = ~value;
1801 } 1763 }
… …
1812 PART_END, 1774 PART_END,
1813 RC_COUNT 1775 RC_COUNT
1814}; 1776};
1815 1777
1816void 1778void
1817rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818{ 1780{
1819 int i; 1781 int i;
1820 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1821 1783
1822 if (drawn_text == NULL) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
1823 return; 1785 return;
1824 1786
1825#ifndef NO_SLOW_LINK_SUPPORT 1787#ifndef NO_SLOW_LINK_SUPPORT
1826 if (refresh_type == FAST_REFRESH && !display->is_local) 1788 if (refresh_type == FAST_REFRESH && !display->is_local)
1827 { 1789 {
1828 y = 0; 1790 y = 0;
1829 height = TermWin.height; 1791 eheight = height;
1830 } 1792 }
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 1793#endif
1839 1794
1840 /* round down */ 1795 /* round down */
1841 rc[PART_BEG].col = Pixel2Col (x); 1796 rc[PART_BEG].col = Pixel2Col (x);
1842 rc[PART_BEG].row = Pixel2Row (y); 1797 rc[PART_BEG].row = Pixel2Row (y);
1843 /* round up */ 1798 /* round up */
1844 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1799 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1845 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1800 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1846 1801
1847 /* sanity checks */ 1802 /* sanity checks */
1848 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1849 { 1804 {
1850 MIN_IT (rc[i].col, TermWin.ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1851 MIN_IT (rc[i].row, TermWin.nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1852 } 1807 }
1853 1808
1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 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); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811
1812 num_scr_allow = 0;
1856 1813
1857 if (refresh) 1814 if (refresh)
1858 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1859} 1816}
1860 1817
1861/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1862/* 1819/*
1863 * Refresh the entire screen 1820 * Refresh the entire screen
1864 */ 1821 */
1865void 1822void
1866rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1867{ 1824{
1868 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1869} 1826}
1870 1827
1871/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1872/* 1829/*
1873 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1874 * the top of the screen 1831 * the top of the screen
1875 */ 1832 */
1876int 1833void
1877rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1878{ 1835{
1879 long p = 0; 1836 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} 1837}
1895 1838
1896/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1897/* 1840/*
1898 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1899 * direction should be UP or DN 1842 * direction should be UP or DN
1900 */ 1843 */
1901int 1844bool
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1903{ 1846{
1904 int n; 1847 int new_view_start =
1905 unsigned int oldviewstart; 1848 direction == UP ? view_start - nlines
1849 : view_start + nlines;
1906 1850
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); 1851 return scr_changeview (new_view_start);
1922} 1852}
1923 1853
1924int 1854bool
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1926{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1927 if (TermWin.view_start != oldviewstart) 1859 if (new_view_start == view_start)
1928 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1929 want_refresh = 1; 1864 want_refresh = 1;
1930 num_scr -= (TermWin.view_start - oldviewstart);
1931 }
1932 1865
1933 return (int) (TermWin.view_start - oldviewstart); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1934}
1935 1867
1936/* ------------------------------------------------------------------------- */ 1868 return true;
1937void 1869}
1938rxvt_term::scr_bell () 1870
1939{
1940#ifndef NO_BELL 1871#ifndef NO_BELL
1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1882rxvt_term::scr_bell () NOTHROW
1883{
1884#ifndef NO_BELL
1885
1941# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1888 if (OPTION (Opt_mapAlert))
1944# endif 1889# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1890 XMapWindow (display->display, parent[0]);
1946# endif 1891# endif
1947 if (options & Opt_visualBell) 1892
1893 if (OPTION (Opt_visualBell))
1948 { 1894 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1896 scr_rvideo_mode (rvideo_mode);
1897 display->flush ();
1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1951 } 1900 }
1952 else 1901 else
1953 XBell (display->display, 0); 1902 XBell (display->display, 0);
1903
1954#endif 1904#endif
1955} 1905}
1956 1906
1957/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1908/* ARGSUSED */
1959void 1909void
1960rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1961{ 1911{
1962#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1963 int i, r1, nrows, row_offset; 1913 int nrows, row_start;
1964 FILE *fd; 1914 FILE *fd;
1965 1915
1966 if ((fd = popen_printer ()) == NULL) 1916 if ((fd = popen_printer ()) == NULL)
1967 return; 1917 return;
1968 1918
1969 nrows = TermWin.nrow;
1970 row_offset = TermWin.saveLines;
1971
1972 if (!fullhist) 1919 if (fullhist)
1973 row_offset -= TermWin.view_start; 1920 {
1921 nrows = nrow - top_row;
1922 row_start = top_row;
1923 }
1974 else 1924 else
1975 { 1925 {
1976 nrows += TermWin.nscrolled; 1926 nrows = nrow;
1977 row_offset -= TermWin.nscrolled; 1927 row_start = view_start;
1978 } 1928 }
1979 1929
1980 wctomb (0, 0); 1930 wctomb (0, 0);
1981 1931
1982 for (r1 = 0; r1 < nrows; r1++) 1932 for (int r1 = 0; r1 < nrows; r1++)
1983 { 1933 {
1984 text_t *tp = screen.text[r1 + row_offset]; 1934 text_t *tp = ROW(r1).t;
1985 int len = screen.tlen[r1 + row_offset]; 1935 int len = ROW(r1).l;
1986 1936
1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1937 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1988 { 1938 {
1989 char mb[MB_LEN_MAX]; 1939 char mb[MB_LEN_MAX];
1990 text_t t = *tp++; 1940 text_t t = *tp++;
1991 if (t == NOCHAR) 1941 if (t == NOCHAR)
1992 continue; 1942 continue;
… …
2013/* 1963/*
2014 * Refresh the screen 1964 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
2017 */ 1967 */
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 1968void
2029rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
2030{ 1970{
2031 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
2032 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
2033 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
2034 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
2035 int i, /* tmp */ 1975 int i; /* tmp */
2036 row_offset; /* basic offset in screen structure */
2037#ifndef NO_CURSORCOLOR 1976#ifndef NO_CURSORCOLOR
2038 rend_t cc1; /* store colours at cursor position (s) */ 1977 rend_t cc1; /* store colours at cursor position (s) */
2039#endif 1978#endif
2040 rend_t *crp; // cursor rendition pointer 1979 rend_t *crp; // cursor rendition pointer
2041 1980
2042 want_refresh = 0; /* screen is current */ 1981 want_refresh = 0; /* screen is current */
2043 1982
2044 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1983 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 1984 return;
2046 1985
2047 /* 1986 /*
2048 * A: set up vars 1987 * A: set up vars
2049 */ 1988 */
2050 must_clear = 0; 1989 must_clear = 0;
2051 refresh_count = 0; 1990 refresh_count = 0;
2052 1991
2053 row_offset = TermWin.saveLines - TermWin.view_start;
2054
2055#if XPM_BACKGROUND 1992#if XPM_BACKGROUND
2056 must_clear |= (bgPixmap.pixmap != None); 1993 must_clear |= bgPixmap.pixmap != None;
2057#endif 1994#endif
2058#if TRANSPARENT 1995#if TRANSPARENT
2059 must_clear |= ((options & Opt_transparent) && am_transparent); 1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
2060#endif 1997#endif
2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062 1999
2063 /* 2000 /*
2064 * B: reverse any characters which are selected 2001 * B: reverse any characters which are selected
… …
2081 2018
2082 if (showcursor) 2019 if (showcursor)
2083 { 2020 {
2084 int col = screen.cur.col; 2021 int col = screen.cur.col;
2085 2022
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2024 col--;
2088 2025
2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2026 crp = &ROW(screen.cur.row).r[col];
2090 2027
2091 if (showcursor && TermWin.focus) 2028 if (showcursor && focus)
2092 { 2029 {
2030 if (OPTION (Opt_cursorUnderline))
2031 *crp ^= RS_Uline;
2032 else
2033 {
2093 *crp ^= RS_RVid; 2034 *crp ^= RS_RVid;
2035
2094#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask); 2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2038 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2039 ccol1 = Color_cursor;
2098 else 2040 else
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100 ccol1 = GET_FGCOLOR (rstyle); 2042 ccol1 = fgcolor_of (rstyle);
2101#else 2043#else
2102 ccol1 = Color_fg; 2044 ccol1 = Color_fg;
2103#endif 2045#endif
2104 if (ISSET_PIXCOLOR (Color_cursor2)) 2046 if (ISSET_PIXCOLOR (Color_cursor2))
2105 ccol2 = Color_cursor2; 2047 ccol2 = Color_cursor2;
2106 else 2048 else
2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2108 ccol2 = GET_BGCOLOR (rstyle); 2050 ccol2 = bgcolor_of (rstyle);
2109#else 2051#else
2110 ccol2 = Color_bg; 2052 ccol2 = Color_bg;
2111#endif 2053#endif
2112 *crp = SET_FGCOLOR (*crp, ccol1); 2054 *crp = SET_FGCOLOR (*crp, ccol1);
2113 *crp = SET_BGCOLOR (*crp, ccol2); 2055 *crp = SET_BGCOLOR (*crp, ccol2);
2114#endif 2056#endif
2057 }
2115 } 2058 }
2116 } 2059 }
2117 2060
2118 /* make sure no outline cursor is left around */ 2061 /* make sure no outline cursor is left around */
2119 setoldcursor = 0; 2062 setoldcursor = 0;
2120 if (ocrow != -1) 2063 if (ocrow != -1)
2121 { 2064 {
2122 if (screen.cur.row + TermWin.view_start != ocrow 2065 if (screen.cur.row - view_start != ocrow
2123 || screen.cur.col != oldcursor.col) 2066 || screen.cur.col != oldcursor.col)
2124 { 2067 {
2125 if (ocrow < TermWin.nrow 2068 if (ocrow < nrow
2126 && oldcursor.col < TermWin.ncol) 2069 && oldcursor.col < ncol)
2127 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2070 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2128 2071
2129 if (TermWin.focus || !showcursor) 2072 if (focus || !showcursor)
2130 oldcursor.row = -1; 2073 oldcursor.row = -1;
2131 else 2074 else
2132 setoldcursor = 1; 2075 setoldcursor = 1;
2133 } 2076 }
2134 } 2077 }
2135 else if (!TermWin.focus) 2078 else if (!focus)
2136 setoldcursor = 1; 2079 setoldcursor = 1;
2137 2080
2138 if (setoldcursor) 2081 if (setoldcursor)
2139 { 2082 {
2140 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2083 if (screen.cur.row - view_start >= nrow)
2141 oldcursor.row = -1; 2084 oldcursor.row = -1;
2142 else 2085 else
2143 { 2086 {
2144 oldcursor.row = screen.cur.row + TermWin.view_start; 2087 oldcursor.row = screen.cur.row - view_start;
2145 oldcursor.col = screen.cur.col; 2088 oldcursor.col = screen.cur.col;
2146 } 2089 }
2147 } 2090 }
2148 } 2091 }
2149 2092
2093 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2150#if ENABLE_OVERLAY 2094#if ENABLE_OVERLAY
2151 scr_swap_overlay (); 2095 scr_swap_overlay ();
2152#endif 2096#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 2097
2157#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2158 /* 2099 /*
2159 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2160 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2161 */ 2102 */
2162 i = num_scr;
2163 if (!display->is_local 2103 if (!display->is_local
2164 && refresh_type == FAST_REFRESH && num_scr_allow && i 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2165 && abs (i) < TermWin.nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2166 { 2106 {
2167 int16_t nits; 2107 int16_t nits;
2168 int j; 2108 int j;
2169 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2170 2111
2171 j = TermWin.nrow; 2112 j = nrow;
2172 wlen = len = -1; 2113 wlen = len = -1;
2173 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2175 { 2116 {
2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2177 { 2118 {
2178 text_t *stp = screen.text[row + row_offset]; 2119 line_t s = ROW(view_start + row);
2179 rend_t *srp = screen.rend[row + row_offset];
2180 text_t *dtp = drawn_text[row]; 2120 line_t d = drawn_buf[row];
2181 text_t *dtp2 = drawn_text[row + i]; 2121 line_t d2 = drawn_buf[row + i];
2182 rend_t *drp = drawn_rend[row];
2183 rend_t *drp2 = drawn_rend[row + i];
2184 2122
2185 for (nits = 0, col = TermWin.ncol; col--; ) 2123 for (nits = 0, col = ncol; col--; )
2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2124 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2187 nits--; 2125 nits--;
2188 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2126 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2189 nits++; 2127 nits++;
2190 2128
2191 if (nits > 8) /* XXX: arbitrary choice */ 2129 if (nits > 8) /* XXX: arbitrary choice */
2192 { 2130 {
2193 for (col = TermWin.ncol; col--; ) 2131 for (col = ncol; col--; )
2194 { 2132 {
2195 *dtp++ = *dtp2++; 2133 *d.t++ = *d2.t++;
2196 *drp++ = *drp2++; 2134 *d.r++ = *d2.r++;
2197 } 2135 }
2198 2136
2199 if (len == -1) 2137 if (len == -1)
2200 len = row; 2138 len = row;
2201 2139
… …
2206 2144
2207 if (len != -1) 2145 if (len != -1)
2208 { 2146 {
2209 /* also comes here at end if needed because of >= above */ 2147 /* also comes here at end if needed because of >= above */
2210 if (wlen < len) 2148 if (wlen < len)
2211 SWAP_IT (wlen, len, int); 2149 ::swap (wlen, len);
2212 2150
2213 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2151 XCopyArea (display->display, vt, vt,
2214 TermWin.gc, 0, Row2Pixel (len + i), 2152 gc, 0, Row2Pixel (len + i),
2215 (unsigned int)TermWin_TotalWidth (), 2153 (unsigned int)this->width,
2216 (unsigned int)Height2Pixel (wlen - len + 1), 2154 (unsigned int)Height2Pixel (wlen - len + 1),
2217 0, Row2Pixel (len)); 2155 0, Row2Pixel (len));
2218 len = -1; 2156 len = -1;
2219 } 2157 }
2220 } 2158 }
… …
2222#endif 2160#endif
2223 2161
2224 /* 2162 /*
2225 * E: main pass across every character 2163 * E: main pass across every character
2226 */ 2164 */
2227 for (row = 0; row < TermWin.nrow; row++) 2165 for (row = 0; row < nrow; row++)
2228 { 2166 {
2229 text_t *stp = screen.text[row + row_offset]; 2167 text_t *stp = ROW(view_start + row).t;
2230 rend_t *srp = screen.rend[row + row_offset]; 2168 rend_t *srp = ROW(view_start + row).r;
2231 text_t *dtp = drawn_text[row]; 2169 text_t *dtp = drawn_buf[row].t;
2232 rend_t *drp = drawn_rend[row]; 2170 rend_t *drp = drawn_buf[row].r;
2233 2171
2234 /* 2172 /*
2235 * E2: OK, now the real pass 2173 * E2: OK, now the real pass
2236 */ 2174 */
2237 int ypixel = (int)Row2Pixel (row); 2175 int ypixel = (int)Row2Pixel (row);
2238 2176
2239 for (col = 0; col < TermWin.ncol; col++) 2177 for (col = 0; col < ncol; col++)
2240 { 2178 {
2241 /* compare new text with old - if exactly the same then continue */ 2179 /* compare new text with old - if exactly the same then continue */
2242 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2180 if (stp[col] == dtp[col] /* Must match characters to skip. */
2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2181 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244 || (stp[col] == ' ' /* space w/ no background change */ 2182 || (stp[col] == ' ' /* space w/ no background change */
… …
2258 dtp[col] = stp[col]; 2196 dtp[col] = stp[col];
2259 drp[col] = rend; 2197 drp[col] = rend;
2260 2198
2261 int xpixel = Col2Pixel (col); 2199 int xpixel = Col2Pixel (col);
2262 2200
2263 for (i = 0; ++col < TermWin.ncol; ) 2201 for (i = 0; ++col < ncol; )
2264 { 2202 {
2265 if (stp[col] == NOCHAR) 2203 if (stp[col] == NOCHAR)
2266 { 2204 {
2267 dtp[col] = stp[col]; 2205 dtp[col] = stp[col];
2268 drp[col] = rend; 2206 drp[col] = rend;
… …
2296 2234
2297 // sometimes we optimize away the trailing NOCHAR's, add them back 2235 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR) 2236 while (i && text[count] == NOCHAR)
2299 count++, i--; 2237 count++, i--;
2300 2238
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 /* 2239 /*
2314 * Determine the attributes for the string 2240 * Determine the attributes for the string
2315 */ 2241 */
2316 int fore = GET_FGCOLOR (rend); // desired foreground 2242 int fore = fgcolor_of (rend); // desired foreground
2317 int back = GET_BGCOLOR (rend); // desired background 2243 int back = bgcolor_of (rend); // desired background
2318 2244
2319 // only do special processing if ana attributes are set, which is rare 2245 // 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)) 2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2321 { 2247 {
2248#if ENABLE_STYLES
2249 // "careful" (too wide) character handling
2250
2251 // include previous careful character(s) if possible, looks nicer (best effort...)
2252 while (text > stp
2253 && srp[text - stp - 1] & RS_Careful
2254 && RS_SAME (rend, srp[text - stp - 1]))
2255 text--, count++, xpixel -= fwidth;
2256
2257 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1];
2260
2261 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2264#endif
2265
2322 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2323 2267
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2325 if (rend & RS_Bold 2269 if (rend & RS_Bold
2326 && fore == Color_fg) 2270 && fore == Color_fg)
… …
2348 fore = Color_UL; 2292 fore = Color_UL;
2349#endif 2293#endif
2350 2294
2351 if (invert) 2295 if (invert)
2352 { 2296 {
2353 SWAP_IT (fore, back, int); 2297 ::swap (fore, back);
2354 2298
2355#ifndef NO_BOLD_UNDERLINE_REVERSE 2299#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV)) 2300 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV; 2301 back = Color_RV;
2302
2303 if (fore == back)
2304 {
2305 fore = Color_bg;
2306 back = Color_fg;
2307 }
2358#endif 2308#endif
2359 } 2309 }
2360 2310
2361#ifdef TEXT_BLINK 2311#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2312 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2373 } 2323 }
2374 2324
2375 /* 2325 /*
2376 * Actually do the drawing of the string here 2326 * Actually do the drawing of the string here
2377 */ 2327 */
2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2328 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2379 2329
2380 if (back == fore) 2330 if (back == fore)
2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2331 font->clear_rect (*drawable, xpixel, ypixel,
2382 TermWin.fwidth * count, TermWin.fheight, 2332 fwidth * count, fheight,
2383 back); 2333 back);
2384 else if (back == Color_bg) 2334 else if (back == Color_bg)
2385 { 2335 {
2386 if (must_clear) 2336 if (must_clear)
2387 { 2337 {
2388 CLEAR_CHARS (xpixel, ypixel, count); 2338 CLEAR_CHARS (xpixel, ypixel, count);
2389 2339
2390 for (i = 0; i < count; i++) /* don't draw empty strings */ 2340 for (i = 0; i < count; i++) /* don't draw empty strings */
2391 if (text[i] != ' ') 2341 if (text[i] != ' ')
2392 { 2342 {
2393 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2343 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2394 break; 2344 break;
2395 } 2345 }
2396 } 2346 }
2397 else 2347 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2348 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2399 } 2349 }
2400 else 2350 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2402 2352
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2353 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2354 {
2355#if ENABLE_FRILLS
2356 if (ISSET_PIXCOLOR (Color_underline))
2357 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2358 else
2359#endif
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2360 XSetForeground (display->display, gc, pix_colors[fore]);
2361
2406 XDrawLine (display->display, drawBuffer, TermWin.gc, 2362 XDrawLine (display->display, drawBuffer, gc,
2407 xpixel, ypixel + font->ascent + 1, 2363 xpixel, ypixel + font->ascent + 1,
2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2364 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 } 2365 }
2410 } /* for (col....) */ 2366 } /* for (col....) */
2411 } /* for (row....) */ 2367 } /* for (row....) */
2412 2368
2413#if ENABLE_OVERLAY 2369#if ENABLE_OVERLAY
2414 scr_swap_overlay (); 2370 scr_swap_overlay ();
2415#endif 2371#endif
2372 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2416 2373
2417 /* 2374 /*
2418 * G: cleanup cursor and display outline cursor if necessary 2375 * G: cleanup cursor and display outline cursor if necessary
2419 */ 2376 */
2420 if (showcursor) 2377 if (showcursor)
2421 { 2378 {
2422 if (TermWin.focus) 2379 if (focus)
2380 {
2381 if (OPTION (Opt_cursorUnderline))
2382 *crp ^= RS_Uline;
2383 else
2423 { 2384 {
2424 *crp ^= RS_RVid; 2385 *crp ^= RS_RVid;
2425#ifndef NO_CURSORCOLOR 2386#ifndef NO_CURSORCOLOR
2426 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2387 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2427#endif 2388#endif
2389 }
2428 } 2390 }
2429 else if (oldcursor.row >= 0) 2391 else if (oldcursor.row >= 0)
2430 { 2392 {
2393 int cursorwidth = 1;
2394 int col = oldcursor.col;
2395
2396 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2397 col--;
2398
2399 while (col + cursorwidth < ncol
2400 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2401 cursorwidth++;
2402
2431#ifndef NO_CURSORCOLOR 2403#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2404 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2405 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2434#endif 2406#endif
2435 int cursorwidth = 1;
2436 while (oldcursor.col + cursorwidth < TermWin.ncol
2437 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2438 cursorwidth++;
2439 2407
2440 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2408 XDrawRectangle (display->display, drawBuffer, gc,
2441 Col2Pixel (oldcursor.col), 2409 Col2Pixel (col),
2442 Row2Pixel (oldcursor.row), 2410 Row2Pixel (oldcursor.row),
2443 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2411 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2444 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2412 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2445 } 2413 }
2446 } 2414 }
2447 2415
2448 /* 2416 /*
2449 * H: cleanup selection 2417 * H: cleanup selection
2450 */ 2418 */
2451 scr_reverse_selection (); 2419 scr_reverse_selection ();
2452 2420
2453 if (refresh_type & SMOOTH_REFRESH)
2454 XFlush (display->display);
2455
2456 num_scr = 0; 2421 num_scr = 0;
2457 num_scr_allow = 1; 2422 num_scr_allow = 1;
2458} 2423}
2459 2424
2460void 2425void
2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2426rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2462{ 2427{
2463 if (!rp || !tp) 2428 if (!l.t)
2464 return; 2429 return;
2465 2430
2466 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2431 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2432
2433 for (int i = ncol; i--; )
2467 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2434 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2468} 2435}
2469 2436
2470void 2437void
2471rxvt_term::scr_remap_chars () 2438rxvt_term::scr_remap_chars () NOTHROW
2472{ 2439{
2473 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2440 for (int i = total_rows; i--; )
2474 scr_remap_chars (screen.text[i], screen.rend[i]); 2441 scr_remap_chars (row_buf [i]);
2475 2442
2476 for (int i = TermWin.nrow; i--; ) 2443 for (int i = nrow; i--; )
2477 {
2478 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2479 scr_remap_chars (swap.text[i], swap.rend[i]);
2480 } 2444 {
2445 scr_remap_chars (drawn_buf [i]);
2446 scr_remap_chars (swap_buf [i]);
2447 }
2481} 2448}
2482 2449
2483void 2450void
2484rxvt_term::scr_recolour () 2451rxvt_term::scr_recolour () NOTHROW
2485{ 2452{
2486 if (1 2453 if (1
2487#if TRANSPARENT 2454#if TRANSPARENT
2488 && !am_transparent 2455 && !am_transparent
2489#endif 2456#endif
2490#if XPM_BACKGROUND 2457#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap 2458 && !bgPixmap.pixmap
2492#endif 2459#endif
2493 ) 2460 )
2494 { 2461 {
2495 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2462 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2496 XClearWindow (display->display, TermWin.parent[0]); 2463 XClearWindow (display->display, parent[0]);
2497 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2464 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2465#if HAVE_SCROLLBARS
2499 if (scrollBar.win) 2466 if (scrollBar.win)
2500 { 2467 {
2501 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2468 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2469 scrollBar.setIdle ();
… …
2510 want_refresh = 1; 2477 want_refresh = 1;
2511} 2478}
2512 2479
2513/* ------------------------------------------------------------------------- */ 2480/* ------------------------------------------------------------------------- */
2514void 2481void
2515rxvt_term::scr_clear (bool really) 2482rxvt_term::scr_clear (bool really) NOTHROW
2516{ 2483{
2517 if (!TermWin.mapped) 2484 if (!mapped)
2518 return; 2485 return;
2519 2486
2520 num_scr_allow = 0; 2487 num_scr_allow = 0;
2521 want_refresh = 1; 2488 want_refresh = 1;
2522 2489
2523#if TRANSPARENT
2524 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2525 {
2526 int i;
2527
2528 if (!(options & Opt_transparent_all))
2529 i = 0;
2530 else
2531 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2532
2533 while (i--)
2534 if (TermWin.parent[i] != None)
2535 XClearWindow (display->display, TermWin.parent[i]);
2536 }
2537#endif
2538
2539 if (really) 2490 if (really)
2540 XClearWindow (display->display, TermWin.vt); 2491 XClearWindow (display->display, vt);
2541} 2492}
2542 2493
2543/* ------------------------------------------------------------------------- */
2544void 2494void
2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2496{
2497 int view_end = view_start + nrow;
2498 int row, col;
2499
2500 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2501 {
2502 text_t *stp = ROW(row).t;
2503 rend_t *srp = ROW(row).r;
2504
2505 for (col = beg_col; col < end_col; col++)
2506 srp[col] ^= rstyle1;
2507
2508 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2509 srp[col] ^= rstyle2;
2510
2511 if (++col < end_col)
2512 srp[col] ^= rstyle2;
2513 }
2514}
2515
2516void
2517rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2518{
2519 int view_end = view_start + nrow;
2520 int row, col;
2521
2522 if (beg_row >= view_start)
2523 {
2524 col = beg_col;
2525 row = beg_row;
2526 }
2527 else
2528 {
2529 col = 0;
2530 row = view_start;
2531 }
2532
2533 for (; row < min (end_row, view_end); row++, col = 0)
2534 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2535 srp[col] ^= rstyle;
2536
2537 if (row == end_row)
2538 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2539 srp[col] ^= rstyle;
2540}
2541
2542/* ------------------------------------------------------------------------- */
2543void
2545rxvt_term::scr_reverse_selection () 2544rxvt_term::scr_reverse_selection () NOTHROW
2546{ 2545{
2546 if (selection.op
2547 if (selection.op && current_screen == selection.screen) 2547 && current_screen == selection.screen
2548 && selection.end.row >= view_start)
2548 { 2549 {
2549 int end_row = TermWin.saveLines - TermWin.view_start;
2550 int i = selection.beg.row + TermWin.saveLines;
2551 int col, row = selection.end.row + TermWin.saveLines;
2552 rend_t *srp;
2553
2554#if ENABLE_FRILLS 2550#if ENABLE_FRILLS
2555 if (selection.rect) 2551 if (selection.rect)
2556 { 2552 scr_xor_rect (selection.beg.row, selection.beg.col,
2557 end_row += TermWin.nrow; 2553 selection.end.row, selection.end.col,
2558 2554 RS_RVid, RS_RVid | RS_Uline);
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid;
2562 }
2563 else 2555 else
2564#endif 2556#endif
2565 { 2557 scr_xor_span (selection.beg.row, selection.beg.col,
2566 if (i >= end_row) 2558 selection.end.row, selection.end.col,
2567 col = selection.beg.col; 2559 RS_RVid);
2568 else
2569 {
2570 col = 0;
2571 i = end_row;
2572 }
2573
2574 end_row += TermWin.nrow;
2575
2576 for (; i < row && i < end_row; i++, col = 0)
2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2578 srp[col] ^= RS_RVid;
2579
2580 if (i == row && i < end_row)
2581 for (srp = screen.rend[i]; col < selection.end.col; col++)
2582 srp[col] ^= RS_RVid;
2583 }
2584 } 2560 }
2585} 2561}
2586 2562
2587/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2588/* 2564/*
2589 * Dump the whole scrollback and screen to the passed filedescriptor. The 2565 * Dump the whole scrollback and screen to the passed filedescriptor. The
2590 * invoking routine must close the fd. 2566 * invoking routine must close the fd.
2591 */ 2567 */
2592#if 0 2568#if 0
2593void 2569void
2594rxvt_term::scr_dump (int fd) 2570rxvt_term::scr_dump (int fd) NOTHROW
2595{ 2571{
2596 int row, wrote; 2572 int row, wrote;
2597 unsigned int width, towrite; 2573 unsigned int width, towrite;
2598 char r1[] = "\n"; 2574 char r1[] = "\n";
2599 2575
2600 for (row = TermWin.saveLines - TermWin.nscrolled; 2576 for (row = saveLines - nsaved;
2601 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2577 row < saveLines + nrow - 1; row++)
2602 { 2578 {
2603 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2579 width = row_buf[row].l >= 0 ? row_buf[row].l
2604 : TermWin.ncol; 2580 : ncol;
2605 for (towrite = width; towrite; towrite -= wrote) 2581 for (towrite = width; towrite; towrite -= wrote)
2606 { 2582 {
2607 wrote = write (fd, & (screen.text[row][width - towrite]), 2583 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2608 towrite); 2584 towrite);
2609 if (wrote < 0) 2585 if (wrote < 0)
2610 return; /* XXX: death, no report */ 2586 return; /* XXX: death, no report */
2611 } 2587 }
2612 if (screen.tlen[row] >= 0) 2588 if (row_buf[row].l >= 0)
2613 if (write (fd, r1, 1) <= 0) 2589 if (write (fd, r1, 1) <= 0)
2614 return; /* XXX: death, no report */ 2590 return; /* XXX: death, no report */
2615 } 2591 }
2616} 2592}
2617#endif 2593#endif
2618 2594
2619/* ------------------------------------------------------------------------- * 2595/* ------------------------------------------------------------------------- *
2620 * CHARACTER SELECTION * 2596 * CHARACTER SELECTION *
2621 * ------------------------------------------------------------------------- */ 2597 * ------------------------------------------------------------------------- */
2622
2623/*
2624 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2625 */
2626void 2598void
2627rxvt_term::selection_check (int check_more) 2599rxvt_term::selection_check (int check_more) NOTHROW
2628{ 2600{
2629 row_col_t pos; 2601 row_col_t pos;
2630 2602
2631 if (!selection.op) 2603 if (!selection.op)
2632 return; 2604 return;
2633 2605
2634 pos.row = pos.col = 0; 2606 pos.row = pos.col = 0;
2635 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2607 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2636 || (selection.beg.row >= TermWin.nrow) 2608 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2637 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2609 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2638 || (selection.mark.row >= TermWin.nrow)
2639 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2640 || (selection.end.row >= TermWin.nrow)
2641 || (check_more == 1 2610 || (check_more == 1
2642 && current_screen == selection.screen 2611 && current_screen == selection.screen
2643 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2612 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2644 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2613 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2645 || (check_more == 2 2614 || (check_more == 2
… …
2647 && ROWCOL_IS_AFTER (selection.end, pos)) 2616 && ROWCOL_IS_AFTER (selection.end, pos))
2648 || (check_more == 3 2617 || (check_more == 3
2649 && ROWCOL_IS_AFTER (selection.end, pos)) 2618 && ROWCOL_IS_AFTER (selection.end, pos))
2650 || (check_more == 4 /* screen width change */ 2619 || (check_more == 4 /* screen width change */
2651 && (selection.beg.row != selection.end.row 2620 && (selection.beg.row != selection.end.row
2652 || selection.end.col > TermWin.ncol))) 2621 || selection.end.col > ncol)))
2653 CLEAR_SELECTION (); 2622 CLEAR_SELECTION ();
2654} 2623}
2655 2624
2656/* ------------------------------------------------------------------------- */ 2625/* ------------------------------------------------------------------------- */
2657/* 2626/*
2658 * Paste a selection direct to the command fd 2627 * Paste a selection direct to the command fd
2659 */ 2628 */
2660void 2629void
2661rxvt_term::paste (unsigned char *data, unsigned int len) 2630rxvt_term::paste (char *data, unsigned int len) NOTHROW
2662{ 2631{
2663 /* convert normal newline chars into common keyboard Return key sequence */ 2632 /* convert normal newline chars into common keyboard Return key sequence */
2664 for (unsigned int i = 0; i < len; i++) 2633 for (unsigned int i = 0; i < len; i++)
2665 if (data[i] == C0_LF) 2634 if (data[i] == C0_LF)
2666 data[i] = C0_CR; 2635 data[i] = C0_CR;
… …
2672/* 2641/*
2673 * Respond to a notification that a primary selection has been sent 2642 * Respond to a notification that a primary selection has been sent
2674 * EXT: SelectionNotify 2643 * EXT: SelectionNotify
2675 */ 2644 */
2676void 2645void
2677rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2646rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2678{ 2647{
2679 if (prop == None) /* check for failed XConvertSelection */ 2648 if (prop == None) /* check for failed XConvertSelection */
2680 { 2649 {
2681 if ((selection_type & Sel_CompoundText)) 2650 if ((selection_type & Sel_CompoundText))
2682 { 2651 {
… …
2810 { 2779 {
2811 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2780 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2812 char *s = rxvt_wcstombs (w); 2781 char *s = rxvt_wcstombs (w);
2813 free (w); 2782 free (w);
2814 // TODO: strlen == only the first element will be converted. well... 2783 // TODO: strlen == only the first element will be converted. well...
2815 paste ((unsigned char *)s, strlen (s)); 2784 paste (s, strlen (s));
2816 free (s); 2785 free (s);
2817 } 2786 }
2818 else 2787 else
2819#endif 2788#endif
2820 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2789 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2821 && cl) 2790 && cl)
2822 { 2791 {
2823 for (int i = 0; i < cr; i++) 2792 for (int i = 0; i < cr; i++)
2824 paste ((unsigned char *)cl[i], strlen (cl[i])); 2793 paste (cl[i], strlen (cl[i]));
2825 2794
2826 XFreeStringList (cl); 2795 XFreeStringList (cl);
2827 } 2796 }
2828 else 2797 else
2829 paste (ct.value, ct.nitems); // paste raw 2798 paste ((char *)ct.value, ct.nitems); // paste raw
2830 2799
2831bailout: 2800bailout:
2832 XFree (ct.value); 2801 XFree (ct.value);
2833 2802
2834 if (selection_wait == Sel_normal) 2803 if (selection_wait == Sel_normal)
2835 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2836} 2805}
2837 2806
2838void 2807void
2839rxvt_term::incr_cb (time_watcher &w) 2808rxvt_term::incr_cb (time_watcher &w) NOTHROW
2840{ 2809{
2841 selection_wait = Sel_none; 2810 selection_wait = Sel_none;
2842 2811
2843 incr_buf_size = 0; 2812 incr_buf_size = 0;
2844 free (incr_buf); 2813 free (incr_buf);
2845 2814
2846 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2815 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2847} 2816}
2848 2817
2849void 2818void
2850rxvt_term::selection_property (Window win, Atom prop) 2819rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2851{ 2820{
2852 if (prop == None || selection_wait != Sel_incr) 2821 if (prop == None || selection_wait != Sel_incr)
2853 return; 2822 return;
2854 2823
2855 selection_paste (win, prop, true); 2824 selection_paste (win, prop, true);
… …
2864 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2833 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2865 * will auto fallback to CUT_BUFFER0 2834 * will auto fallback to CUT_BUFFER0
2866 * EXT: button 2 release 2835 * EXT: button 2 release
2867 */ 2836 */
2868void 2837void
2869rxvt_term::selection_request (Time tm, int x, int y) 2838rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2870{ 2839{
2871 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2840 if (selection.text && selnum == Sel_Primary)
2872 return; /* outside window */
2873
2874 if (selection.text)
2875 { /* internal selection */ 2841 { /* internal selection */
2876 char *str = rxvt_wcstombs (selection.text, selection.len); 2842 char *str = rxvt_wcstombs (selection.text, selection.len);
2877 paste ((unsigned char *)str, strlen (str)); 2843 paste (str, strlen (str));
2878 free (str); 2844 free (str);
2879 return; 2845 return;
2880 } 2846 }
2881 else 2847 else
2882 { 2848 {
2883 int i;
2884
2885 selection_request_time = tm; 2849 selection_request_time = tm;
2886 selection_wait = Sel_normal; 2850 selection_wait = Sel_normal;
2887 2851
2888 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2889 {
2890#if X_HAVE_UTF8_STRING 2852#if X_HAVE_UTF8_STRING
2891 selection_type = Sel_UTF8String; 2853 selection_type = Sel_UTF8String;
2892 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2854 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2893 return; 2855 return;
2894#else 2856#else
2895 selection_type = Sel_CompoundText; 2857 selection_type = Sel_CompoundText;
2896 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2858 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2897 return; 2859 return;
2898#endif 2860#endif
2899 }
2900 } 2861 }
2901 2862
2902 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2863 selection_wait = Sel_none; /* don't loop in selection_paste () */
2903 selection_paste (display->root, XA_CUT_BUFFER0, false); 2864 selection_paste (display->root, XA_CUT_BUFFER0, false);
2904} 2865}
2905 2866
2906int 2867int
2907rxvt_term::selection_request_other (Atom target, int selnum) 2868rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2908{ 2869{
2909 Atom sel; 2870 Atom sel;
2910#ifdef DEBUG_SELECT
2911 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2912#endif
2913 2871
2914 selection_type |= selnum; 2872 selection_type |= selnum;
2915 2873
2916 if (selnum == Sel_Primary) 2874 if (selnum == Sel_Primary)
2917 sel = XA_PRIMARY; 2875 sel = XA_PRIMARY;
… …
2921 sel = xa[XA_CLIPBOARD]; 2879 sel = xa[XA_CLIPBOARD];
2922 2880
2923 if (XGetSelectionOwner (display->display, sel) != None) 2881 if (XGetSelectionOwner (display->display, sel) != None)
2924 { 2882 {
2925 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2883 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2926 TermWin.vt, selection_request_time); 2884 vt, selection_request_time);
2927 return 1; 2885 return 1;
2928 } 2886 }
2929 2887
2930 return 0; 2888 return 0;
2931} 2889}
… …
2934/* 2892/*
2935 * Clear all selected text 2893 * Clear all selected text
2936 * EXT: SelectionClear 2894 * EXT: SelectionClear
2937 */ 2895 */
2938void 2896void
2939rxvt_term::selection_clear () 2897rxvt_term::selection_clear () NOTHROW
2940{ 2898{
2941 want_refresh = 1; 2899 want_refresh = 1;
2942 free (selection.text); 2900 free (selection.text);
2943 selection.text = NULL; 2901 selection.text = NULL;
2944 selection.len = 0; 2902 selection.len = 0;
… …
2954 * EXT: button 1 or 3 release 2912 * EXT: button 1 or 3 release
2955 */ 2913 */
2956void 2914void
2957rxvt_term::selection_make (Time tm) 2915rxvt_term::selection_make (Time tm)
2958{ 2916{
2959 int i, col, end_col, row, end_row; 2917 int i;
2960 wchar_t *new_selection_text; 2918 wchar_t *new_selection_text;
2961 text_t *t; 2919 text_t *t;
2962 2920
2963 switch (selection.op) 2921 switch (selection.op)
2964 { 2922 {
… …
2977 selection.op = SELECTION_DONE; 2935 selection.op = SELECTION_DONE;
2978 2936
2979 if (selection.clicks == 4) 2937 if (selection.clicks == 4)
2980 return; /* nothing selected, go away */ 2938 return; /* nothing selected, go away */
2981 2939
2940 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2941 return;
2942
2982 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2943 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2983 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2944 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2984 2945
2985 col = selection.beg.col;
2986 row = selection.beg.row + TermWin.saveLines;
2987 end_row = selection.end.row + TermWin.saveLines;
2988 int ofs = 0; 2946 int ofs = 0;
2989 int extra = 0; 2947 int extra = 0;
2990 2948
2949 int col = selection.beg.col;
2950 int row = selection.beg.row;
2951
2952 int end_col;
2953
2991 for (; row <= end_row; row++, col = 0) 2954 for (; row <= selection.end.row; row++, col = 0)
2992 { 2955 {
2993 end_col = screen.tlen[row];
2994
2995#if ENABLE_FRILLS 2956#if ENABLE_FRILLS
2996 if (selection.rect) 2957 if (selection.rect)
2997 { 2958 {
2998 col = selection.beg.col; 2959 col = selection.beg.col;
2999 end_col = TermWin.ncol + 1; 2960 end_col = ncol + 1;
2961 }
2962 else
2963#endif
2964 end_col = ROW(row).l;
2965
2966 col = max (col, 0);
2967
2968 if (row == selection.end.row
2969#if ENABLE_FRILLS
2970 || selection.rect
2971#endif
3000 } 2972 )
3001#endif
3002
3003 MAX_IT (col, 0);
3004
3005 if (end_col == -1)
3006 end_col = TermWin.ncol;
3007
3008 if (row == end_row || selection.rect)
3009 MIN_IT (end_col, selection.end.col); 2973 min_it (end_col, selection.end.col);
3010 2974
3011 t = &screen.text[row][col]; 2975 t = ROW(row).t + col;
2976
3012 for (; col < end_col; col++) 2977 for (; col < end_col; col++)
3013 { 2978 {
3014 if (*t == NOCHAR) 2979 if (*t == NOCHAR)
3015 t++; 2980 t++;
3016#if ENABLE_COMBINING 2981#if ENABLE_COMBINING
… …
3032#endif 2997#endif
3033 else 2998 else
3034 new_selection_text[ofs++] = *t++; 2999 new_selection_text[ofs++] = *t++;
3035 } 3000 }
3036 3001
3037 if (screen.tlen[row] != -1 && row != end_row) 3002#if ENABLE_FRILLS
3003 if (selection.rect)
3004 {
3005 while (ofs
3006 && new_selection_text[ofs - 1] != C0_LF
3007 && unicode::is_space (new_selection_text[ofs - 1]))
3008 --ofs;
3009
3038 new_selection_text[ofs++] = C0_LF; 3010 new_selection_text[ofs++] = C0_LF;
3011 }
3012 else
3013#endif
3014 if (!ROW(row).is_longer () && row != selection.end.row)
3015 new_selection_text[ofs++] = C0_LF;
3039 } 3016 }
3040 3017
3041 if (end_col != selection.end.col) 3018 if (end_col != selection.end.col)
3042 new_selection_text[ofs++] = C0_LF; 3019 new_selection_text[ofs++] = C0_LF;
3043 3020
… …
3053 3030
3054 // we usually allocate much more than necessary, so realloc it smaller again 3031 // we usually allocate much more than necessary, so realloc it smaller again
3055 selection.len = ofs; 3032 selection.len = ofs;
3056 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3033 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3057 3034
3035 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3036 return;
3037
3038 selection_grab (tm);
3039}
3040
3041bool
3042rxvt_term::selection_grab (Time tm) NOTHROW
3043{
3044 selection_time = tm;
3045
3058 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3046 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3059 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3047 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3048 {
3060 display->set_selection_owner (this); 3049 display->set_selection_owner (this);
3050 return true;
3051 }
3061 else 3052 else
3062 rxvt_warn ("can't get primary selection, ignoring.\n"); 3053 {
3054 selection_clear ();
3055 return false;
3056 }
3063 3057
3064#if 0 3058#if 0
3065 XTextProperty ct; 3059 XTextProperty ct;
3066 3060
3067 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3061 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3068 { 3062 {
3069 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3070 XFree (ct.value); 3064 XFree (ct.value);
3071 } 3065 }
3072#endif 3066#endif
3073
3074 selection_time = tm;
3075} 3067}
3076 3068
3077/* ------------------------------------------------------------------------- */ 3069/* ------------------------------------------------------------------------- */
3078/* 3070/*
3079 * Mark or select text based upon number of clicks: 1, 2, or 3 3071 * Mark or select text based upon number of clicks: 1, 2, or 3
3080 * EXT: button 1 press 3072 * EXT: button 1 press
3081 */ 3073 */
3082void 3074void
3083rxvt_term::selection_click (int clicks, int x, int y) 3075rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3084{ 3076{
3085 clicks = ((clicks - 1) % 3) + 1; 3077 clicks = ((clicks - 1) % 3) + 1;
3086 selection.clicks = clicks; /* save clicks so extend will work */ 3078 selection.clicks = clicks; /* save clicks so extend will work */
3087 3079
3080 if (clicks == 2 && !selection.rect
3081 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3082 {
3083 MEvent.clicks = 1; // what a mess
3084 selection.screen = current_screen;
3085 selection.op = SELECTION_CONT;
3086 return;
3087 }
3088
3088 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3089 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3089 3090
3090 if (clicks == 2 || clicks == 3) 3091 if (clicks == 2 || clicks == 3)
3091 selection_extend_colrow (selection.mark.col, 3092 selection_extend_colrow (selection.mark.col,
3092 selection.mark.row + TermWin.view_start, 3093 selection.mark.row - view_start,
3093 0, /* button 3 */ 3094 0, /* button 3 */
3094 1, /* button press */ 3095 1, /* button press */
3095 0); /* click change */ 3096 0); /* click change */
3096} 3097}
3097 3098
3098/* ------------------------------------------------------------------------- */ 3099/* ------------------------------------------------------------------------- */
3099/* 3100/*
3100 * Mark a selection at the specified col/row 3101 * Mark a selection at the specified col/row
3101 */ 3102 */
3102void 3103void
3103rxvt_term::selection_start_colrow (int col, int row) 3104rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3104{ 3105{
3105 want_refresh = 1; 3106 want_refresh = 1;
3107
3108 selection.mark.row = row + view_start;
3106 selection.mark.col = col; 3109 selection.mark.col = col;
3107 selection.mark.row = row - TermWin.view_start;
3108 3110
3109 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3111 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3110 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3112 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3111 MAX_IT (selection.mark.col, 0);
3112 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3113 3113
3114 while (selection.mark.col > 0 3114 while (selection.mark.col > 0
3115 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3115 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3116 --selection.mark.col; 3116 --selection.mark.col;
3117 3117
3118 if (selection.op) 3118 if (selection.op)
3119 { /* clear the old selection */ 3119 { /* clear the old selection */
3120 selection.beg.row = selection.end.row = selection.mark.row; 3120 selection.beg.row = selection.end.row = selection.mark.row;
… …
3135#define DELIMIT_TEXT(x) \ 3135#define DELIMIT_TEXT(x) \
3136 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3136 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3137#define DELIMIT_REND(x) 1 3137#define DELIMIT_REND(x) 1
3138 3138
3139void 3139void
3140rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3140rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3141{ 3141{
3142 int col, row, dirnadd, tcol, trow, w1, w2; 3142 int col, row, dirnadd, tcol, trow, w1, w2;
3143 row_col_t bound; 3143 row_col_t bound;
3144 text_t *stp; 3144 text_t *stp;
3145 rend_t *srp; 3145 rend_t *srp;
3146 3146
3147 if (dirn == UP) 3147 if (dirn == UP)
3148 { 3148 {
3149 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3149 bound.row = top_row - 1;
3150 bound.col = 0; 3150 bound.col = 0;
3151 dirnadd = -1; 3151 dirnadd = -1;
3152 } 3152 }
3153 else 3153 else
3154 { 3154 {
3155 bound.row = TermWin.saveLines + TermWin.nrow; 3155 bound.row = nrow;
3156 bound.col = TermWin.ncol - 1; 3156 bound.col = ncol - 1;
3157 dirnadd = 1; 3157 dirnadd = 1;
3158 } 3158 }
3159 3159
3160 row = mark->row + TermWin.saveLines; 3160 row = mark->row;
3161 col = mark->col; 3161 col = max (mark->col, 0);
3162 MAX_IT (col, 0); 3162
3163 /* find the edge of a word */ 3163 /* find the edge of a word */
3164 stp = &screen.text[row][col]; 3164 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3165 w1 = DELIMIT_TEXT (*stp); 3165 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3166
3167 srp = &screen.rend[row][col];
3168 w2 = DELIMIT_REND (*srp);
3169 3166
3170 for (;;) 3167 for (;;)
3171 { 3168 {
3172 for (; col != bound.col; col += dirnadd) 3169 for (; col != bound.col; col += dirnadd)
3173 { 3170 {
… …
3183 break; 3180 break;
3184 } 3181 }
3185 3182
3186 if ((col == bound.col) && (row != bound.row)) 3183 if ((col == bound.col) && (row != bound.row))
3187 { 3184 {
3188 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3185 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3189 { 3186 {
3190 trow = row + dirnadd; 3187 trow = row + dirnadd;
3191 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3188 tcol = dirn == UP ? ncol - 1 : 0;
3192 3189
3193 if (screen.text[trow] == NULL) 3190 if (!ROW(trow).t)
3194 break; 3191 break;
3195 3192
3196 stp = & (screen.text[trow][tcol]); 3193 stp = ROW(trow).t + tcol;
3197 srp = & (screen.rend[trow][tcol]); 3194 srp = ROW(trow).r + tcol;
3198 3195
3199 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3196 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3200 break; 3197 break;
3201 3198
3202 row = trow; 3199 row = trow;
… …
3205 } 3202 }
3206 } 3203 }
3207 break; 3204 break;
3208 } 3205 }
3209 3206
3210Old_Word_Selection_You_Die:
3211 if (dirn == DN) 3207 if (dirn == DN)
3212 col++; /* put us on one past the end */ 3208 col++; /* put us on one past the end */
3213 3209
3214 /* Poke the values back in */ 3210 /* Poke the values back in */
3215 ret->row = row - TermWin.saveLines; 3211 ret->row = row;
3216 ret->col = col; 3212 ret->col = col;
3217} 3213}
3218 3214
3219/* ------------------------------------------------------------------------- */ 3215/* ------------------------------------------------------------------------- */
3220/* 3216/*
… …
3223 * flag == 0 ==> button 1 3219 * flag == 0 ==> button 1
3224 * flag == 1 ==> button 3 press 3220 * flag == 1 ==> button 3 press
3225 * flag == 2 ==> button 3 motion 3221 * flag == 2 ==> button 3 motion
3226 */ 3222 */
3227void 3223void
3228rxvt_term::selection_extend (int x, int y, int flag) 3224rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3229{ 3225{
3230 int col, row; 3226 int col = clamp (Pixel2Col (x), 0, ncol);
3231 3227 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3232 col = Pixel2Col (x);
3233 row = Pixel2Row (y);
3234 MAX_IT (row, 0);
3235 MIN_IT (row, (int)TermWin.nrow - 1);
3236 MAX_IT (col, 0);
3237 MIN_IT (col, (int)TermWin.ncol);
3238 3228
3239 /* 3229 /*
3240 * If we're selecting characters (single click) then we must check first 3230 * If we're selecting characters (single click) then we must check first
3241 * if we are at the same place as the original mark. If we are then 3231 * if we are at the same place as the original mark. If we are then
3242 * select nothing. Otherwise, if we're to the right of the mark, you have to 3232 * select nothing. Otherwise, if we're to the right of the mark, you have to
3243 * be _past_ a character for it to be selected. 3233 * be _past_ a character for it to be selected.
3244 */ 3234 */
3245 if (((selection.clicks % 3) == 1) && !flag 3235 if (((selection.clicks % 3) == 1) && !flag
3246 && (col == selection.mark.col 3236 && (col == selection.mark.col
3247 && (row == selection.mark.row + TermWin.view_start))) 3237 && (row == selection.mark.row - view_start)))
3248 { 3238 {
3249 /* select nothing */ 3239 /* select nothing */
3250 selection.beg.row = selection.end.row = 0; 3240 selection.beg.row = selection.end.row = 0;
3251 selection.beg.col = selection.end.col = 0; 3241 selection.beg.col = selection.end.col = 0;
3252 selection.clicks = 4; 3242 selection.clicks = 4;
… …
3265/* ------------------------------------------------------------------------- */ 3255/* ------------------------------------------------------------------------- */
3266/* 3256/*
3267 * Extend the selection to the specified col/row 3257 * Extend the selection to the specified col/row
3268 */ 3258 */
3269void 3259void
3270rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3260rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3271{ 3261{
3272 int16_t ncol = TermWin.ncol;
3273 int end_col;
3274 row_col_t pos; 3262 row_col_t pos;
3275 enum { 3263 enum {
3276 LEFT, RIGHT 3264 LEFT, RIGHT
3277 } closeto = RIGHT; 3265 } closeto = RIGHT;
3278 3266
… …
3309 selection.beg.col = selection.end.col = selection.mark.col; 3297 selection.beg.col = selection.end.col = selection.mark.col;
3310 selection.beg.row = selection.end.row = selection.mark.row; 3298 selection.beg.row = selection.end.row = selection.mark.row;
3311 } 3299 }
3312 3300
3313 pos.col = col; 3301 pos.col = col;
3314 pos.row = row; 3302 pos.row = view_start + row;
3315
3316 pos.row -= TermWin.view_start; /* adjust for scroll */
3317 3303
3318 /* 3304 /*
3319 * This is mainly xterm style selection with a couple of differences, mainly 3305 * This is mainly xterm style selection with a couple of differences, mainly
3320 * in the way button3 drag extension works. 3306 * in the way button3 drag extension works.
3321 * We're either doing: button1 drag; button3 press; or button3 drag 3307 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3380 } 3366 }
3381 } 3367 }
3382 3368
3383 if (selection.clicks == 1) 3369 if (selection.clicks == 1)
3384 { 3370 {
3385 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3371 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3386 3372 && !ROW(selection.beg.row).is_longer ()
3387 if (selection.beg.col > end_col
3388 && end_col != -1
3389#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3390 && !selection.rect 3374 && !selection.rect
3391#endif 3375#endif
3392 ) 3376 )
3393 selection.beg.col = ncol; 3377 selection.beg.col = ncol;
3394 3378
3395 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3396
3397 if ( 3379 if (
3398 selection.end.col > end_col 3380 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3399 && end_col != -1 3381 && !ROW(selection.end.row).is_longer ()
3400#if ENABLE_FRILLS 3382#if ENABLE_FRILLS
3401 && !selection.rect 3383 && !selection.rect
3402#endif 3384#endif
3403 ) 3385 )
3404 selection.end.col = ncol; 3386 selection.end.col = ncol;
… …
3412 selection_delimit_word (DN, &selection.end, &selection.end); 3394 selection_delimit_word (DN, &selection.end, &selection.end);
3413 } 3395 }
3414 else if (selection.clicks == 3) 3396 else if (selection.clicks == 3)
3415 { 3397 {
3416#if ENABLE_FRILLS 3398#if ENABLE_FRILLS
3417 if ((options & Opt_tripleclickwords)) 3399 if (OPTION (Opt_tripleclickwords))
3418 { 3400 {
3419 int end_row;
3420
3421 selection_delimit_word (UP, &selection.beg, &selection.beg); 3401 selection_delimit_word (UP, &selection.beg, &selection.beg);
3422 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3423 3402
3424 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3403 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3425 { 3404 {
3426 end_col = screen.tlen[end_row + TermWin.saveLines]; 3405 if (!ROW(end_row).is_longer ())
3427
3428 if (end_col != -1)
3429 { 3406 {
3430 selection.end.row = end_row; 3407 selection.end.row = end_row;
3431 selection.end.col = end_col; 3408 selection.end.col = ROW(end_row).l;
3432 selection_remove_trailing_spaces (); 3409 selection_remove_trailing_spaces ();
3433 break; 3410 break;
3434 } 3411 }
3435 } 3412 }
3436 } 3413 }
… …
3440 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3417 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3441 selection.mark.col++; 3418 selection.mark.col++;
3442 3419
3443 selection.beg.col = 0; 3420 selection.beg.col = 0;
3444 selection.end.col = ncol; 3421 selection.end.col = ncol;
3422
3423 // select a complete logical line
3424 while (selection.beg.row > -saveLines
3425 && ROW(selection.beg.row - 1).is_longer ())
3426 selection.beg.row--;
3427
3428 while (selection.end.row < nrow
3429 && ROW(selection.end.row).is_longer ())
3430 selection.end.row++;
3445 } 3431 }
3446 } 3432 }
3447 3433
3448 if (button3 && buttonpress) 3434 if (button3 && buttonpress)
3449 { /* mark may need to be changed */ 3435 { /* mark may need to be changed */
… …
3459 } 3445 }
3460 } 3446 }
3461 3447
3462#if ENABLE_FRILLS 3448#if ENABLE_FRILLS
3463 if (selection.rect && selection.beg.col > selection.end.col) 3449 if (selection.rect && selection.beg.col > selection.end.col)
3464 SWAP_IT (selection.beg.col, selection.end.col, int); 3450 ::swap (selection.beg.col, selection.end.col);
3465#endif 3451#endif
3466} 3452}
3467 3453
3468#if ENABLE_FRILLS 3454#if ENABLE_FRILLS
3469void 3455void
3470rxvt_term::selection_remove_trailing_spaces () 3456rxvt_term::selection_remove_trailing_spaces () NOTHROW
3471{ 3457{
3472 int32_t end_col, end_row; 3458 int32_t end_col, end_row;
3473 text_t *stp; 3459 text_t *stp;
3474 3460
3475 end_col = selection.end.col; 3461 end_col = selection.end.col;
3476 end_row = selection.end.row; 3462 end_row = selection.end.row;
3477 3463
3478 for ( ; end_row >= selection.beg.row; ) 3464 for (; end_row >= selection.beg.row; )
3479 { 3465 {
3480 stp = screen.text[end_row + TermWin.saveLines]; 3466 stp = ROW(end_row).t;
3481 3467
3482 while (--end_col >= 0) 3468 while (--end_col >= 0)
3483 { 3469 {
3484 if (stp[end_col] != ' ' 3470 if (stp[end_col] != NOCHAR
3485 && stp[end_col] != '\t' 3471 && !unicode::is_space (stp[end_col]))
3486 && stp[end_col] != NOCHAR)
3487 break; 3472 break;
3488 } 3473 }
3489 3474
3490 if (end_col >= 0 3475 if (end_col >= 0
3491 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3476 || !ROW(end_row - 1).is_longer ())
3492 { 3477 {
3493 selection.end.col = end_col + 1; 3478 selection.end.col = end_col + 1;
3494 selection.end.row = end_row; 3479 selection.end.row = end_row;
3495 break; 3480 break;
3496 } 3481 }
3497 3482
3498 end_row--; 3483 end_row--;
3499 end_col = TermWin.ncol; 3484 end_col = ncol;
3500 } 3485 }
3501 3486
3502 if (selection.mark.row > selection.end.row) 3487 if (selection.mark.row > selection.end.row)
3503 { 3488 {
3504 selection.mark.row = selection.end.row; 3489 selection.mark.row = selection.end.row;
… …
3514/* 3499/*
3515 * Double click on button 3 when already selected 3500 * Double click on button 3 when already selected
3516 * EXT: button 3 double click 3501 * EXT: button 3 double click
3517 */ 3502 */
3518void 3503void
3519rxvt_term::selection_rotate (int x, int y) 3504rxvt_term::selection_rotate (int x, int y) NOTHROW
3520{ 3505{
3521 selection.clicks = selection.clicks % 3 + 1; 3506 selection.clicks = selection.clicks % 3 + 1;
3522 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3507 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3523} 3508}
3524 3509
… …
3526/* 3511/*
3527 * Respond to a request for our current selection 3512 * Respond to a request for our current selection
3528 * EXT: SelectionRequest 3513 * EXT: SelectionRequest
3529 */ 3514 */
3530void 3515void
3531rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3516rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3532{ 3517{
3533 XSelectionEvent ev; 3518 XSelectionEvent ev;
3519 dDisp;
3534 3520
3535 ev.type = SelectionNotify; 3521 ev.type = SelectionNotify;
3536 ev.property = None; 3522 ev.property = None;
3537 ev.display = rq.display; 3523 ev.display = rq.display;
3538 ev.requestor = rq.requestor; 3524 ev.requestor = rq.requestor;
… …
3552 *target++ = xa[XA_COMPOUND_TEXT]; 3538 *target++ = xa[XA_COMPOUND_TEXT];
3553#if X_HAVE_UTF8_STRING 3539#if X_HAVE_UTF8_STRING
3554 *target++ = xa[XA_UTF8_STRING]; 3540 *target++ = xa[XA_UTF8_STRING];
3555#endif 3541#endif
3556 3542
3557 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3543 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3558 32, PropModeReplace, 3544 32, PropModeReplace,
3559 (unsigned char *)target_list, target - target_list); 3545 (unsigned char *)target_list, target - target_list);
3560 ev.property = rq.property; 3546 ev.property = rq.property;
3561 } 3547 }
3562#if TODO // TODO 3548#if TODO // TODO
… …
3565 /* TODO: Handle MULTIPLE */ 3551 /* TODO: Handle MULTIPLE */
3566 } 3552 }
3567#endif 3553#endif
3568 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3554 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3569 { 3555 {
3570 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3556 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3571 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3557 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3572 ev.property = rq.property; 3558 ev.property = rq.property;
3573 } 3559 }
3574 else if (rq.target == XA_STRING 3560 else if (rq.target == XA_STRING
3575 || rq.target == xa[XA_TEXT] 3561 || rq.target == xa[XA_TEXT]
… …
3633 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3619 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3634 ct.nitems = strlen ((char *)ct.value); 3620 ct.nitems = strlen ((char *)ct.value);
3635 } 3621 }
3636 else 3622 else
3637#endif 3623#endif
3638 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3624 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3639 freect = 1; 3625 freect = 1;
3640 else 3626 else
3641 { 3627 {
3642 /* if we failed to convert then send it raw */ 3628 /* if we failed to convert then send it raw */
3643 ct.value = (unsigned char *)cl; 3629 ct.value = (unsigned char *)cl;
3644 ct.nitems = selectlen; 3630 ct.nitems = selectlen;
3645 ct.encoding = target; 3631 ct.encoding = target;
3646 } 3632 }
3647 3633
3648 XChangeProperty (display->display, rq.requestor, rq.property, 3634 XChangeProperty (disp, rq.requestor, rq.property,
3649 ct.encoding, 8, PropModeReplace, 3635 ct.encoding, 8, PropModeReplace,
3650 ct.value, (int)ct.nitems); 3636 ct.value, (int)ct.nitems);
3651 ev.property = rq.property; 3637 ev.property = rq.property;
3652 3638
3653 if (freect) 3639 if (freect)
3654 XFree (ct.value); 3640 XFree (ct.value);
3655 } 3641 }
3656 3642
3657 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3643 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3658} 3644}
3659 3645
3660/* ------------------------------------------------------------------------- * 3646/* ------------------------------------------------------------------------- *
3661 * MOUSE ROUTINES * 3647 * MOUSE ROUTINES *
3662 * ------------------------------------------------------------------------- */ 3648 * ------------------------------------------------------------------------- */
3663 3649
3664/* 3650/*
3665 * return col/row values corresponding to x/y pixel values 3651 * return col/row values corresponding to x/y pixel values
3666 */ 3652 */
3667void 3653void
3668rxvt_term::pixel_position (int *x, int *y) 3654rxvt_term::pixel_position (int *x, int *y) NOTHROW
3669{ 3655{
3670 *x = Pixel2Col (*x); 3656 *x = Pixel2Col (*x);
3671 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3657 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3672 *y = Pixel2Row (*y); 3658 *y = Pixel2Row (*y);
3673 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3659 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3674} 3660}
3675 3661
3676/* ------------------------------------------------------------------------- */ 3662/* ------------------------------------------------------------------------- */
3677#ifdef USE_XIM 3663#ifdef USE_XIM
3678void 3664void
3679rxvt_term::im_set_position (XPoint &pos) 3665rxvt_term::im_set_position (XPoint &pos) NOTHROW
3680{ 3666{
3681 XWindowAttributes xwa; 3667 XWindowAttributes xwa;
3682 3668
3683 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3669 XGetWindowAttributes (display->display, vt, &xwa);
3684 3670
3685 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3671 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3686 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3672 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3687} 3673}
3688#endif 3674#endif
3689 3675
3690#if ENABLE_OVERLAY 3676#if ENABLE_OVERLAY
3691void 3677void
3692rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3678rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3693{ 3679{
3694 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3680 if (nrow < 1 || ncol < 1)
3695 return; 3681 return;
3696 3682
3697 want_refresh = 1; 3683 want_refresh = 1;
3698 3684
3699 scr_overlay_off (); 3685 scr_overlay_off ();
3700 3686
3701 if (x < 0) x = TermWin.ncol - w; 3687 if (x < 0) x = ncol - w;
3702 if (y < 0) y = TermWin.nrow - h; 3688 if (y < 0) y = nrow - h;
3703 3689
3704 // make space for border 3690 // make space for border
3705 w += 2; MIN_IT (w, TermWin.ncol); 3691 w += 2; min_it (w, ncol);
3706 h += 2; MIN_IT (h, TermWin.nrow); 3692 h += 2; min_it (h, nrow);
3707 3693
3708 x -= 1; MAX_IT (x, 0); 3694 x -= 1; clamp_it (x, 0, ncol - w);
3709 y -= 1; MAX_IT (y, 0); 3695 y -= 1; clamp_it (y, 0, nrow - h);
3710
3711 MIN_IT (x, TermWin.ncol - w);
3712 MIN_IT (y, TermWin.nrow - h);
3713 3696
3714 ov_x = x; ov_y = y; 3697 ov_x = x; ov_y = y;
3715 ov_w = w; ov_h = h; 3698 ov_w = w; ov_h = h;
3716 3699
3717 ov_text = new text_t *[h]; 3700 ov_text = new text_t *[h];
… …
3745 *rp = r; 3728 *rp = r;
3746 } 3729 }
3747} 3730}
3748 3731
3749void 3732void
3750rxvt_term::scr_overlay_off () 3733rxvt_term::scr_overlay_off () NOTHROW
3751{ 3734{
3752 if (!ov_text) 3735 if (!ov_text)
3753 return; 3736 return;
3754 3737
3755 want_refresh = 1; 3738 want_refresh = 1;
… …
3763 delete [] ov_text; ov_text = 0; 3746 delete [] ov_text; ov_text = 0;
3764 delete [] ov_rend; ov_rend = 0; 3747 delete [] ov_rend; ov_rend = 0;
3765} 3748}
3766 3749
3767void 3750void
3768rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3751rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3769{ 3752{
3770 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3753 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3771 return; 3754 return;
3772 3755
3773 x++, y++; 3756 x++, y++;
… …
3775 ov_text[y][x] = text; 3758 ov_text[y][x] = text;
3776 ov_rend[y][x] = rend; 3759 ov_rend[y][x] = rend;
3777} 3760}
3778 3761
3779void 3762void
3780rxvt_term::scr_overlay_set (int x, int y, const char *s) 3763rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3781{ 3764{
3782 while (*s) 3765 while (*s)
3783 scr_overlay_set (x++, y, *s++); 3766 scr_overlay_set (x++, y, *s++);
3784} 3767}
3785 3768
3786void 3769void
3770rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3771{
3772 while (*s)
3773 {
3774 text_t t = *s++;
3775 int width = WCWIDTH (t);
3776
3777 while (width--)
3778 {
3779 scr_overlay_set (x++, y, t);
3780 t = NOCHAR;
3781 }
3782 }
3783}
3784
3785void
3787rxvt_term::scr_swap_overlay () 3786rxvt_term::scr_swap_overlay () NOTHROW
3788{ 3787{
3789 if (!ov_text) 3788 if (!ov_text)
3790 return; 3789 return;
3791 3790
3792 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3793
3794 // swap screen mem with overlay 3791 // swap screen mem with overlay
3795 for (int y = ov_h; y--; ) 3792 for (int y = ov_h; y--; )
3796 { 3793 {
3797 text_t *t1 = ov_text[y]; 3794 text_t *t1 = ov_text[y];
3798 rend_t *r1 = ov_rend[y]; 3795 rend_t *r1 = ov_rend[y];
3799 3796
3800 text_t *t2 = screen.text[y + row_offset] + ov_x; 3797 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3801 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3798 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3802 3799
3803 for (int x = ov_w; x--; ) 3800 for (int x = ov_w; x--; )
3804 { 3801 {
3805 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3802 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3806 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3803 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3808 } 3805 }
3809} 3806}
3810 3807
3811#endif 3808#endif
3812/* ------------------------------------------------------------------------- */ 3809/* ------------------------------------------------------------------------- */
3810

Diff Legend

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