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.166 by root, Sun Jun 26 20:06:52 2005 UTC vs.
Revision 1.209 by root, Thu Jan 5 01:04:10 2006 UTC

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

Diff Legend

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