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

Diff Legend

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