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.156 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.222 by root, Wed Jan 11 05:14:26 2006 UTC

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

Diff Legend

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