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

Diff Legend

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