ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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