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

Diff Legend

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