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

Diff Legend

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