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.160 by root, Mon Feb 21 19:30:58 2005 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 2006 UTC

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

Diff Legend

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