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.158 by root, Sat Feb 19 19:37:34 2005 UTC vs.
Revision 1.219 by root, Mon Jan 9 23:00:07 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 { 620 {
670 nscrolled = (long)TermWin.nscrolled + (long)count; 621 nsaved = min (nsaved + count, saveLines);
671 622
672 if (nscrolled > (long)TermWin.saveLines) 623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
673 TermWin.nscrolled = TermWin.saveLines;
674 else 624
675 TermWin.nscrolled = (unsigned int)nscrolled; 625 term_start = (term_start + count) % total_rows;
676 626
627 if (selection.op && current_screen == selection.screen)
628 {
629 selection.beg.row -= count;
630 selection.end.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;
639 }
640 }
641
642 for (int i = count; i--; )
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);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
677 if ((options & Opt_scrollWithBuffer) 654 if (OPTION (Opt_scrollWithBuffer)
678 && TermWin.view_start != 0 655 && view_start != 0
679 && TermWin.view_start != TermWin.saveLines) 656 && view_start != saveLines)
680 scr_page (UP, count); 657 scr_page (UP, count);
681 } 658 }
682 else if (!spec) 659 else
683 row1 += TermWin.saveLines; 660 {
684
685 row2 += TermWin.saveLines;
686
687 if (selection.op && current_screen == selection.screen) 661 if (selection.op && current_screen == selection.screen)
688 { 662 {
689 i = selection.beg.row + TermWin.saveLines; 663 if ((selection.beg.row < row1 && selection.end.row > row1)
690 j = selection.end.row + TermWin.saveLines; 664 || (selection.beg.row < row2 && selection.end.row > row2)
691 if ((i < row1 && j > row1) 665 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
692 || (i < row2 && j > row2) 666 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
693 || (i - count < row1 && i >= row1) 667 || (selection.end.row - count < row1 && selection.end.row >= row1)
694 || (i - count > row2 && i <= row2) 668 || (selection.end.row - count > row2 && selection.end.row <= row2))
695 || (j - count < row1 && j >= row1)
696 || (j - count > row2 && j <= row2))
697 { 669 {
698 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
700 } 672 }
701 else if (j >= row1 && j <= row2) 673 else if (selection.end.row >= row1 && selection.end.row <= row2)
702 { 674 {
703 /* move selected region too */ 675 /* move selected region too */
704 selection.beg.row -= count; 676 selection.beg.row -= count;
705 selection.end.row -= count; 677 selection.end.row -= count;
706 selection.mark.row -= count; 678 selection.mark.row -= count;
679
680 selection_check (0);
707 } 681 }
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 /* A: scroll up */
724
725 /* A1: 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 /* A2: 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 /* B: scroll down */
740
741 /* B1: Copy lines that will get clobbered by the rotation */
742 for (i = 0, j = row2; i < count; i++, j--)
743 { 682 }
744 buf_text[i] = screen.text[j]; 683
745 buf_rend[i] = screen.rend[j]; 684 // use a simple and robust scrolling algorithm, this
685 // part of scr_scroll_text is not time-critical.
686
687 int rows = row2 - row1 + 1;
688
689 min_it (count, rows);
690
691 line_t *temp_buf = row_buf + total_rows;
692
693 for (int row = 0; row < rows; row++)
746 } 694 {
695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
747 696
748 /* B2: Rotate lines */ 697 if (!IN_RANGE_EXC (row + count, 0, rows))
749 for (j = row2, i = j - count; i >= row1; i--, j--) 698 scr_blank_screen_mem (temp_buf [row], rstyle);
750 { 699 }
751 screen.tlen[j] = screen.tlen[i];
752 screen.text[j] = screen.text[i];
753 screen.rend[j] = screen.rend[i];
754 }
755 700
756 j = row1, i = count; 701 for (int row = 0; row < rows; row++)
757 count = -count; 702 ROW(row1 + row) = temp_buf [row];
758 } 703 }
759
760 /* C: Resurrect lines */
761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
764 if (!spec) /* line length may not equal TermWin.ncol */
765 for (; i--; j++)
766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
767 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}
1320
1321#if ENABLE_FRILLS
1322void
1323rxvt_term::scr_erase_savelines ()
1324{
1325 want_refresh = 1;
1326 ZERO_SCROLLBACK ();
1327
1328 nsaved = 0;
1329}
1330#endif
1394 1331
1395/* ------------------------------------------------------------------------- */ 1332/* ------------------------------------------------------------------------- */
1396/* 1333/*
1397 * Fill the screen with `E's 1334 * Fill the screen with `E's
1398 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1399 */ 1336 */
1400void 1337void
1401rxvt_term::scr_E () 1338rxvt_term::scr_E ()
1402{ 1339{
1403 int i, j, k; 1340 rend_t fs;
1404 rend_t *r1, fs;
1405 1341
1406 want_refresh = 1; 1342 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1408 1344
1409 num_scr_allow = 0; 1345 num_scr_allow = 0;
1410 selection_check (3); 1346 selection_check (3);
1411 1347
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1348 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1349 for (int row = nrow; row--; )
1414 { 1350 {
1415 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1351 line_t &line = ROW(row);
1352
1416 fill_text (screen.text[k], 'E', TermWin.ncol); 1353 fill_text (line.t, 'E', ncol);
1417 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1354 rend_t *r1 = line.r;
1355
1356 for (int j = ncol; j--; )
1418 *r1++ = fs; 1357 *r1++ = fs;
1358
1359 line.is_longer (0);
1360 line.touch (ncol);
1419 } 1361 }
1420} 1362}
1421 1363
1422/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1423/* 1365/*
… …
1444 count = end; 1386 count = end;
1445 } 1387 }
1446 1388
1447 scr_do_wrap (); 1389 scr_do_wrap ();
1448 1390
1449 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1450} 1392}
1451 1393
1452/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
1453/* 1395/*
1454 * Insert/Delete <count> characters from the current position 1396 * Insert/Delete <count> characters from the current position
… …
1456void 1398void
1457rxvt_term::scr_insdel_chars (int count, int insdel) 1399rxvt_term::scr_insdel_chars (int count, int insdel)
1458{ 1400{
1459 int col, row; 1401 int col, row;
1460 rend_t tr; 1402 rend_t tr;
1461 text_t *stp;
1462 rend_t *srp;
1463 int16_t *slp;
1464 1403
1465 want_refresh = 1; 1404 want_refresh = 1;
1466 ZERO_SCROLLBACK (); 1405 ZERO_SCROLLBACK ();
1467 1406
1468 if (count <= 0) 1407 if (count <= 0)
1469 return; 1408 return;
1470 1409
1471 scr_do_wrap (); 1410 scr_do_wrap ();
1472 1411
1473 selection_check (1); 1412 selection_check (1);
1474 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1413 min_it (count, ncol - screen.cur.col);
1475 1414
1476 row = screen.cur.row + TermWin.saveLines;
1477
1478 stp = screen.text[row];
1479 srp = screen.rend[row]; 1415 row = screen.cur.row;
1480 slp = &screen.tlen[row]; 1416
1417 line_t *line = &ROW(row);
1418
1419 line->touch ();
1420 line->is_longer (0);
1481 1421
1482 switch (insdel) 1422 switch (insdel)
1483 { 1423 {
1484 case INSERT: 1424 case INSERT:
1485 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1486 { 1426 {
1487 stp[col] = stp[col - count]; 1427 line->t[col] = line->t[col - count];
1488 srp[col] = srp[col - count]; 1428 line->r[col] = line->r[col - count];
1489 } 1429 }
1490 1430
1491 if (*slp != -1) 1431 line->l = min (line->l + count, ncol);
1492 {
1493 *slp += count;
1494 MIN_IT (*slp, TermWin.ncol);
1495 }
1496 1432
1497 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1499 { 1435 {
1500 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
1501 || (selection.end.col + count >= TermWin.ncol)) 1437 || (selection.end.col + count >= ncol))
1502 CLEAR_SELECTION (); 1438 CLEAR_SELECTION ();
1503 else 1439 else
1504 { /* shift selection */ 1440 { /* shift selection */
1505 selection.beg.col += count; 1441 selection.beg.col += count;
1506 selection.mark.col += count; /* XXX: yes? */ 1442 selection.mark.col += count; /* XXX: yes? */
1507 selection.end.col += count; 1443 selection.end.col += count;
1508 } 1444 }
1509 } 1445 }
1510 1446
1511 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1447 scr_blank_line (*line, screen.cur.col, count, rstyle);
1512 (unsigned int)count, rstyle);
1513 break; 1448 break;
1514 1449
1515 case ERASE: 1450 case ERASE:
1516 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1451 screen.cur.col += count; /* don't worry if > ncol */
1517 selection_check (1); 1452 selection_check (1);
1518 screen.cur.col -= count; 1453 screen.cur.col -= count;
1519 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1454
1520 (unsigned int)count, rstyle); 1455 line->l = max (line->l - count, 0);
1456 scr_blank_line (*line, screen.cur.col, count, rstyle);
1521 break; 1457 break;
1522 1458
1523 case DELETE: 1459 case DELETE:
1524 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1525 1461
1526 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1462 for (col = screen.cur.col; (col + count) < ncol; col++)
1527 { 1463 {
1528 stp[col] = stp[col + count]; 1464 line->t[col] = line->t[col + count];
1529 srp[col] = srp[col + count]; 1465 line->r[col] = line->r[col + count];
1530 } 1466 }
1531 1467
1532 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1468 line->l = max (line->l - count, 0);
1533 (unsigned int)count, tr); 1469 scr_blank_line (*line, ncol - count, count, tr);
1534
1535 if (*slp == -1) /* break line continuation */
1536 *slp = TermWin.ncol;
1537
1538 *slp -= count;
1539 MAX_IT (*slp, 0);
1540 1470
1541 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1543 { 1473 {
1544 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1545 || (screen.cur.col >= selection.beg.col - count) 1475 || (screen.cur.col >= selection.beg.col - count)
1546 || selection.end.col >= TermWin.ncol) 1476 || selection.end.col >= ncol)
1547 CLEAR_SELECTION (); 1477 CLEAR_SELECTION ();
1548 else 1478 else
1549 { 1479 {
1550 /* shift selection */ 1480 /* shift selection */
1551 selection.beg.col -= count; 1481 selection.beg.col -= count;
… …
1564 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1565 */ 1495 */
1566void 1496void
1567rxvt_term::scr_scroll_region (int top, int bot) 1497rxvt_term::scr_scroll_region (int top, int bot)
1568{ 1498{
1569 MAX_IT (top, 0); 1499 max_it (top, 0);
1570 MIN_IT (bot, (int)TermWin.nrow - 1); 1500 min_it (bot, nrow - 1);
1571 1501
1572 if (top > bot) 1502 if (top > bot)
1573 return; 1503 return;
1574 1504
1575 screen.tscroll = top; 1505 screen.tscroll = top;
… …
1654 */ 1584 */
1655void 1585void
1656rxvt_term::scr_set_tab (int mode) 1586rxvt_term::scr_set_tab (int mode)
1657{ 1587{
1658 if (mode < 0) 1588 if (mode < 0)
1659 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1589 memset (tabs, 0, ncol * sizeof (char));
1660 else if (screen.cur.col < TermWin.ncol) 1590 else if (screen.cur.col < ncol)
1661 tabs[screen.cur.col] = (mode ? 1 : 0); 1591 tabs [screen.cur.col] = !!mode;
1662} 1592}
1663 1593
1664/* ------------------------------------------------------------------------- */ 1594/* ------------------------------------------------------------------------- */
1665/* 1595/*
1666 * Set reverse/normal video 1596 * Set reverse/normal video
… …
1673 XGCValues gcvalue; 1603 XGCValues gcvalue;
1674 1604
1675 if (rvideo != mode) 1605 if (rvideo != mode)
1676 { 1606 {
1677 rvideo = mode; 1607 rvideo = mode;
1678 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1679#if XPM_BACKGROUND 1609#if XPM_BACKGROUND
1680 if (bgPixmap.pixmap == None) 1610 if (bgPixmap.pixmap == None)
1681#endif 1611#endif
1682#if TRANSPARENT 1612#if TRANSPARENT
1683 if (! (options & Opt_transparent) || am_transparent == 0) 1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1684#endif 1614#endif
1685 XSetWindowBackground (display->display, TermWin.vt, 1615 XSetWindowBackground (display->display, vt,
1686 pix_colors[Color_bg]); 1616 pix_colors[Color_bg]);
1687 1617
1688 gcvalue.foreground = pix_colors[Color_fg]; 1618 gcvalue.foreground = pix_colors[Color_fg];
1689 gcvalue.background = pix_colors[Color_bg]; 1619 gcvalue.background = pix_colors[Color_bg];
1690 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1620 XChangeGC (display->display, gc, GCBackground | GCForeground,
1691 &gcvalue); 1621 &gcvalue);
1692 scr_clear (); 1622 scr_clear ();
1693 scr_touch (true); 1623 scr_touch (true);
1694 } 1624 }
1695} 1625}
… …
1713 * Set font style 1643 * Set font style
1714 */ 1644 */
1715void 1645void
1716rxvt_term::set_font_style () 1646rxvt_term::set_font_style ()
1717{ 1647{
1648#if 0
1718 switch (charsets[screen.charset]) 1649 switch (charsets [screen.charset])
1719 { 1650 {
1720 case '0': /* DEC Special Character & Line Drawing Set */ 1651 case '0': /* DEC Special Character & Line Drawing Set */
1721 break; 1652 break;
1722 case 'A': /* United Kingdom (UK) */ 1653 case 'A': /* United Kingdom (UK) */
1723 break; 1654 break;
… …
1730 case 'C': /* Finnish character set */ 1661 case 'C': /* Finnish character set */
1731 break; 1662 break;
1732 case 'K': /* German character set */ 1663 case 'K': /* German character set */
1733 break; 1664 break;
1734 } 1665 }
1666#endif
1735} 1667}
1736 1668
1737/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1738/* 1670/*
1739 * Choose a font 1671 * Choose a font
… …
1776bool 1708bool
1777rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1778{ 1710{
1779 bool found = false; 1711 bool found = false;
1780 1712
1781 for (int i = 0; i < TermWin.nrow; i++) 1713 for (int i = 0; i < nrow; i++)
1782 { 1714 {
1783 int col = 0; 1715 int col = 0;
1784 rend_t *drp = drawn_rend [i]; 1716 rend_t *drp = drawn_buf[i].r;
1785 1717
1786 for (; col < TermWin.ncol; col++, drp++) 1718 for (; col < ncol; col++, drp++)
1787 if ((*drp & mask) == value) 1719 if ((*drp & mask) == value)
1788 { 1720 {
1789 found = true; 1721 found = true;
1790 *drp = ~value; 1722 *drp = ~value;
1791 } 1723 }
… …
1802 PART_END, 1734 PART_END,
1803 RC_COUNT 1735 RC_COUNT
1804}; 1736};
1805 1737
1806void 1738void
1807rxvt_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)
1808{ 1740{
1809 int i; 1741 int i;
1810 row_col_t rc[RC_COUNT]; 1742 row_col_t rc[RC_COUNT];
1811 1743
1812 if (drawn_text == NULL) /* sanity check */ 1744 if (!drawn_buf) /* sanity check */
1813 return; 1745 return;
1814 1746
1815#ifndef NO_SLOW_LINK_SUPPORT 1747#ifndef NO_SLOW_LINK_SUPPORT
1816 if (refresh_type == FAST_REFRESH && !display->is_local) 1748 if (refresh_type == FAST_REFRESH && !display->is_local)
1817 { 1749 {
1818 y = 0; 1750 y = 0;
1819 height = TermWin.height; 1751 eheight = height;
1820 } 1752 }
1821#endif
1822
1823#ifdef DEBUG_STRICT
1824 x = max (x, 0);
1825 x = min (x, (int)TermWin.width);
1826 y = max (y, 0);
1827 y = min (y, (int)TermWin.height);
1828#endif 1753#endif
1829 1754
1830 /* round down */ 1755 /* round down */
1831 rc[PART_BEG].col = Pixel2Col (x); 1756 rc[PART_BEG].col = Pixel2Col (x);
1832 rc[PART_BEG].row = Pixel2Row (y); 1757 rc[PART_BEG].row = Pixel2Row (y);
1833 /* round up */ 1758 /* round up */
1834 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1759 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1835 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1760 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1836 1761
1837 /* sanity checks */ 1762 /* sanity checks */
1838 for (i = PART_BEG; i < RC_COUNT; i++) 1763 for (i = PART_BEG; i < RC_COUNT; i++)
1839 { 1764 {
1840 MIN_IT (rc[i].col, TermWin.ncol - 1); 1765 min_it (rc[i].col, ncol - 1);
1841 MIN_IT (rc[i].row, TermWin.nrow - 1); 1766 min_it (rc[i].row, nrow - 1);
1842 } 1767 }
1843 1768
1844 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++)
1845 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);
1846 1771
1847 if (refresh) 1772 if (refresh)
1848 scr_refresh (SLOW_REFRESH); 1773 scr_refresh (SLOW_REFRESH);
1849} 1774}
1850 1775
… …
1853 * Refresh the entire screen 1778 * Refresh the entire screen
1854 */ 1779 */
1855void 1780void
1856rxvt_term::scr_touch (bool refresh) 1781rxvt_term::scr_touch (bool refresh)
1857{ 1782{
1858 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1783 scr_expose (0, 0, width, height, refresh);
1859} 1784}
1860 1785
1861/* ------------------------------------------------------------------------- */ 1786/* ------------------------------------------------------------------------- */
1862/* 1787/*
1863 * 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
… …
1867rxvt_term::scr_move_to (int y, int len) 1792rxvt_term::scr_move_to (int y, int len)
1868{ 1793{
1869 long p = 0; 1794 long p = 0;
1870 unsigned int oldviewstart; 1795 unsigned int oldviewstart;
1871 1796
1872 oldviewstart = TermWin.view_start; 1797 oldviewstart = view_start;
1873 1798
1874 if (y < len) 1799 if (y < len)
1875 { 1800 {
1876 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1801 p = (nrow + nsaved) * (len - y) / len;
1877 p -= (long) (TermWin.nrow - 1); 1802 p -= (long) (nrow - 1);
1878 p = max (p, 0); 1803 p = max (p, 0);
1879 } 1804 }
1880 1805
1881 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1806 view_start = (unsigned int)min (p, nsaved);
1882 1807
1883 return scr_changeview (oldviewstart); 1808 return scr_changeview (oldviewstart);
1884} 1809}
1885 1810
1886/* ------------------------------------------------------------------------- */ 1811/* ------------------------------------------------------------------------- */
… …
1892rxvt_term::scr_page (enum page_dirn direction, int nlines) 1817rxvt_term::scr_page (enum page_dirn direction, int nlines)
1893{ 1818{
1894 int n; 1819 int n;
1895 unsigned int oldviewstart; 1820 unsigned int oldviewstart;
1896 1821
1897 oldviewstart = TermWin.view_start; 1822 oldviewstart = view_start;
1898 1823
1899 if (direction == UP) 1824 if (direction == UP)
1900 { 1825 {
1901 n = TermWin.view_start + nlines; 1826 n = view_start + nlines;
1902 TermWin.view_start = min (n, TermWin.nscrolled); 1827 view_start = min (n, nsaved);
1903 } 1828 }
1904 else 1829 else
1905 { 1830 {
1906 n = TermWin.view_start - nlines; 1831 n = view_start - nlines;
1907 TermWin.view_start = max (n, 0); 1832 view_start = max (n, 0);
1908 } 1833 }
1909 1834
1910 return scr_changeview (oldviewstart); 1835 return scr_changeview (oldviewstart);
1911} 1836}
1912 1837
1913int 1838int
1914rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1915{ 1840{
1916 if (TermWin.view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1917 { 1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1918 want_refresh = 1; 1845 want_refresh = 1;
1919 num_scr -= (TermWin.view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1920 } 1847 }
1921 1848
1922 return (int) (TermWin.view_start - oldviewstart); 1849 return (int)view_start - (int)oldviewstart;
1923} 1850}
1924 1851
1925/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1926void 1853void
1927rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1928{ 1855{
1929#ifndef NO_BELL 1856#ifndef NO_BELL
1857
1930# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1931# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1932 if (options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1933# endif 1861# endif
1934 XMapWindow (display->display, TermWin.parent[0]); 1862 XMapWindow (display->display, parent[0]);
1935# endif 1863# endif
1936 if (options & Opt_visualBell) 1864
1865 if (OPTION (Opt_visualBell))
1937 { 1866 {
1938 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1869 rxvt_usleep (VISUAL_BELL_DURATION);
1939 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1940 } 1871 }
1941 else 1872 else
1942 XBell (display->display, 0); 1873 XBell (display->display, 0);
1874
1943#endif 1875#endif
1944} 1876}
1945 1877
1946/* ------------------------------------------------------------------------- */ 1878/* ------------------------------------------------------------------------- */
1947/* ARGSUSED */ 1879/* ARGSUSED */
1948void 1880void
1949rxvt_term::scr_printscreen (int fullhist) 1881rxvt_term::scr_printscreen (int fullhist)
1950{ 1882{
1951#ifdef PRINTPIPE 1883#ifdef PRINTPIPE
1952 int i, r1, nrows, row_offset; 1884 int nrows, row_start;
1953 FILE *fd; 1885 FILE *fd;
1954 1886
1955 if ((fd = popen_printer ()) == NULL) 1887 if ((fd = popen_printer ()) == NULL)
1956 return; 1888 return;
1957 1889
1958 nrows = TermWin.nrow;
1959 row_offset = TermWin.saveLines;
1960
1961 if (!fullhist) 1890 if (fullhist)
1962 row_offset -= TermWin.view_start; 1891 {
1892 nrows = nrow + nsaved;
1893 row_start = -nsaved;
1894 }
1963 else 1895 else
1964 { 1896 {
1965 nrows += TermWin.nscrolled; 1897 nrows = nrow;
1966 row_offset -= TermWin.nscrolled; 1898 row_start = -view_start;
1967 } 1899 }
1968 1900
1969 wctomb (0, 0); 1901 wctomb (0, 0);
1970 1902
1971 for (r1 = 0; r1 < nrows; r1++) 1903 for (int r1 = 0; r1 < nrows; r1++)
1972 { 1904 {
1973 text_t *tp = screen.text[r1 + row_offset]; 1905 text_t *tp = ROW(r1).t;
1974 int len = screen.tlen[r1 + row_offset]; 1906 int len = ROW(r1).l;
1975 1907
1976 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1908 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1977 { 1909 {
1978 char mb[MB_LEN_MAX]; 1910 char mb[MB_LEN_MAX];
1979 text_t t = *tp++; 1911 text_t t = *tp++;
1980 if (t == NOCHAR) 1912 if (t == NOCHAR)
1981 continue; 1913 continue;
… …
2002/* 1934/*
2003 * Refresh the screen 1935 * Refresh the screen
2004 * drawn_text/drawn_rend contain the screen information before the update. 1936 * drawn_text/drawn_rend contain the screen information before the update.
2005 * screen.text/screen.rend contain what the screen will change to. 1937 * screen.text/screen.rend contain what the screen will change to.
2006 */ 1938 */
2007
2008#define FONT_WIDTH(X, Y) \
2009 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2010#define FONT_RBEAR(X, Y) \
2011 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2012#define FONT_LBEAR(X, Y) \
2013 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2014#define IS_FONT_CHAR(X, Y) \
2015 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2016
2017void 1939void
2018rxvt_term::scr_refresh (unsigned char refresh_type) 1940rxvt_term::scr_refresh (unsigned char refresh_type)
2019{ 1941{
2020 unsigned char must_clear, /* use draw_string not draw_image_string */ 1942 unsigned char must_clear, /* use draw_string not draw_image_string */
2021 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
2022 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
2023 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
2024 int i, /* tmp */ 1946 int i; /* tmp */
2025 row_offset; /* basic offset in screen structure */
2026#ifndef NO_CURSORCOLOR 1947#ifndef NO_CURSORCOLOR
2027 rend_t cc1; /* store colours at cursor position (s) */ 1948 rend_t cc1; /* store colours at cursor position (s) */
2028#endif 1949#endif
2029 rend_t *crp; // cursor rendition pointer 1950 rend_t *crp; // cursor rendition pointer
2030 1951
2031 want_refresh = 0; /* screen is current */ 1952 want_refresh = 0; /* screen is current */
2032 1953
2033 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1954 if (refresh_type == NO_REFRESH || !mapped)
2034 return; 1955 return;
2035 1956
2036 /* 1957 /*
2037 * A: set up vars 1958 * A: set up vars
2038 */ 1959 */
2039 must_clear = 0; 1960 must_clear = 0;
2040 refresh_count = 0; 1961 refresh_count = 0;
2041 1962
2042 row_offset = TermWin.saveLines - TermWin.view_start;
2043
2044#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
2045 must_clear |= (bgPixmap.pixmap != None); 1964 must_clear |= bgPixmap.pixmap != None;
2046#endif 1965#endif
2047#if TRANSPARENT 1966#if TRANSPARENT
2048 must_clear |= ((options & Opt_transparent) && am_transparent); 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
2049#endif 1968#endif
2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2051 1970
2052 /* 1971 /*
2053 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
2070 1989
2071 if (showcursor) 1990 if (showcursor)
2072 { 1991 {
2073 int col = screen.cur.col; 1992 int col = screen.cur.col;
2074 1993
2075 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2076 col--; 1995 col--;
2077 1996
2078 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 1997 crp = &ROW(screen.cur.row).r[col];
2079 1998
2080 if (showcursor && TermWin.focus) 1999 if (showcursor && focus)
2081 { 2000 {
2001 if (OPTION (Opt_cursorUnderline))
2002 *crp ^= RS_Uline;
2003 else
2004 {
2082 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
2006
2083#ifndef NO_CURSORCOLOR 2007#ifndef NO_CURSORCOLOR
2084 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2085 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
2086 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
2087 else 2011 else
2088#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2089 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
2090#else 2014#else
2091 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
2092#endif 2016#endif
2093 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
2094 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
2095 else 2019 else
2096#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2097 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
2098#else 2022#else
2099 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
2100#endif 2024#endif
2101 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
2102 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
2103#endif 2027#endif
2028 }
2104 } 2029 }
2105 } 2030 }
2106 2031
2107 /* make sure no outline cursor is left around */ 2032 /* make sure no outline cursor is left around */
2108 setoldcursor = 0; 2033 setoldcursor = 0;
2109 if (ocrow != -1) 2034 if (ocrow != -1)
2110 { 2035 {
2111 if (screen.cur.row + TermWin.view_start != ocrow 2036 if (screen.cur.row + view_start != ocrow
2112 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2113 { 2038 {
2114 if (ocrow < TermWin.nrow 2039 if (ocrow < nrow
2115 && oldcursor.col < TermWin.ncol) 2040 && oldcursor.col < ncol)
2116 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2117 2042
2118 if (TermWin.focus || !showcursor) 2043 if (focus || !showcursor)
2119 oldcursor.row = -1; 2044 oldcursor.row = -1;
2120 else 2045 else
2121 setoldcursor = 1; 2046 setoldcursor = 1;
2122 } 2047 }
2123 } 2048 }
2124 else if (!TermWin.focus) 2049 else if (!focus)
2125 setoldcursor = 1; 2050 setoldcursor = 1;
2126 2051
2127 if (setoldcursor) 2052 if (setoldcursor)
2128 { 2053 {
2129 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2054 if (screen.cur.row + view_start >= nrow)
2130 oldcursor.row = -1; 2055 oldcursor.row = -1;
2131 else 2056 else
2132 { 2057 {
2133 oldcursor.row = screen.cur.row + TermWin.view_start; 2058 oldcursor.row = screen.cur.row + view_start;
2134 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2135 } 2060 }
2136 } 2061 }
2137 } 2062 }
2138 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2139#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2140 scr_swap_overlay (); 2066 scr_swap_overlay ();
2141#endif 2067#endif
2142
2143 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2144 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2145 2068
2146#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
2147 /* 2070 /*
2148 * D: CopyArea pass - very useful for slower links 2071 * D: CopyArea pass - very useful for slower links
2149 * This has been deliberately kept simple. 2072 * This has been deliberately kept simple.
2150 */ 2073 */
2151 i = num_scr; 2074 i = num_scr;
2152 if (!display->is_local 2075 if (!display->is_local
2153 && refresh_type == FAST_REFRESH && num_scr_allow && i 2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2154 && abs (i) < TermWin.nrow && !must_clear) 2077 && abs (num_scr) < nrow && !must_clear)
2155 { 2078 {
2156 int16_t nits; 2079 int16_t nits;
2157 int j; 2080 int j;
2158 int len, wlen; 2081 int len, wlen;
2159 2082
2160 j = TermWin.nrow; 2083 j = nrow;
2161 wlen = len = -1; 2084 wlen = len = -1;
2162 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2164 { 2087 {
2165 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2166 { 2089 {
2167 text_t *stp = screen.text[row + row_offset]; 2090 line_t s = ROW(row - view_start);
2168 rend_t *srp = screen.rend[row + row_offset];
2169 text_t *dtp = drawn_text[row]; 2091 line_t d = drawn_buf[row];
2170 text_t *dtp2 = drawn_text[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2171 rend_t *drp = drawn_rend[row];
2172 rend_t *drp2 = drawn_rend[row + i];
2173 2093
2174 for (nits = 0, col = TermWin.ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2175 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2176 nits--; 2096 nits--;
2177 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])
2178 nits++; 2098 nits++;
2179 2099
2180 if (nits > 8) /* XXX: arbitrary choice */ 2100 if (nits > 8) /* XXX: arbitrary choice */
2181 { 2101 {
2182 for (col = TermWin.ncol; col--; ) 2102 for (col = ncol; col--; )
2183 { 2103 {
2184 *dtp++ = *dtp2++; 2104 *d.t++ = *d2.t++;
2185 *drp++ = *drp2++; 2105 *d.r++ = *d2.r++;
2186 } 2106 }
2187 2107
2188 if (len == -1) 2108 if (len == -1)
2189 len = row; 2109 len = row;
2190 2110
… …
2195 2115
2196 if (len != -1) 2116 if (len != -1)
2197 { 2117 {
2198 /* also comes here at end if needed because of >= above */ 2118 /* also comes here at end if needed because of >= above */
2199 if (wlen < len) 2119 if (wlen < len)
2200 SWAP_IT (wlen, len, int); 2120 ::swap (wlen, len);
2201 2121
2202 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2122 XCopyArea (display->display, vt, vt,
2203 TermWin.gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2204 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2205 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2206 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2207 len = -1; 2127 len = -1;
2208 } 2128 }
2209 } 2129 }
… …
2211#endif 2131#endif
2212 2132
2213 /* 2133 /*
2214 * E: main pass across every character 2134 * E: main pass across every character
2215 */ 2135 */
2216 for (row = 0; row < TermWin.nrow; row++) 2136 for (row = 0; row < nrow; row++)
2217 { 2137 {
2218 text_t *stp = screen.text[row + row_offset]; 2138 text_t *stp = ROW(row - view_start).t;
2219 rend_t *srp = screen.rend[row + row_offset]; 2139 rend_t *srp = ROW(row - view_start).r;
2220 text_t *dtp = drawn_text[row]; 2140 text_t *dtp = drawn_buf[row].t;
2221 rend_t *drp = drawn_rend[row]; 2141 rend_t *drp = drawn_buf[row].r;
2222 2142
2223 /* 2143 /*
2224 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
2225 */ 2145 */
2226 int ypixel = (int)Row2Pixel (row); 2146 int ypixel = (int)Row2Pixel (row);
2227 2147
2228 for (col = 0; col < TermWin.ncol; col++) 2148 for (col = 0; col < ncol; col++)
2229 { 2149 {
2230 /* compare new text with old - if exactly the same then continue */ 2150 /* compare new text with old - if exactly the same then continue */
2231 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2151 if (stp[col] == dtp[col] /* Must match characters to skip. */
2232 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2152 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2233 || (stp[col] == ' ' /* space w/ no background change */ 2153 || (stp[col] == ' ' /* space w/ no background change */
… …
2247 dtp[col] = stp[col]; 2167 dtp[col] = stp[col];
2248 drp[col] = rend; 2168 drp[col] = rend;
2249 2169
2250 int xpixel = Col2Pixel (col); 2170 int xpixel = Col2Pixel (col);
2251 2171
2252 for (i = 0; ++col < TermWin.ncol; ) 2172 for (i = 0; ++col < ncol; )
2253 { 2173 {
2254 if (stp[col] == NOCHAR) 2174 if (stp[col] == NOCHAR)
2255 { 2175 {
2256 dtp[col] = stp[col]; 2176 dtp[col] = stp[col];
2257 drp[col] = rend; 2177 drp[col] = rend;
… …
2285 2205
2286 // sometimes we optimize away the trailing NOCHAR's, add them back 2206 // sometimes we optimize away the trailing NOCHAR's, add them back
2287 while (i && text[count] == NOCHAR) 2207 while (i && text[count] == NOCHAR)
2288 count++, i--; 2208 count++, i--;
2289 2209
2290#if ENABLE_STYLES
2291 // force redraw after "careful" characters to avoid pixel droppings
2292 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2293 drp[col + 1] = ~srp[col + 1];
2294
2295 // include previous careful character(s) if possible, looks nicer (best effort...)
2296 while (text > stp
2297 && srp[text - stp - 1] & RS_Careful
2298 && RS_SAME (rend, srp[text - stp - 1]))
2299 text--, count++, xpixel -= TermWin.fwidth;
2300#endif
2301
2302 /* 2210 /*
2303 * Determine the attributes for the string 2211 * Determine the attributes for the string
2304 */ 2212 */
2305 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2306 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2307 2215
2308 // 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
2309 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))
2310 { 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
2311 bool invert = rend & RS_RVid; 2231 bool invert = rend & RS_RVid;
2312 2232
2313#ifndef NO_BOLD_UNDERLINE_REVERSE 2233#ifndef NO_BOLD_UNDERLINE_REVERSE
2314 if (rend & RS_Bold 2234 if (rend & RS_Bold
2315 && fore == Color_fg) 2235 && fore == Color_fg)
… …
2337 fore = Color_UL; 2257 fore = Color_UL;
2338#endif 2258#endif
2339 2259
2340 if (invert) 2260 if (invert)
2341 { 2261 {
2342 SWAP_IT (fore, back, int); 2262 ::swap (fore, back);
2343 2263
2344#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2345 if (ISSET_PIXCOLOR (Color_RV)) 2265 if (ISSET_PIXCOLOR (Color_RV))
2346 back = Color_RV; 2266 back = Color_RV;
2267
2268 if (fore == back)
2269 {
2270 fore = Color_bg;
2271 back = Color_fg;
2272 }
2347#endif 2273#endif
2348 } 2274 }
2349 2275
2350#ifdef TEXT_BLINK 2276#ifdef TEXT_BLINK
2351 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2277 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2362 } 2288 }
2363 2289
2364 /* 2290 /*
2365 * Actually do the drawing of the string here 2291 * Actually do the drawing of the string here
2366 */ 2292 */
2367 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2293 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2368 2294
2369 if (back == fore) 2295 if (back == fore)
2370 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2296 font->clear_rect (*drawable, xpixel, ypixel,
2371 TermWin.fwidth * count, TermWin.fheight, 2297 fwidth * count, fheight,
2372 back); 2298 back);
2373 else if (back == Color_bg) 2299 else if (back == Color_bg)
2374 { 2300 {
2375 if (must_clear) 2301 if (must_clear)
2376 { 2302 {
2377 CLEAR_CHARS (xpixel, ypixel, count); 2303 CLEAR_CHARS (xpixel, ypixel, count);
2378 2304
2379 for (i = 0; i < count; i++) /* don't draw empty strings */ 2305 for (i = 0; i < count; i++) /* don't draw empty strings */
2380 if (text[i] != ' ') 2306 if (text[i] != ' ')
2381 { 2307 {
2382 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2308 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2383 break; 2309 break;
2384 } 2310 }
2385 } 2311 }
2386 else 2312 else
2387 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2313 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2388 } 2314 }
2389 else 2315 else
2390 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2391 2317
2392 if (rend & RS_Uline && font->descent > 1 && fore != back) 2318 if (rend & RS_Uline && font->descent > 1 && fore != back)
2393 { 2319 {
2394#if ENABLE_FRILLS 2320#if ENABLE_FRILLS
2395 if (ISSET_PIXCOLOR (Color_underline)) 2321 if (ISSET_PIXCOLOR (Color_underline))
2396 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2322 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2397 else 2323 else
2398#endif 2324#endif
2399 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2325 XSetForeground (display->display, gc, pix_colors[fore]);
2400 2326
2401 XDrawLine (display->display, drawBuffer, TermWin.gc, 2327 XDrawLine (display->display, drawBuffer, gc,
2402 xpixel, ypixel + font->ascent + 1, 2328 xpixel, ypixel + font->ascent + 1,
2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2404 } 2330 }
2405 } /* for (col....) */ 2331 } /* for (col....) */
2406 } /* for (row....) */ 2332 } /* for (row....) */
2407 2333
2408#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2409 scr_swap_overlay (); 2335 scr_swap_overlay ();
2410#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2411 2338
2412 /* 2339 /*
2413 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2414 */ 2341 */
2415 if (showcursor) 2342 if (showcursor)
2416 { 2343 {
2417 if (TermWin.focus) 2344 if (focus)
2345 {
2346 if (OPTION (Opt_cursorUnderline))
2347 *crp ^= RS_Uline;
2348 else
2418 { 2349 {
2419 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2420#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
2421 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2352 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2422#endif 2353#endif
2354 }
2423 } 2355 }
2424 else if (oldcursor.row >= 0) 2356 else if (oldcursor.row >= 0)
2425 { 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
2426#ifndef NO_CURSORCOLOR 2368#ifndef NO_CURSORCOLOR
2427 if (ISSET_PIXCOLOR (Color_cursor)) 2369 if (ISSET_PIXCOLOR (Color_cursor))
2428 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2429#endif 2371#endif
2430 int cursorwidth = 1;
2431 while (oldcursor.col + cursorwidth < TermWin.ncol
2432 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2433 cursorwidth++;
2434 2372
2435 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2373 XDrawRectangle (display->display, drawBuffer, gc,
2436 Col2Pixel (oldcursor.col), 2374 Col2Pixel (col),
2437 Row2Pixel (oldcursor.row), 2375 Row2Pixel (oldcursor.row),
2438 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2376 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2439 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2440 } 2378 }
2441 } 2379 }
2442 2380
2443 /* 2381 /*
2444 * H: cleanup selection 2382 * H: cleanup selection
… …
2451 num_scr = 0; 2389 num_scr = 0;
2452 num_scr_allow = 1; 2390 num_scr_allow = 1;
2453} 2391}
2454 2392
2455void 2393void
2456rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2394rxvt_term::scr_remap_chars (line_t &l)
2457{ 2395{
2458 if (!rp || !tp) 2396 if (!l.t)
2459 return; 2397 return;
2460 2398
2461 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2400
2401 for (int i = ncol; i--; )
2462 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2463} 2403}
2464 2404
2465void 2405void
2466rxvt_term::scr_remap_chars () 2406rxvt_term::scr_remap_chars ()
2467{ 2407{
2468 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2408 for (int i = total_rows; i--; )
2469 scr_remap_chars (screen.text[i], screen.rend[i]); 2409 scr_remap_chars (row_buf [i]);
2470 2410
2471 for (int i = TermWin.nrow; i--; ) 2411 for (int i = nrow; i--; )
2472 { 2412 {
2473 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2413 scr_remap_chars (drawn_buf [i]);
2474 scr_remap_chars (swap.text[i], swap.rend[i]); 2414 scr_remap_chars (swap_buf [i]);
2475 } 2415 }
2476} 2416}
2477 2417
2478void 2418void
2479rxvt_term::scr_recolour () 2419rxvt_term::scr_recolour ()
… …
2485#if XPM_BACKGROUND 2425#if XPM_BACKGROUND
2486 && !bgPixmap.pixmap 2426 && !bgPixmap.pixmap
2487#endif 2427#endif
2488 ) 2428 )
2489 { 2429 {
2490 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2430 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2491 XClearWindow (display->display, TermWin.parent[0]); 2431 XClearWindow (display->display, parent[0]);
2492 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2432 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2493#if HAVE_SCROLLBARS 2433#if HAVE_SCROLLBARS
2494 if (scrollBar.win) 2434 if (scrollBar.win)
2495 { 2435 {
2496 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2436 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2497 scrollBar.setIdle (); 2437 scrollBar.setIdle ();
… …
2507 2447
2508/* ------------------------------------------------------------------------- */ 2448/* ------------------------------------------------------------------------- */
2509void 2449void
2510rxvt_term::scr_clear (bool really) 2450rxvt_term::scr_clear (bool really)
2511{ 2451{
2512 if (!TermWin.mapped) 2452 if (!mapped)
2513 return; 2453 return;
2514 2454
2515 num_scr_allow = 0; 2455 num_scr_allow = 0;
2516 want_refresh = 1; 2456 want_refresh = 1;
2517 2457
2518#if TRANSPARENT
2519 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2520 {
2521 int i;
2522
2523 if (!(options & Opt_transparent_all))
2524 i = 0;
2525 else
2526 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2527
2528 while (i--)
2529 if (TermWin.parent[i] != None)
2530 XClearWindow (display->display, TermWin.parent[i]);
2531 }
2532#endif
2533
2534 if (really) 2458 if (really)
2535 XClearWindow (display->display, TermWin.vt); 2459 XClearWindow (display->display, vt);
2460}
2461
2462void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2464{
2465 int view_end = -view_start + nrow;
2466 int row, col;
2467
2468 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
2469 {
2470 text_t *stp = ROW(row).t;
2471 rend_t *srp = ROW(row).r;
2472
2473 for (col = beg_col; col < end_col; col++)
2474 srp[col] ^= rstyle1;
2475
2476 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2477 srp[col] ^= rstyle2;
2478
2479 if (++col < end_col)
2480 srp[col] ^= rstyle2;
2481 }
2482}
2483
2484void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2486{
2487 int view_end = -view_start + nrow;
2488 int row, col;
2489
2490 if (beg_row >= -view_start)
2491 {
2492 col = beg_col;
2493 row = beg_row;
2494 }
2495 else
2496 {
2497 col = 0;
2498 row = -view_start;
2499 }
2500
2501 for (; row < min (end_row, view_end); row++, col = 0)
2502 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2503 srp[col] ^= RS_RVid;
2504
2505 if (row == end_row)
2506 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2507 srp[col] ^= RS_RVid;
2536} 2508}
2537 2509
2538/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2539void 2511void
2540rxvt_term::scr_reverse_selection () 2512rxvt_term::scr_reverse_selection ()
2541{ 2513{
2514 if (selection.op
2542 if (selection.op && current_screen == selection.screen) 2515 && current_screen == selection.screen
2516 && selection.end.row >= -view_start)
2543 { 2517 {
2544 int end_row = TermWin.saveLines - TermWin.view_start;
2545 int i = selection.beg.row + TermWin.saveLines;
2546 int col, row = selection.end.row + TermWin.saveLines;
2547 rend_t *srp;
2548
2549#if ENABLE_FRILLS 2518#if ENABLE_FRILLS
2550 if (selection.rect) 2519 if (selection.rect)
2551 { 2520 scr_xor_rect (selection.beg.row, selection.beg.col,
2552 end_row += TermWin.nrow; 2521 selection.end.row, selection.end.col,
2553 2522 RS_RVid, RS_RVid | RS_Uline);
2554 for (; i <= row && i <= end_row; i++)
2555 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2556 srp[col] ^= RS_RVid;
2557 }
2558 else 2523 else
2559#endif 2524#endif
2560 { 2525 scr_xor_span (selection.beg.row, selection.beg.col,
2561 if (i >= end_row) 2526 selection.end.row, selection.end.col,
2562 col = selection.beg.col; 2527 RS_RVid);
2563 else
2564 {
2565 col = 0;
2566 i = end_row;
2567 }
2568
2569 end_row += TermWin.nrow;
2570
2571 for (; i < row && i < end_row; i++, col = 0)
2572 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2573 srp[col] ^= RS_RVid;
2574
2575 if (i == row && i < end_row)
2576 for (srp = screen.rend[i]; col < selection.end.col; col++)
2577 srp[col] ^= RS_RVid;
2578 }
2579 } 2528 }
2580} 2529}
2581 2530
2582/* ------------------------------------------------------------------------- */ 2531/* ------------------------------------------------------------------------- */
2583/* 2532/*
… …
2590{ 2539{
2591 int row, wrote; 2540 int row, wrote;
2592 unsigned int width, towrite; 2541 unsigned int width, towrite;
2593 char r1[] = "\n"; 2542 char r1[] = "\n";
2594 2543
2595 for (row = TermWin.saveLines - TermWin.nscrolled; 2544 for (row = saveLines - nsaved;
2596 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2545 row < saveLines + nrow - 1; row++)
2597 { 2546 {
2598 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2547 width = row_buf[row].l >= 0 ? row_buf[row].l
2599 : TermWin.ncol; 2548 : ncol;
2600 for (towrite = width; towrite; towrite -= wrote) 2549 for (towrite = width; towrite; towrite -= wrote)
2601 { 2550 {
2602 wrote = write (fd, & (screen.text[row][width - towrite]), 2551 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2603 towrite); 2552 towrite);
2604 if (wrote < 0) 2553 if (wrote < 0)
2605 return; /* XXX: death, no report */ 2554 return; /* XXX: death, no report */
2606 } 2555 }
2607 if (screen.tlen[row] >= 0) 2556 if (row_buf[row].l >= 0)
2608 if (write (fd, r1, 1) <= 0) 2557 if (write (fd, r1, 1) <= 0)
2609 return; /* XXX: death, no report */ 2558 return; /* XXX: death, no report */
2610 } 2559 }
2611} 2560}
2612#endif 2561#endif
2613 2562
2614/* ------------------------------------------------------------------------- * 2563/* ------------------------------------------------------------------------- *
2615 * CHARACTER SELECTION * 2564 * CHARACTER SELECTION *
2616 * ------------------------------------------------------------------------- */ 2565 * ------------------------------------------------------------------------- */
2617
2618/*
2619 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2620 */
2621void 2566void
2622rxvt_term::selection_check (int check_more) 2567rxvt_term::selection_check (int check_more)
2623{ 2568{
2624 row_col_t pos; 2569 row_col_t pos;
2625 2570
2626 if (!selection.op) 2571 if (!selection.op)
2627 return; 2572 return;
2628 2573
2629 pos.row = pos.col = 0; 2574 pos.row = pos.col = 0;
2630 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2575 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2631 || (selection.beg.row >= TermWin.nrow) 2576 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2632 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2577 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2633 || (selection.mark.row >= TermWin.nrow)
2634 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2635 || (selection.end.row >= TermWin.nrow)
2636 || (check_more == 1 2578 || (check_more == 1
2637 && current_screen == selection.screen 2579 && current_screen == selection.screen
2638 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2580 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2639 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2581 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2640 || (check_more == 2 2582 || (check_more == 2
… …
2642 && ROWCOL_IS_AFTER (selection.end, pos)) 2584 && ROWCOL_IS_AFTER (selection.end, pos))
2643 || (check_more == 3 2585 || (check_more == 3
2644 && ROWCOL_IS_AFTER (selection.end, pos)) 2586 && ROWCOL_IS_AFTER (selection.end, pos))
2645 || (check_more == 4 /* screen width change */ 2587 || (check_more == 4 /* screen width change */
2646 && (selection.beg.row != selection.end.row 2588 && (selection.beg.row != selection.end.row
2647 || selection.end.col > TermWin.ncol))) 2589 || selection.end.col > ncol)))
2648 CLEAR_SELECTION (); 2590 CLEAR_SELECTION ();
2649} 2591}
2650 2592
2651/* ------------------------------------------------------------------------- */ 2593/* ------------------------------------------------------------------------- */
2652/* 2594/*
2653 * Paste a selection direct to the command fd 2595 * Paste a selection direct to the command fd
2654 */ 2596 */
2655void 2597void
2656rxvt_term::paste (unsigned char *data, unsigned int len) 2598rxvt_term::paste (char *data, unsigned int len)
2657{ 2599{
2658 /* convert normal newline chars into common keyboard Return key sequence */ 2600 /* convert normal newline chars into common keyboard Return key sequence */
2659 for (unsigned int i = 0; i < len; i++) 2601 for (unsigned int i = 0; i < len; i++)
2660 if (data[i] == C0_LF) 2602 if (data[i] == C0_LF)
2661 data[i] = C0_CR; 2603 data[i] = C0_CR;
… …
2805 { 2747 {
2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2748 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807 char *s = rxvt_wcstombs (w); 2749 char *s = rxvt_wcstombs (w);
2808 free (w); 2750 free (w);
2809 // TODO: strlen == only the first element will be converted. well... 2751 // TODO: strlen == only the first element will be converted. well...
2810 paste ((unsigned char *)s, strlen (s)); 2752 paste (s, strlen (s));
2811 free (s); 2753 free (s);
2812 } 2754 }
2813 else 2755 else
2814#endif 2756#endif
2815 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2757 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2816 && cl) 2758 && cl)
2817 { 2759 {
2818 for (int i = 0; i < cr; i++) 2760 for (int i = 0; i < cr; i++)
2819 paste ((unsigned char *)cl[i], strlen (cl[i])); 2761 paste (cl[i], strlen (cl[i]));
2820 2762
2821 XFreeStringList (cl); 2763 XFreeStringList (cl);
2822 } 2764 }
2823 else 2765 else
2824 paste (ct.value, ct.nitems); // paste raw 2766 paste ((char *)ct.value, ct.nitems); // paste raw
2825 2767
2826bailout: 2768bailout:
2827 XFree (ct.value); 2769 XFree (ct.value);
2828 2770
2829 if (selection_wait == Sel_normal) 2771 if (selection_wait == Sel_normal)
… …
2861 * EXT: button 2 release 2803 * EXT: button 2 release
2862 */ 2804 */
2863void 2805void
2864rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm, int x, int y)
2865{ 2807{
2866 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2808 if (x < 0 || x >= width || y < 0 || y >= height)
2867 return; /* outside window */ 2809 return; /* outside window */
2868 2810
2869 if (selection.text) 2811 if (selection.text)
2870 { /* internal selection */ 2812 { /* internal selection */
2871 char *str = rxvt_wcstombs (selection.text, selection.len); 2813 char *str = rxvt_wcstombs (selection.text, selection.len);
2872 paste ((unsigned char *)str, strlen (str)); 2814 paste (str, strlen (str));
2873 free (str); 2815 free (str);
2874 return; 2816 return;
2875 } 2817 }
2876 else 2818 else
2877 { 2819 {
… …
2900 2842
2901int 2843int
2902rxvt_term::selection_request_other (Atom target, int selnum) 2844rxvt_term::selection_request_other (Atom target, int selnum)
2903{ 2845{
2904 Atom sel; 2846 Atom sel;
2905#ifdef DEBUG_SELECT
2906 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2907#endif
2908 2847
2909 selection_type |= selnum; 2848 selection_type |= selnum;
2910 2849
2911 if (selnum == Sel_Primary) 2850 if (selnum == Sel_Primary)
2912 sel = XA_PRIMARY; 2851 sel = XA_PRIMARY;
… …
2916 sel = xa[XA_CLIPBOARD]; 2855 sel = xa[XA_CLIPBOARD];
2917 2856
2918 if (XGetSelectionOwner (display->display, sel) != None) 2857 if (XGetSelectionOwner (display->display, sel) != None)
2919 { 2858 {
2920 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2859 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2921 TermWin.vt, selection_request_time); 2860 vt, selection_request_time);
2922 return 1; 2861 return 1;
2923 } 2862 }
2924 2863
2925 return 0; 2864 return 0;
2926} 2865}
… …
2949 * EXT: button 1 or 3 release 2888 * EXT: button 1 or 3 release
2950 */ 2889 */
2951void 2890void
2952rxvt_term::selection_make (Time tm) 2891rxvt_term::selection_make (Time tm)
2953{ 2892{
2954 int i, col, end_col, row, end_row; 2893 int i;
2955 wchar_t *new_selection_text; 2894 wchar_t *new_selection_text;
2956 text_t *t; 2895 text_t *t;
2957 2896
2958 switch (selection.op) 2897 switch (selection.op)
2959 { 2898 {
… …
2972 selection.op = SELECTION_DONE; 2911 selection.op = SELECTION_DONE;
2973 2912
2974 if (selection.clicks == 4) 2913 if (selection.clicks == 4)
2975 return; /* nothing selected, go away */ 2914 return; /* nothing selected, go away */
2976 2915
2916 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2917 return;
2918
2977 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2919 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2920 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2979 2921
2980 col = selection.beg.col;
2981 row = selection.beg.row + TermWin.saveLines;
2982 end_row = selection.end.row + TermWin.saveLines;
2983 int ofs = 0; 2922 int ofs = 0;
2984 int extra = 0; 2923 int extra = 0;
2985 2924
2925 int col = selection.beg.col;
2926 int row = selection.beg.row;
2927
2928 int end_col;
2929
2986 for (; row <= end_row; row++, col = 0) 2930 for (; row <= selection.end.row; row++, col = 0)
2987 { 2931 {
2988 end_col = screen.tlen[row];
2989
2990#if ENABLE_FRILLS 2932#if ENABLE_FRILLS
2991 if (selection.rect) 2933 if (selection.rect)
2992 { 2934 {
2993 col = selection.beg.col; 2935 col = selection.beg.col;
2994 end_col = TermWin.ncol + 1; 2936 end_col = ncol + 1;
2937 }
2938 else
2939#endif
2940 end_col = ROW(row).l;
2941
2942 col = max (col, 0);
2943
2944 if (row == selection.end.row
2945#if ENABLE_FRILLS
2946 || selection.rect
2947#endif
2995 } 2948 )
2996#endif
2997
2998 MAX_IT (col, 0);
2999
3000 if (end_col == -1)
3001 end_col = TermWin.ncol;
3002
3003 if (row == end_row || selection.rect)
3004 MIN_IT (end_col, selection.end.col); 2949 min_it (end_col, selection.end.col);
3005 2950
3006 t = &screen.text[row][col]; 2951 t = ROW(row).t + col;
2952
3007 for (; col < end_col; col++) 2953 for (; col < end_col; col++)
3008 { 2954 {
3009 if (*t == NOCHAR) 2955 if (*t == NOCHAR)
3010 t++; 2956 t++;
3011#if ENABLE_COMBINING 2957#if ENABLE_COMBINING
… …
3027#endif 2973#endif
3028 else 2974 else
3029 new_selection_text[ofs++] = *t++; 2975 new_selection_text[ofs++] = *t++;
3030 } 2976 }
3031 2977
3032 if (screen.tlen[row] != -1 && row != end_row) 2978#if ENABLE_FRILLS
2979 if (selection.rect)
2980 {
2981 while (ofs
2982 && new_selection_text[ofs - 1] != C0_LF
2983 && unicode::is_space (new_selection_text[ofs - 1]))
2984 --ofs;
2985
3033 new_selection_text[ofs++] = C0_LF; 2986 new_selection_text[ofs++] = C0_LF;
2987 }
2988 else
2989#endif
2990 if (!ROW(row).is_longer () && row != selection.end.row)
2991 new_selection_text[ofs++] = C0_LF;
3034 } 2992 }
3035 2993
3036 if (end_col != selection.end.col) 2994 if (end_col != selection.end.col)
3037 new_selection_text[ofs++] = C0_LF; 2995 new_selection_text[ofs++] = C0_LF;
3038 2996
… …
3048 3006
3049 // we usually allocate much more than necessary, so realloc it smaller again 3007 // we usually allocate much more than necessary, so realloc it smaller again
3050 selection.len = ofs; 3008 selection.len = ofs;
3051 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3009 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3052 3010
3011 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3012 return;
3013
3014 selection_grab (tm);
3015}
3016
3017bool
3018rxvt_term::selection_grab (Time tm)
3019{
3020 selection_time = tm;
3021
3053 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3022 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3054 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3023 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3024 {
3055 display->set_selection_owner (this); 3025 display->set_selection_owner (this);
3026 return true;
3027 }
3056 else 3028 else
3057 rxvt_warn ("can't get primary selection, ignoring.\n"); 3029 return false;
3058 3030
3059#if 0 3031#if 0
3060 XTextProperty ct; 3032 XTextProperty ct;
3061 3033
3062 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3063 { 3035 {
3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3065 XFree (ct.value); 3037 XFree (ct.value);
3066 } 3038 }
3067#endif 3039#endif
3068
3069 selection_time = tm;
3070} 3040}
3071 3041
3072/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
3073/* 3043/*
3074 * Mark or select text based upon number of clicks: 1, 2, or 3 3044 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3082 3052
3083 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3053 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3084 3054
3085 if (clicks == 2 || clicks == 3) 3055 if (clicks == 2 || clicks == 3)
3086 selection_extend_colrow (selection.mark.col, 3056 selection_extend_colrow (selection.mark.col,
3087 selection.mark.row + TermWin.view_start, 3057 selection.mark.row + view_start,
3088 0, /* button 3 */ 3058 0, /* button 3 */
3089 1, /* button press */ 3059 1, /* button press */
3090 0); /* click change */ 3060 0); /* click change */
3091} 3061}
3092 3062
… …
3096 */ 3066 */
3097void 3067void
3098rxvt_term::selection_start_colrow (int col, int row) 3068rxvt_term::selection_start_colrow (int col, int row)
3099{ 3069{
3100 want_refresh = 1; 3070 want_refresh = 1;
3071
3072 selection.mark.row = row - view_start;
3101 selection.mark.col = col; 3073 selection.mark.col = col;
3102 selection.mark.row = row - TermWin.view_start;
3103 3074
3104 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3075 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3105 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3076 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3106 MAX_IT (selection.mark.col, 0);
3107 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3108 3077
3109 while (selection.mark.col > 0 3078 while (selection.mark.col > 0
3110 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3079 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3111 --selection.mark.col; 3080 --selection.mark.col;
3112 3081
3113 if (selection.op) 3082 if (selection.op)
3114 { /* clear the old selection */ 3083 { /* clear the old selection */
3115 selection.beg.row = selection.end.row = selection.mark.row; 3084 selection.beg.row = selection.end.row = selection.mark.row;
… …
3139 text_t *stp; 3108 text_t *stp;
3140 rend_t *srp; 3109 rend_t *srp;
3141 3110
3142 if (dirn == UP) 3111 if (dirn == UP)
3143 { 3112 {
3144 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3113 bound.row = - nsaved - 1;
3145 bound.col = 0; 3114 bound.col = 0;
3146 dirnadd = -1; 3115 dirnadd = -1;
3147 } 3116 }
3148 else 3117 else
3149 { 3118 {
3150 bound.row = TermWin.saveLines + TermWin.nrow; 3119 bound.row = nrow;
3151 bound.col = TermWin.ncol - 1; 3120 bound.col = ncol - 1;
3152 dirnadd = 1; 3121 dirnadd = 1;
3153 } 3122 }
3154 3123
3155 row = mark->row + TermWin.saveLines; 3124 row = mark->row;
3156 col = mark->col; 3125 col = max (mark->col, 0);
3157 MAX_IT (col, 0); 3126
3158 /* find the edge of a word */ 3127 /* find the edge of a word */
3159 stp = &screen.text[row][col]; 3128 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3160 w1 = DELIMIT_TEXT (*stp); 3129 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3161
3162 srp = &screen.rend[row][col];
3163 w2 = DELIMIT_REND (*srp);
3164 3130
3165 for (;;) 3131 for (;;)
3166 { 3132 {
3167 for (; col != bound.col; col += dirnadd) 3133 for (; col != bound.col; col += dirnadd)
3168 { 3134 {
… …
3178 break; 3144 break;
3179 } 3145 }
3180 3146
3181 if ((col == bound.col) && (row != bound.row)) 3147 if ((col == bound.col) && (row != bound.row))
3182 { 3148 {
3183 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3149 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3184 { 3150 {
3185 trow = row + dirnadd; 3151 trow = row + dirnadd;
3186 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3152 tcol = dirn == UP ? ncol - 1 : 0;
3187 3153
3188 if (screen.text[trow] == NULL) 3154 if (!ROW(trow).t)
3189 break; 3155 break;
3190 3156
3191 stp = & (screen.text[trow][tcol]); 3157 stp = ROW(trow).t + tcol;
3192 srp = & (screen.rend[trow][tcol]); 3158 srp = ROW(trow).r + tcol;
3193 3159
3194 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3160 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3195 break; 3161 break;
3196 3162
3197 row = trow; 3163 row = trow;
… …
3200 } 3166 }
3201 } 3167 }
3202 break; 3168 break;
3203 } 3169 }
3204 3170
3205Old_Word_Selection_You_Die:
3206 if (dirn == DN) 3171 if (dirn == DN)
3207 col++; /* put us on one past the end */ 3172 col++; /* put us on one past the end */
3208 3173
3209 /* Poke the values back in */ 3174 /* Poke the values back in */
3210 ret->row = row - TermWin.saveLines; 3175 ret->row = row;
3211 ret->col = col; 3176 ret->col = col;
3212} 3177}
3213 3178
3214/* ------------------------------------------------------------------------- */ 3179/* ------------------------------------------------------------------------- */
3215/* 3180/*
… …
3220 * flag == 2 ==> button 3 motion 3185 * flag == 2 ==> button 3 motion
3221 */ 3186 */
3222void 3187void
3223rxvt_term::selection_extend (int x, int y, int flag) 3188rxvt_term::selection_extend (int x, int y, int flag)
3224{ 3189{
3225 int col, row; 3190 int col = clamp (Pixel2Col (x), 0, ncol);
3226 3191 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3227 col = Pixel2Col (x);
3228 row = Pixel2Row (y);
3229 MAX_IT (row, 0);
3230 MIN_IT (row, (int)TermWin.nrow - 1);
3231 MAX_IT (col, 0);
3232 MIN_IT (col, (int)TermWin.ncol);
3233 3192
3234 /* 3193 /*
3235 * If we're selecting characters (single click) then we must check first 3194 * If we're selecting characters (single click) then we must check first
3236 * if we are at the same place as the original mark. If we are then 3195 * if we are at the same place as the original mark. If we are then
3237 * select nothing. Otherwise, if we're to the right of the mark, you have to 3196 * select nothing. Otherwise, if we're to the right of the mark, you have to
3238 * be _past_ a character for it to be selected. 3197 * be _past_ a character for it to be selected.
3239 */ 3198 */
3240 if (((selection.clicks % 3) == 1) && !flag 3199 if (((selection.clicks % 3) == 1) && !flag
3241 && (col == selection.mark.col 3200 && (col == selection.mark.col
3242 && (row == selection.mark.row + TermWin.view_start))) 3201 && (row == selection.mark.row + view_start)))
3243 { 3202 {
3244 /* select nothing */ 3203 /* select nothing */
3245 selection.beg.row = selection.end.row = 0; 3204 selection.beg.row = selection.end.row = 0;
3246 selection.beg.col = selection.end.col = 0; 3205 selection.beg.col = selection.end.col = 0;
3247 selection.clicks = 4; 3206 selection.clicks = 4;
… …
3262 * Extend the selection to the specified col/row 3221 * Extend the selection to the specified col/row
3263 */ 3222 */
3264void 3223void
3265rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3224rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3266{ 3225{
3267 int16_t ncol = TermWin.ncol;
3268 int end_col;
3269 row_col_t pos; 3226 row_col_t pos;
3270 enum { 3227 enum {
3271 LEFT, RIGHT 3228 LEFT, RIGHT
3272 } closeto = RIGHT; 3229 } closeto = RIGHT;
3273 3230
… …
3304 selection.beg.col = selection.end.col = selection.mark.col; 3261 selection.beg.col = selection.end.col = selection.mark.col;
3305 selection.beg.row = selection.end.row = selection.mark.row; 3262 selection.beg.row = selection.end.row = selection.mark.row;
3306 } 3263 }
3307 3264
3308 pos.col = col; 3265 pos.col = col;
3309 pos.row = row; 3266 pos.row = row - view_start;
3310
3311 pos.row -= TermWin.view_start; /* adjust for scroll */
3312 3267
3313 /* 3268 /*
3314 * This is mainly xterm style selection with a couple of differences, mainly 3269 * This is mainly xterm style selection with a couple of differences, mainly
3315 * in the way button3 drag extension works. 3270 * in the way button3 drag extension works.
3316 * We're either doing: button1 drag; button3 press; or button3 drag 3271 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3375 } 3330 }
3376 } 3331 }
3377 3332
3378 if (selection.clicks == 1) 3333 if (selection.clicks == 1)
3379 { 3334 {
3380 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3335 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3381 3336 && !ROW(selection.beg.row).is_longer ()
3382 if (selection.beg.col > end_col
3383 && end_col != -1
3384#if ENABLE_FRILLS 3337#if ENABLE_FRILLS
3385 && !selection.rect 3338 && !selection.rect
3386#endif 3339#endif
3387 ) 3340 )
3388 selection.beg.col = ncol; 3341 selection.beg.col = ncol;
3389 3342
3390 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3391
3392 if ( 3343 if (
3393 selection.end.col > end_col 3344 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3394 && end_col != -1 3345 && !ROW(selection.end.row).is_longer ()
3395#if ENABLE_FRILLS 3346#if ENABLE_FRILLS
3396 && !selection.rect 3347 && !selection.rect
3397#endif 3348#endif
3398 ) 3349 )
3399 selection.end.col = ncol; 3350 selection.end.col = ncol;
… …
3401 else if (selection.clicks == 2) 3352 else if (selection.clicks == 2)
3402 { 3353 {
3403 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3354 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3404 selection.end.col--; 3355 selection.end.col--;
3405 3356
3357 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3358 {
3406 selection_delimit_word (UP, &selection.beg, &selection.beg); 3359 selection_delimit_word (UP, &selection.beg, &selection.beg);
3407 selection_delimit_word (DN, &selection.end, &selection.end); 3360 selection_delimit_word (DN, &selection.end, &selection.end);
3361 }
3408 } 3362 }
3409 else if (selection.clicks == 3) 3363 else if (selection.clicks == 3)
3410 { 3364 {
3411#if ENABLE_FRILLS 3365#if ENABLE_FRILLS
3412 if (options & Opt_tripleclickwords) 3366 if (OPTION (Opt_tripleclickwords))
3413 { 3367 {
3414 int end_row;
3415
3416 selection_delimit_word (UP, &selection.beg, &selection.beg); 3368 selection_delimit_word (UP, &selection.beg, &selection.beg);
3417 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3418 3369
3419 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3370 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3420 { 3371 {
3421 end_col = screen.tlen[end_row + TermWin.saveLines]; 3372 if (!ROW(end_row).is_longer ())
3422
3423 if (end_col != -1)
3424 { 3373 {
3425 selection.end.row = end_row; 3374 selection.end.row = end_row;
3426 selection.end.col = end_col; 3375 selection.end.col = ROW(end_row).l;
3427 selection_remove_trailing_spaces (); 3376 selection_remove_trailing_spaces ();
3428 break; 3377 break;
3429 } 3378 }
3430 } 3379 }
3431 } 3380 }
… …
3437 3386
3438 selection.beg.col = 0; 3387 selection.beg.col = 0;
3439 selection.end.col = ncol; 3388 selection.end.col = ncol;
3440 3389
3441 // select a complete logical line 3390 // select a complete logical line
3442 while (selection.beg.row > -TermWin.saveLines 3391 while (selection.beg.row > -saveLines
3443 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3392 && ROW(selection.beg.row - 1).is_longer ())
3444 selection.beg.row--; 3393 selection.beg.row--;
3445 3394
3446 while (selection.end.row < TermWin.nrow 3395 while (selection.end.row < nrow
3447 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3396 && ROW(selection.end.row).is_longer ())
3448 selection.end.row++; 3397 selection.end.row++;
3449 } 3398 }
3450 } 3399 }
3451 3400
3452 if (button3 && buttonpress) 3401 if (button3 && buttonpress)
… …
3463 } 3412 }
3464 } 3413 }
3465 3414
3466#if ENABLE_FRILLS 3415#if ENABLE_FRILLS
3467 if (selection.rect && selection.beg.col > selection.end.col) 3416 if (selection.rect && selection.beg.col > selection.end.col)
3468 SWAP_IT (selection.beg.col, selection.end.col, int); 3417 ::swap (selection.beg.col, selection.end.col);
3469#endif 3418#endif
3470} 3419}
3471 3420
3472#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3473void 3422void
… …
3477 text_t *stp; 3426 text_t *stp;
3478 3427
3479 end_col = selection.end.col; 3428 end_col = selection.end.col;
3480 end_row = selection.end.row; 3429 end_row = selection.end.row;
3481 3430
3482 for ( ; end_row >= selection.beg.row; ) 3431 for (; end_row >= selection.beg.row; )
3483 { 3432 {
3484 stp = screen.text[end_row + TermWin.saveLines]; 3433 stp = ROW(end_row).t;
3485 3434
3486 while (--end_col >= 0) 3435 while (--end_col >= 0)
3487 { 3436 {
3488 if (stp[end_col] != ' ' 3437 if (stp[end_col] != NOCHAR
3489 && stp[end_col] != '\t' 3438 && !unicode::is_space (stp[end_col]))
3490 && stp[end_col] != NOCHAR)
3491 break; 3439 break;
3492 } 3440 }
3493 3441
3494 if (end_col >= 0 3442 if (end_col >= 0
3495 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3443 || !ROW(end_row - 1).is_longer ())
3496 { 3444 {
3497 selection.end.col = end_col + 1; 3445 selection.end.col = end_col + 1;
3498 selection.end.row = end_row; 3446 selection.end.row = end_row;
3499 break; 3447 break;
3500 } 3448 }
3501 3449
3502 end_row--; 3450 end_row--;
3503 end_col = TermWin.ncol; 3451 end_col = ncol;
3504 } 3452 }
3505 3453
3506 if (selection.mark.row > selection.end.row) 3454 if (selection.mark.row > selection.end.row)
3507 { 3455 {
3508 selection.mark.row = selection.end.row; 3456 selection.mark.row = selection.end.row;
… …
3671 */ 3619 */
3672void 3620void
3673rxvt_term::pixel_position (int *x, int *y) 3621rxvt_term::pixel_position (int *x, int *y)
3674{ 3622{
3675 *x = Pixel2Col (*x); 3623 *x = Pixel2Col (*x);
3676 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3624 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3677 *y = Pixel2Row (*y); 3625 *y = Pixel2Row (*y);
3678 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3626 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3679} 3627}
3680 3628
3681/* ------------------------------------------------------------------------- */ 3629/* ------------------------------------------------------------------------- */
3682#ifdef USE_XIM 3630#ifdef USE_XIM
3683void 3631void
3684rxvt_term::im_set_position (XPoint &pos) 3632rxvt_term::im_set_position (XPoint &pos)
3685{ 3633{
3686 XWindowAttributes xwa; 3634 XWindowAttributes xwa;
3687 3635
3688 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3636 XGetWindowAttributes (display->display, vt, &xwa);
3689 3637
3690 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3638 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3691 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3639 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3692} 3640}
3693#endif 3641#endif
3694 3642
3695#if ENABLE_OVERLAY 3643#if ENABLE_OVERLAY
3696void 3644void
3697rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3645rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3698{ 3646{
3699 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3647 if (nrow < 1 || ncol < 1)
3700 return; 3648 return;
3701 3649
3702 want_refresh = 1; 3650 want_refresh = 1;
3703 3651
3704 scr_overlay_off (); 3652 scr_overlay_off ();
3705 3653
3706 if (x < 0) x = TermWin.ncol - w; 3654 if (x < 0) x = ncol - w;
3707 if (y < 0) y = TermWin.nrow - h; 3655 if (y < 0) y = nrow - h;
3708 3656
3709 // make space for border 3657 // make space for border
3710 w += 2; MIN_IT (w, TermWin.ncol); 3658 w += 2; min_it (w, ncol);
3711 h += 2; MIN_IT (h, TermWin.nrow); 3659 h += 2; min_it (h, nrow);
3712 3660
3713 x -= 1; MAX_IT (x, 0); 3661 x -= 1; clamp_it (x, 0, ncol - w);
3714 y -= 1; MAX_IT (y, 0); 3662 y -= 1; clamp_it (y, 0, nrow - h);
3715
3716 MIN_IT (x, TermWin.ncol - w);
3717 MIN_IT (y, TermWin.nrow - h);
3718 3663
3719 ov_x = x; ov_y = y; 3664 ov_x = x; ov_y = y;
3720 ov_w = w; ov_h = h; 3665 ov_w = w; ov_h = h;
3721 3666
3722 ov_text = new text_t *[h]; 3667 ov_text = new text_t *[h];
… …
3787 while (*s) 3732 while (*s)
3788 scr_overlay_set (x++, y, *s++); 3733 scr_overlay_set (x++, y, *s++);
3789} 3734}
3790 3735
3791void 3736void
3737rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3738{
3739 while (*s)
3740 {
3741 text_t t = *s++;
3742 int width = wcwidth (t);
3743
3744 while (width--)
3745 {
3746 scr_overlay_set (x++, y, t);
3747 t = NOCHAR;
3748 }
3749 }
3750}
3751
3752void
3792rxvt_term::scr_swap_overlay () 3753rxvt_term::scr_swap_overlay ()
3793{ 3754{
3794 if (!ov_text) 3755 if (!ov_text)
3795 return; 3756 return;
3796 3757
3797 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3798
3799 // swap screen mem with overlay 3758 // swap screen mem with overlay
3800 for (int y = ov_h; y--; ) 3759 for (int y = ov_h; y--; )
3801 { 3760 {
3802 text_t *t1 = ov_text[y]; 3761 text_t *t1 = ov_text[y];
3803 rend_t *r1 = ov_rend[y]; 3762 rend_t *r1 = ov_rend[y];
3804 3763
3805 text_t *t2 = screen.text[y + row_offset] + ov_x; 3764 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3806 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3765 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3807 3766
3808 for (int x = ov_w; x--; ) 3767 for (int x = ov_w; x--; )
3809 { 3768 {
3810 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3769 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3811 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3770 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3813 } 3772 }
3814} 3773}
3815 3774
3816#endif 3775#endif
3817/* ------------------------------------------------------------------------- */ 3776/* ------------------------------------------------------------------------- */
3777

Diff Legend

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