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.169 by root, Tue Oct 25 19:04:46 2005 UTC vs.
Revision 1.190 by root, Thu Dec 22 15:52:57 2005 UTC

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

Diff Legend

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