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.159 by root, Mon Feb 21 19:26:07 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 int i;
447
448 total_rows = TermWin.nrow + TermWin.saveLines;
449
450 delete talloc; talloc = 0; 383 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 384 delete ralloc; ralloc = 0;
452 385
453 free (screen.text); 386 free (row_buf);
454 free (screen.tlen); 387 free (swap_buf);
455 free (screen.rend);
456 free (drawn_text); 388 free (drawn_buf);
457 free (drawn_rend); 389 free (temp_buf);
458 free (swap.text);
459 free (swap.tlen);
460 free (swap.rend);
461 free (buf_text);
462 free (buf_rend);
463 free (tabs); 390 free (tabs);
464
465 /* NULL these so if anything tries to use them, we'll know about it */
466 screen.text = drawn_text = swap.text = NULL;
467 screen.rend = drawn_rend = swap.rend = NULL;
468 screen.tlen = swap.tlen = NULL;
469 buf_text = NULL;
470 buf_rend = NULL;
471 tabs = NULL;
472} 391}
473 392
474/* ------------------------------------------------------------------------- */ 393/* ------------------------------------------------------------------------- */
475/* 394/*
476 * Hard reset 395 * Hard reset
… …
527 set_font_style (); 446 set_font_style ();
528 break; 447 break;
529 } 448 }
530 449
531 /* boundary check in case screen size changed between SAVE and RESTORE */ 450 /* boundary check in case screen size changed between SAVE and RESTORE */
532 MIN_IT (s->cur.row, TermWin.nrow - 1); 451 min_it (s->cur.row, nrow - 1);
533 MIN_IT (s->cur.col, TermWin.ncol - 1); 452 min_it (s->cur.col, ncol - 1);
534#ifdef DEBUG_STRICT 453#ifdef DEBUG_STRICT
535 assert (s->cur.row >= 0); 454 assert (s->cur.row >= 0);
536 assert (s->cur.col >= 0); 455 assert (s->cur.col >= 0);
537#else /* drive with your eyes closed */ 456#else /* drive with your eyes closed */
538 MAX_IT (s->cur.row, 0); 457 max_it (s->cur.row, 0);
539 MAX_IT (s->cur.col, 0); 458 max_it (s->cur.col, 0);
540#endif 459#endif
541} 460}
542 461
543/* ------------------------------------------------------------------------- */ 462/* ------------------------------------------------------------------------- */
544/* 463/*
… …
547 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 466 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
548 */ 467 */
549int 468int
550rxvt_term::scr_change_screen (int scrn) 469rxvt_term::scr_change_screen (int scrn)
551{ 470{
552 int i;
553#if NSCREENS
554 int offset;
555#endif
556
557 want_refresh = 1; 471 want_refresh = 1;
558
559 TermWin.view_start = 0; 472 view_start = 0;
560 473
561 if (current_screen == scrn) 474 if (current_screen == scrn)
562 return scrn; 475 return scrn;
563 476
564 selection_check (2); /* check for boundary cross */ 477 selection_check (2); /* check for boundary cross */
565 478
566 i = current_screen; current_screen = scrn; scrn = i; 479 int i = current_screen; current_screen = scrn; scrn = i;
567 480
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 481 ::swap (screen.cur.row, swap.cur.row);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 482 ::swap (screen.cur.col, swap.cur.col);
570 MAX_IT (screen.cur.row, 0); 483
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0); 485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574 486
575#if NSCREENS 487#if NSCREENS
576 if (options & Opt_secondaryScreen) 488 if (options & Opt_secondaryScreen)
577 { 489 {
578 num_scr = 0; 490 num_scr = 0;
579 offset = TermWin.saveLines;
580 491
581 for (i = prev_nrow; i--;) 492 for (int i = nrow; i--; )
582 { 493 ::swap (ROW(i), swap_buf [i]);
583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
586 }
587 494
588 SWAP_IT (screen.charset, swap.charset, int16_t); 495 ::swap (screen.charset, swap.charset);
589 SWAP_IT (screen.flags, swap.flags, int); 496 ::swap (screen.flags, swap.flags);
590 screen.flags |= Screen_VisibleCursor; 497 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 498 swap.flags |= Screen_VisibleCursor;
592 } 499 }
593 else 500 else
594#endif 501#endif
595 if (options & Opt_secondaryScroll) 502 if (options & Opt_secondaryScroll)
596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 503 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
597 504
598 return scrn; 505 return scrn;
599} 506}
600 507
601// clear WrapNext indicator, solidifying position on next line 508// clear WrapNext indicator, solidifying position on next line
… …
608 screen.flags &= ~Screen_WrapNext; 515 screen.flags &= ~Screen_WrapNext;
609 516
610 screen.cur.col = 0; 517 screen.cur.col = 0;
611 518
612 if (screen.cur.row == screen.bscroll) 519 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 520 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
614 else if (screen.cur.row < TermWin.nrow - 1) 521 else if (screen.cur.row < nrow - 1)
615 screen.cur.row++; 522 screen.cur.row++;
616} 523}
617 524
618/* ------------------------------------------------------------------------- */ 525/* ------------------------------------------------------------------------- */
619/* 526/*
… …
649/* ------------------------------------------------------------------------- */ 556/* ------------------------------------------------------------------------- */
650/* 557/*
651 * Scroll text between <row1> and <row2> inclusive, by <count> lines 558 * Scroll text between <row1> and <row2> inclusive, by <count> lines
652 * count positive ==> scroll up 559 * count positive ==> scroll up
653 * count negative ==> scroll down 560 * count negative ==> scroll down
654 * spec == 0 for normal routines
655 */ 561 */
656int 562int
657rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 563rxvt_term::scr_scroll_text (int row1, int row2, int count)
658{ 564{
659 int i, j;
660 long nscrolled;
661
662 if (count == 0 || (row1 > row2)) 565 if (count == 0 || (row1 > row2))
663 return 0; 566 return 0;
664 567
665 want_refresh = 1; 568 want_refresh = 1;
569 num_scr += count;
666 570
667 if (row1 == 0 && count > 0 571 if (count > 0
572 && row1 == 0
573 && row2 == nrow - 1
668 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 574 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
669 { 575 {
670 nscrolled = (long)TermWin.nscrolled + (long)count; 576 nsaved = min (nsaved + count, saveLines);
577 term_start = (term_start + count) % total_rows;
671 578
672 if (nscrolled > (long)TermWin.saveLines)
673 TermWin.nscrolled = TermWin.saveLines;
674 else
675 TermWin.nscrolled = (unsigned int)nscrolled;
676
677 if ((options & Opt_scrollWithBuffer)
678 && TermWin.view_start != 0
679 && TermWin.view_start != TermWin.saveLines)
680 scr_page (UP, count);
681 }
682 else if (!spec)
683 row1 += TermWin.saveLines;
684
685 row2 += TermWin.saveLines;
686
687 if (selection.op && current_screen == selection.screen) 579 if (selection.op && current_screen == selection.screen)
688 {
689 i = selection.beg.row + TermWin.saveLines;
690 j = selection.end.row + TermWin.saveLines;
691 if ((i < row1 && j > row1)
692 || (i < row2 && j > row2)
693 || (i - count < row1 && i >= row1)
694 || (i - count > row2 && i <= row2)
695 || (j - count < row1 && j >= row1)
696 || (j - count > row2 && j <= row2))
697 {
698 CLEAR_ALL_SELECTION ();
699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
700 } 580 {
701 else if (j >= row1 && j <= row2)
702 {
703 /* move selected region too */
704 selection.beg.row -= count; 581 selection.beg.row -= count;
705 selection.end.row -= count; 582 selection.end.row -= count;
706 selection.mark.row -= count; 583 selection.mark.row -= count;
707 }
708 }
709 584
710 selection_check (0); /* _after_ TermWin.nscrolled update */ 585 selection_check (0);
711
712 num_scr += count;
713 j = count;
714
715 if (count < 0)
716 count = -count;
717
718 i = row2 - row1 + 1;
719 MIN_IT (count, i);
720
721 if (j > 0)
722 {
723 /* scroll up */
724
725 /* Copy lines that will get clobbered by the rotation */
726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
734
735 j = row2 - count + 1, i = count;
736 }
737 else /* if (j < 0) */
738 {
739 /* scroll down */
740
741 /* Copy lines that will get clobbered by the rotation */
742 for (i = 0, j = row2; i < count; i++, j--)
743 { 586 }
744 buf_text[i] = screen.text[j]; 587
745 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)
746 } 599 {
600 int i = selection.beg.row;
601 int j = selection.end.row;
747 602
748 /* Rotate lines */ 603 if ((i < row1 && j > row1)
749 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 }
750 { 622 }
751 screen.tlen[j] = screen.tlen[i]; 623
752 screen.text[j] = screen.text[i]; 624 // use a simple and robust scrolling algorithm, this
753 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++)
754 } 632 {
633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
755 634
756 j = row1, i = count; 635 if (!IN_RANGE_EXC (row + count, 0, rows))
757 count = -count; 636 scr_blank_screen_mem (temp_buf [row], rstyle);
758 } 637 }
759 638
760 /* Resurrect lines */ 639 for (int row = 0; row < rows; row++)
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 640 ROW(row1 + row) = temp_buf [row];
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 641 }
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
764 if (!spec) /* line length may not equal TermWin.ncol */
765 for (; i--; j++)
766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
767 642
768 return count; 643 return count;
769} 644}
770 645
771/* ------------------------------------------------------------------------- */ 646/* ------------------------------------------------------------------------- */
… …
773 * Add text given in <str> of length <len> to screen struct 648 * Add text given in <str> of length <len> to screen struct
774 */ 649 */
775void 650void
776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 651rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
777{ 652{
653 if (len <= 0) /* sanity */
654 return;
655
778 unsigned char checksel; 656 unsigned char checksel;
779 unicode_t c; 657 unicode_t c;
780 int i, row, last_col; 658 int row, last_col;
781 text_t *stp; 659 const unicode_t *strend = str + len;
782 rend_t *srp;
783
784 if (len <= 0) /* sanity */
785 return;
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 (len--) 692 while (str < strend)
821 { 693 {
822 c = *str++; 694 c = *str++;
823 695
824 if (c < 0x20) 696 if (c < 0x20)
825 switch (c) 697 if (c == C0_LF)
698 {
699 if (!line->is_longer ()) /* XXX: think about this */
700 max_it (line->l, screen.cur.col);
701
702 screen.flags &= ~Screen_WrapNext;
703
704 if (screen.cur.row == screen.bscroll)
705 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
706 else if (screen.cur.row < (nrow - 1))
707 row = ++screen.cur.row;
708
709 line = &ROW(row); /* _must_ refresh */
710 continue;
711 }
712 else if (c == C0_CR)
826 { 713 {
827 case C0_HT: 714 if (!line->is_longer ()) /* XXX: think about this */
828 scr_tab (1, true); 715 max_it (line->l, screen.cur.col);
829 continue;
830 716
831 case C0_LF:
832 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col);
834
835 screen.flags &= ~Screen_WrapNext; 717 screen.flags &= ~Screen_WrapNext;
836
837 if (screen.cur.row == screen.bscroll)
838 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
839 else if (screen.cur.row < (TermWin.nrow - 1))
840 row = (++screen.cur.row) + TermWin.saveLines;
841
842 stp = screen.text[row]; /* _must_ refresh */
843 srp = screen.rend[row]; /* _must_ refresh */
844 continue;
845
846 case C0_CR:
847 if (screen.tlen[row] != -1) /* XXX: think about this */
848 MAX_IT (screen.tlen[row], screen.cur.col);
849
850 screen.flags &= ~Screen_WrapNext;
851 screen.cur.col = 0; 718 screen.cur.col = 0;
852 continue; 719 continue;
720 }
721 else if (c == C0_HT)
722 {
723 scr_tab (1, true);
724 continue;
853 } 725 }
854 726
855 if (checksel /* see if we're writing within selection */ 727 if (checksel /* see if we're writing within selection */
856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 728 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
857 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 729 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
865 CLEAR_SELECTION (); 737 CLEAR_SELECTION ();
866 } 738 }
867 739
868 if (screen.flags & Screen_WrapNext) 740 if (screen.flags & Screen_WrapNext)
869 { 741 {
870 screen.tlen[row] = -1; 742 line->set_is_longer ();
871 743
872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 744 scr_do_wrap ();
873
874 stp = screen.text[row]; /* _must_ refresh */
875 srp = screen.rend[row]; /* _must_ refresh */
876 } 745
746 row = screen.cur.row;
747 line = &ROW(row); /* _must_ refresh */
748 }
749
750 // some utf-8 decoders "decode" surrogate characters: let's fix this.
751 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
752 c = 0xfffd;
877 753
878 // 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
879 // do wcwidth before further replacements, as wcwidth says that line-drawing 755 // do wcwidth before further replacements, as wcwidth might return -1
880 // characters have width -1 (DOH!) on GNU/Linux sometimes. 756 // for the line drawing characters below as they might be invalid in the current
757 // locale.
881 int width = c < 0x100 ? 1 : wcwidth (c); 758 int width = c < 0x100 ? 1 : wcwidth (c);
882 759
883 if (charsets[screen.charset] == '0') // DEC SPECIAL 760 if (charsets[screen.charset] == '0') // DEC SPECIAL
884 { 761 {
885 // vt100 special graphics and line drawing 762 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100 763 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars 764 // 40-5e rxvt extension for extra curses acs chars
888 static uint16_t vt100_0[63] = { // 40 .. 7e 765 static uint16_t vt100_0[62] = { // 41 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 766 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 767 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 768 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 769 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 770 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 771 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 772 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 773 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897 }; 774 };
898 775
899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 776 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
900 { 777 {
901 c = vt100_0[c - 0x40]; 778 c = vt100_0[c - 0x41];
902 width = 1; 779 width = 1; // vt100 line drawing characters are always single-width
903 } 780 }
904 } 781 }
905 782
906 if (screen.flags & Screen_Insert) 783 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT); 784 scr_insdel_chars (width, INSERT);
908 785
909 if (width != 0) 786 if (width != 0)
910 { 787 {
911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3 788#if !UNICODE_3
916 // trim characters we can't store directly :( 789 // trim characters we can't store directly :(
917 if (c >= 0x10000) 790 if (c >= 0x10000)
918# if ENABLE_COMBINING 791# if ENABLE_COMBINING
919 c = rxvt_composite.compose (c); // map to lower 16 bits 792 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
921 c = 0xfffd; 794 c = 0xfffd;
922# endif 795# endif
923#endif 796#endif
924 797
925 // nuke the character at this position, if required 798 // nuke the character at this position, if required
926 if (stp[screen.cur.col] == NOCHAR 799 if (line->t[screen.cur.col] == NOCHAR
927 || (screen.cur.col < TermWin.ncol - 1 800 || (screen.cur.col < ncol - 1
928 && stp[screen.cur.col + 1] == NOCHAR)) 801 && line->t[screen.cur.col + 1] == NOCHAR))
929 { 802 {
930 int col = screen.cur.col; 803 int col = screen.cur.col;
931 804
932 // find begin 805 // find begin
933 while (col > 0 && stp[col] == NOCHAR) 806 while (col > 0 && line->t[col] == NOCHAR)
934 col--; 807 col--;
935 808
936 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 (' '));
937 810
938 // found begin, nuke 811 // found begin, nuke
939 do { 812 do {
940 stp[col] = ' '; 813 line->t[col] = ' ';
941 srp[col] = rend; 814 line->r[col] = rend;
942 col++; 815 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR); 816 } while (col < ncol && line->t[col] == NOCHAR);
944 } 817 }
945 818
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 819 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
820
821 // if the character doesn't fit into the remaining columns...
822 if (screen.cur.col > last_col - width && last_col >= width)
823 {
824 // ...output spaces
825 c = ' ';
826 // and try the same character next loop iteration
827 --str;
828 }
947 829
948 do 830 do
949 { 831 {
950 stp[screen.cur.col] = c; 832 line->t[screen.cur.col] = c;
951 srp[screen.cur.col] = rend; 833 line->r[screen.cur.col] = rend;
952 834
953 if (screen.cur.col < last_col - 1) 835 if (screen.cur.col < last_col - 1)
954 screen.cur.col++; 836 screen.cur.col++;
955 else 837 else
956 { 838 {
957 screen.tlen[row] = last_col; 839 line->l = last_col;
958 if (screen.flags & Screen_Autowrap) 840 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 841 screen.flags |= Screen_WrapNext;
960 break; 842 break;
961 } 843 }
962 844
… …
964 } 846 }
965 while (--width > 0); 847 while (--width > 0);
966 848
967 // pad with spaces when overwriting wide character with smaller one 849 // pad with spaces when overwriting wide character with smaller one
968 if (!width) 850 if (!width)
969 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++)
970 { 852 {
971 stp[c] = ' '; 853 line->t[c] = ' ';
972 srp[c] = rend; 854 line->r[c] = rend;
973 } 855 }
974 } 856 }
975 else if (width == 0) 857 else // width == 0
976 { 858 {
977#if ENABLE_COMBINING 859#if ENABLE_COMBINING
978 // handle combining characters 860 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 861 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 862 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 863 // we don't handle double-width characters nicely yet.
982
983 text_t *tp; 864 text_t *tp;
984 rend_t *rp; 865 rend_t *rp;
985 866
986 if (screen.cur.col > 0) 867 if (screen.cur.col > 0)
987 { 868 {
988 tp = stp + screen.cur.col - 1; 869 tp = line->t + screen.cur.col - 1;
989 rp = srp + screen.cur.col - 1; 870 rp = line->r + screen.cur.col - 1;
990 871
991 while (*tp == NOCHAR && tp > stp) 872 while (*tp == NOCHAR && tp > line->t)
992 tp--, rp--; 873 tp--, rp--;
993 } 874 }
994 else if (screen.cur.row > 0 875 else if (screen.cur.row > 0
995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 876 && ROW(screen.cur.row - 1).is_longer ())
996 { 877 {
997 int line = screen.cur.row - 1 + TermWin.saveLines; 878 line_t *line = &ROW(screen.cur.row - 1);
998 879
999 tp = screen.text[line] + last_col - 1; 880 tp = line->t + last_col - 1;
1000 rp = screen.rend[line] + last_col - 1; 881 rp = line->r + last_col - 1;
1001 882
1002 while (*tp == NOCHAR && tp > screen.text[line]) 883 while (*tp == NOCHAR && tp > line->t)
1003 tp--, rp--; 884 tp--, rp--;
1004 } 885 }
1005 else 886 else
1006 continue; 887 continue;
1007 888
… …
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 895 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1015#endif 896#endif
1016 } 897 }
1017 } 898 }
1018 899
1019 if (screen.tlen[row] != -1) /* XXX: think about this */ 900 if (!line->is_longer ()) /* XXX: think about this */
1020 MAX_IT (screen.tlen[row], screen.cur.col); 901 max_it (line->l, screen.cur.col);
1021 902
1022#ifdef DEBUG_STRICT 903#ifdef DEBUG_STRICT
1023 assert (screen.cur.row >= 0); 904 assert (screen.cur.row >= 0);
1024#else /* drive with your eyes closed */ 905#else /* drive with your eyes closed */
1025 MAX_IT (screen.cur.row, 0); 906 max_it (screen.cur.row, 0);
1026#endif 907#endif
1027} 908}
1028 909
1029/* ------------------------------------------------------------------------- */ 910/* ------------------------------------------------------------------------- */
1030/* 911/*
… …
1039 if (screen.cur.col == 0) 920 if (screen.cur.col == 0)
1040 { 921 {
1041 if (screen.cur.row > 0) 922 if (screen.cur.row > 0)
1042 { 923 {
1043#ifdef TERMCAP_HAS_BW 924#ifdef TERMCAP_HAS_BW
1044 screen.cur.col = TermWin.ncol - 1; 925 screen.cur.col = ncol - 1;
1045 screen.cur.row--; 926 screen.cur.row--;
1046 return; 927 return;
1047#endif 928#endif
1048 } 929 }
1049 } 930 }
… …
1069 950
1070 if (count == 0) 951 if (count == 0)
1071 return; 952 return;
1072 else if (count > 0) 953 else if (count > 0)
1073 { 954 {
1074 int row = TermWin.saveLines + screen.cur.row; 955 int row = screen.cur.row;
1075 text_t *tp = screen.text[row]; 956
1076 rend_t *rp = screen.rend[row]; 957 line_t &l = ROW(row);
1077 rend_t base_rend = rp[i]; 958 rend_t base_rend = l.r[i];
1078 ht &= tp[i] == ' '; 959 ht &= l.t[i] == ' ';
1079 960
1080 for (; ++i < TermWin.ncol; ) 961 for (; ++i < ncol; )
1081 if (tabs[i]) 962 if (tabs[i])
1082 { 963 {
1083 x = i; 964 x = i;
1084 if (!--count) 965 if (!--count)
1085 break; 966 break;
1086 } 967 }
1087 else 968 else
1088 ht &= tp[i] == ' ' 969 ht &= l.t[i] == ' '
1089 && RS_SAME (rp[i], base_rend); 970 && RS_SAME (l.r[i], base_rend);
1090 971
1091 if (count) 972 if (count)
1092 x = TermWin.ncol - 1; 973 x = ncol - 1;
1093 974
1094 // store horizontal tab commands as characters inside the text 975 // store horizontal tab commands as characters inside the text
1095 // buffer so they can be selected and pasted. 976 // buffer so they can be selected and pasted.
1096 if (ht && options & Opt_pastableTabs) 977 if (ht && options & Opt_pastableTabs)
1097 { 978 {
1098 base_rend = SET_FONT (base_rend, 0); 979 base_rend = SET_FONT (base_rend, 0);
1099 980
1100 if (screen.tlen[row] != -1) /* XXX: think about this */ 981 if (!l.is_longer ()) /* XXX: think about this */
1101 MAX_IT (screen.tlen[row], x); 982 max_it (l.l, x);
1102 983
1103 i = screen.cur.col; 984 i = screen.cur.col;
1104 985
1105 tp[i] = '\t'; 986 l.t[i] = '\t';
1106 rp[i] = base_rend; 987 l.r[i] = base_rend;
1107 988
1108 while (++i < x) 989 while (++i < x)
1109 { 990 {
1110 tp[i] = NOCHAR; 991 l.t[i] = NOCHAR;
1111 rp[i] = base_rend; 992 l.r[i] = base_rend;
1112 } 993 }
1113 } 994 }
1114 } 995 }
1115 else /* if (count < 0) */ 996 else /* if (count < 0) */
1116 { 997 {
… …
1142rxvt_term::scr_backindex () 1023rxvt_term::scr_backindex ()
1143{ 1024{
1144 if (screen.cur.col > 0) 1025 if (screen.cur.col > 0)
1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1026 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1146 else 1027 else
1147 {
1148 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1149 return; /* um, yeah? */
1150
1151 scr_insdel_chars (1, INSERT); 1028 scr_insdel_chars (1, INSERT);
1152 }
1153} 1029}
1154#endif 1030#endif
1155/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
1156/* 1032/*
1157 * Process DEC Forward Index 1033 * Process DEC Forward Index
… …
1161 */ 1037 */
1162#if ENABLE_FRILLS 1038#if ENABLE_FRILLS
1163void 1039void
1164rxvt_term::scr_forwardindex () 1040rxvt_term::scr_forwardindex ()
1165{ 1041{
1166 int row; 1042 int row;
1167 1043
1168 if (screen.cur.col < TermWin.ncol - 1) 1044 if (screen.cur.col < ncol - 1)
1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1045 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1170 else 1046 else
1171 { 1047 {
1172 row = screen.cur.row + TermWin.saveLines; 1048 row = screen.cur.row;
1173 1049
1174 if (screen.tlen[row] == 0) 1050 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1175 return; /* um, yeah? */ 1051 ROW(row).l = ncol;
1176 else if (screen.tlen[row] == -1)
1177 screen.tlen[row] = TermWin.ncol;
1178 1052
1179 scr_gotorc (0, 0, R_RELATIVE); 1053 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1054 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1055 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1056 }
1183} 1057}
1184#endif 1058#endif
1185 1059
1186/* ------------------------------------------------------------------------- */ 1060/* ------------------------------------------------------------------------- */
… …
1192{ 1066{
1193 want_refresh = 1; 1067 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1068 ZERO_SCROLLBACK ();
1195 1069
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1070 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1071 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1199 1072
1200 screen.flags &= ~Screen_WrapNext; 1073 screen.flags &= ~Screen_WrapNext;
1201 1074
1202 if (relative & R_RELATIVE) 1075 if (relative & R_RELATIVE)
1203 { 1076 {
… …
1221 else 1094 else
1222 { 1095 {
1223 if (screen.flags & Screen_Relative) 1096 if (screen.flags & Screen_Relative)
1224 { /* relative origin mode */ 1097 { /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1098 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1099 min_it (screen.cur.row, screen.bscroll);
1227 } 1100 }
1228 else 1101 else
1229 screen.cur.row = row; 1102 screen.cur.row = row;
1230 } 1103 }
1231 1104
1232 MAX_IT (screen.cur.row, 0); 1105 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1234} 1106}
1235 1107
1236/* ------------------------------------------------------------------------- */ 1108/* ------------------------------------------------------------------------- */
1237/* 1109/*
1238 * direction should be UP or DN 1110 * direction should be UP or DN
… …
1249 1121
1250 screen.flags &= ~Screen_WrapNext; 1122 screen.flags &= ~Screen_WrapNext;
1251 1123
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1124 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1125 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1126 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1127 else
1256 screen.cur.row += dirn; 1128 screen.cur.row += dirn;
1257 1129
1258 MAX_IT (screen.cur.row, 0); 1130 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1260 selection_check (0); 1131 selection_check (0);
1261} 1132}
1262 1133
1263/* ------------------------------------------------------------------------- */ 1134/* ------------------------------------------------------------------------- */
1264/* 1135/*
… …
1275 want_refresh = 1; 1146 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1147 ZERO_SCROLLBACK ();
1277 1148
1278 selection_check (1); 1149 selection_check (1);
1279 1150
1280 row = TermWin.saveLines + screen.cur.row; 1151 row = screen.cur.row;
1152
1281 switch (mode) 1153 switch (mode)
1282 { 1154 {
1283 case 0: /* erase to end of line */ 1155 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1156 col = screen.cur.col;
1285 num = TermWin.ncol - col; 1157 num = ncol - col;
1286 MIN_IT (screen.tlen[row], (int16_t)col); 1158 min_it (ROW(row).l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1161 CLEAR_SELECTION ();
1290 break; 1162 break;
1291 case 1: /* erase to beginning of line */ 1163 case 1: /* erase to beginning of line */
… …
1295 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1167 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1296 CLEAR_SELECTION (); 1168 CLEAR_SELECTION ();
1297 break; 1169 break;
1298 case 2: /* erase whole line */ 1170 case 2: /* erase whole line */
1299 col = 0; 1171 col = 0;
1300 num = TermWin.ncol; 1172 num = ncol;
1301 screen.tlen[row] = 0; 1173 ROW(row).l = 0;
1302 if (selection.beg.row <= screen.cur.row 1174 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1175 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1176 CLEAR_SELECTION ();
1305 break; 1177 break;
1306 default: 1178 default:
1307 return; 1179 return;
1308 } 1180 }
1309 1181
1310 if (screen.text[row]) 1182 scr_blank_line (ROW(row), col, num, rstyle);
1311 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1312 else
1313 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1314} 1183}
1315 1184
1316/* ------------------------------------------------------------------------- */ 1185/* ------------------------------------------------------------------------- */
1317/* 1186/*
1318 * Erase part of whole of the screen 1187 * Erase part of whole of the screen
… …
1322 */ 1191 */
1323void 1192void
1324rxvt_term::scr_erase_screen (int mode) 1193rxvt_term::scr_erase_screen (int mode)
1325{ 1194{
1326 int num; 1195 int num;
1327 int32_t row, row_offset; 1196 int32_t row;
1328 rend_t ren; 1197 rend_t ren;
1329 XGCValues gcvalue; 1198 XGCValues gcvalue;
1330 1199
1331 want_refresh = 1; 1200 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1201 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)TermWin.saveLines;
1335 1202
1336 switch (mode) 1203 switch (mode)
1337 { 1204 {
1338 case 0: /* erase to end of screen */ 1205 case 0: /* erase to end of screen */
1339 selection_check (1); 1206 selection_check (1);
1340 scr_erase_line (0); 1207 scr_erase_line (0);
1341 row = screen.cur.row + 1; /* possible OOB */ 1208 row = screen.cur.row + 1; /* possible OOB */
1342 num = TermWin.nrow - row; 1209 num = nrow - row;
1343 break; 1210 break;
1344 case 1: /* erase to beginning of screen */ 1211 case 1: /* erase to beginning of screen */
1345 selection_check (3); 1212 selection_check (3);
1346 scr_erase_line (1); 1213 scr_erase_line (1);
1347 row = 0; 1214 row = 0;
1348 num = screen.cur.row; 1215 num = screen.cur.row;
1349 break; 1216 break;
1350 case 2: /* erase whole screen */ 1217 case 2: /* erase whole screen */
1351 selection_check (3); 1218 selection_check (3);
1352 row = 0; 1219 row = 0;
1353 num = TermWin.nrow; 1220 num = nrow;
1354 break; 1221 break;
1355 default: 1222 default:
1356 return; 1223 return;
1357 } 1224 }
1358 1225
… …
1360 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1227 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1361 || (selection.end.row >= row 1228 || (selection.end.row >= row
1362 && selection.end.row <= row + num))) 1229 && selection.end.row <= row + num)))
1363 CLEAR_SELECTION (); 1230 CLEAR_SELECTION ();
1364 1231
1365 if (row >= TermWin.nrow) /* Out Of Bounds */ 1232 if (row >= nrow) /* Out Of Bounds */
1366 return; 1233 return;
1367 1234
1368 MIN_IT (num, (TermWin.nrow - row)); 1235 min_it (num, nrow - row);
1369 1236
1370 if (rstyle & (RS_RVid | RS_Uline)) 1237 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1238 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1239 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1240 {
… …
1376 } 1243 }
1377 else 1244 else
1378 { 1245 {
1379 ren = rstyle & (RS_fgMask | RS_bgMask); 1246 ren = rstyle & (RS_fgMask | RS_bgMask);
1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1247 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1248 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1382 ERASE_ROWS (row, num); 1249 ERASE_ROWS (row, num);
1383 gcvalue.foreground = pix_colors[Color_fg]; 1250 gcvalue.foreground = pix_colors[Color_fg];
1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1251 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1252 }
1386 1253
1387 for (; num--; row++) 1254 for (; num--; row++)
1388 { 1255 {
1389 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1256 scr_blank_screen_mem (ROW (row), rstyle);
1390 screen.tlen[row + row_offset] = 0; 1257 ROW (row).l = 0;
1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1258 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1392 } 1259 }
1393} 1260}
1394 1261
1262#if ENABLE_FRILLS
1395void 1263void
1396rxvt_term::scr_erase_savelines () 1264rxvt_term::scr_erase_savelines ()
1397{ 1265{
1398 want_refresh = 1; 1266 want_refresh = 1;
1399 ZERO_SCROLLBACK (); 1267 ZERO_SCROLLBACK ();
1400 1268
1401 for (int i = 0; i < TermWin.saveLines; ++i) 1269 nsaved = 0;
1402 if (screen.text [i])
1403 {
1404 screen.tlen[i] = 0;
1405 scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
1406 }
1407} 1270}
1271#endif
1408 1272
1409/* ------------------------------------------------------------------------- */ 1273/* ------------------------------------------------------------------------- */
1410/* 1274/*
1411 * Fill the screen with `E's 1275 * Fill the screen with `E's
1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1276 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1413 */ 1277 */
1414void 1278void
1415rxvt_term::scr_E () 1279rxvt_term::scr_E ()
1416{ 1280{
1417 int i, j, k;
1418 rend_t *r1, fs; 1281 rend_t fs;
1419 1282
1420 want_refresh = 1; 1283 want_refresh = 1;
1421 ZERO_SCROLLBACK (); 1284 ZERO_SCROLLBACK ();
1422 1285
1423 num_scr_allow = 0; 1286 num_scr_allow = 0;
1424 selection_check (3); 1287 selection_check (3);
1425 1288
1426 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1289 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1290 for (int row = nrow; row--; )
1428 { 1291 {
1429 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1292 line_t &line = ROW(row);
1293
1430 fill_text (screen.text[k], 'E', TermWin.ncol); 1294 fill_text (line.t, 'E', ncol);
1431 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1295 rend_t *r1 = line.r;
1296
1297 for (int j = ncol; j--; )
1432 *r1++ = fs; 1298 *r1++ = fs;
1299
1300 line.l = ncol; /* make the `E's selectable */
1433 } 1301 }
1434} 1302}
1435 1303
1436/* ------------------------------------------------------------------------- */ 1304/* ------------------------------------------------------------------------- */
1437/* 1305/*
… …
1458 count = end; 1326 count = end;
1459 } 1327 }
1460 1328
1461 scr_do_wrap (); 1329 scr_do_wrap ();
1462 1330
1463 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1331 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1464} 1332}
1465 1333
1466/* ------------------------------------------------------------------------- */ 1334/* ------------------------------------------------------------------------- */
1467/* 1335/*
1468 * Insert/Delete <count> characters from the current position 1336 * Insert/Delete <count> characters from the current position
… …
1470void 1338void
1471rxvt_term::scr_insdel_chars (int count, int insdel) 1339rxvt_term::scr_insdel_chars (int count, int insdel)
1472{ 1340{
1473 int col, row; 1341 int col, row;
1474 rend_t tr; 1342 rend_t tr;
1475 text_t *stp;
1476 rend_t *srp;
1477 int16_t *slp;
1478 1343
1479 want_refresh = 1; 1344 want_refresh = 1;
1480 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1481 1346
1482 if (count <= 0) 1347 if (count <= 0)
1483 return; 1348 return;
1484 1349
1485 scr_do_wrap (); 1350 scr_do_wrap ();
1486 1351
1487 selection_check (1); 1352 selection_check (1);
1488 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1353 min_it (count, ncol - screen.cur.col);
1489 1354
1490 row = screen.cur.row + TermWin.saveLines;
1491
1492 stp = screen.text[row];
1493 srp = screen.rend[row]; 1355 row = screen.cur.row;
1494 slp = &screen.tlen[row]; 1356
1357 line_t *line = &ROW(row);
1495 1358
1496 switch (insdel) 1359 switch (insdel)
1497 { 1360 {
1498 case INSERT: 1361 case INSERT:
1499 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1362 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1500 { 1363 {
1501 stp[col] = stp[col - count]; 1364 line->t[col] = line->t[col - count];
1502 srp[col] = srp[col - count]; 1365 line->r[col] = line->r[col - count];
1503 } 1366 }
1504 1367
1505 if (*slp != -1) 1368 if (!line->is_longer ())
1506 { 1369 {
1507 *slp += count; 1370 line->l += count;
1508 MIN_IT (*slp, TermWin.ncol); 1371 min_it (line->l, ncol);
1509 } 1372 }
1510 1373
1511 if (selection.op && current_screen == selection.screen 1374 if (selection.op && current_screen == selection.screen
1512 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1375 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513 { 1376 {
1514 if (selection.end.row != screen.cur.row 1377 if (selection.end.row != screen.cur.row
1515 || (selection.end.col + count >= TermWin.ncol)) 1378 || (selection.end.col + count >= ncol))
1516 CLEAR_SELECTION (); 1379 CLEAR_SELECTION ();
1517 else 1380 else
1518 { /* shift selection */ 1381 { /* shift selection */
1519 selection.beg.col += count; 1382 selection.beg.col += count;
1520 selection.mark.col += count; /* XXX: yes? */ 1383 selection.mark.col += count; /* XXX: yes? */
1521 selection.end.col += count; 1384 selection.end.col += count;
1522 } 1385 }
1523 } 1386 }
1524 1387
1525 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1388 scr_blank_line (*line, screen.cur.col, count, rstyle);
1526 (unsigned int)count, rstyle);
1527 break; 1389 break;
1528 1390
1529 case ERASE: 1391 case ERASE:
1530 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1392 screen.cur.col += count; /* don't worry if > ncol */
1531 selection_check (1); 1393 selection_check (1);
1532 screen.cur.col -= count; 1394 screen.cur.col -= count;
1533 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1395 scr_blank_line (*line, screen.cur.col, count, rstyle);
1534 (unsigned int)count, rstyle);
1535 break; 1396 break;
1536 1397
1537 case DELETE: 1398 case DELETE:
1538 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1399 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1539 1400
1540 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1401 for (col = screen.cur.col; (col + count) < ncol; col++)
1541 { 1402 {
1542 stp[col] = stp[col + count]; 1403 line->t[col] = line->t[col + count];
1543 srp[col] = srp[col + count]; 1404 line->r[col] = line->r[col + count];
1544 } 1405 }
1545 1406
1546 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1407 scr_blank_line (*line, ncol - count, count, tr);
1547 (unsigned int)count, tr);
1548 1408
1549 if (*slp == -1) /* break line continuation */ 1409 if (line->is_longer ()) /* break line continuation */
1550 *slp = TermWin.ncol; 1410 line->l = ncol;
1551 1411
1552 *slp -= count; 1412 line->l = max (line->l - count, 0);
1553 MAX_IT (*slp, 0);
1554 1413
1555 if (selection.op && current_screen == selection.screen 1414 if (selection.op && current_screen == selection.screen
1556 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1415 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1557 { 1416 {
1558 if (selection.end.row != screen.cur.row 1417 if (selection.end.row != screen.cur.row
1559 || (screen.cur.col >= selection.beg.col - count) 1418 || (screen.cur.col >= selection.beg.col - count)
1560 || selection.end.col >= TermWin.ncol) 1419 || selection.end.col >= ncol)
1561 CLEAR_SELECTION (); 1420 CLEAR_SELECTION ();
1562 else 1421 else
1563 { 1422 {
1564 /* shift selection */ 1423 /* shift selection */
1565 selection.beg.col -= count; 1424 selection.beg.col -= count;
… …
1578 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1437 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1579 */ 1438 */
1580void 1439void
1581rxvt_term::scr_scroll_region (int top, int bot) 1440rxvt_term::scr_scroll_region (int top, int bot)
1582{ 1441{
1583 MAX_IT (top, 0); 1442 max_it (top, 0);
1584 MIN_IT (bot, (int)TermWin.nrow - 1); 1443 min_it (bot, nrow - 1);
1585 1444
1586 if (top > bot) 1445 if (top > bot)
1587 return; 1446 return;
1588 1447
1589 screen.tscroll = top; 1448 screen.tscroll = top;
… …
1668 */ 1527 */
1669void 1528void
1670rxvt_term::scr_set_tab (int mode) 1529rxvt_term::scr_set_tab (int mode)
1671{ 1530{
1672 if (mode < 0) 1531 if (mode < 0)
1673 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1532 memset (tabs, 0, ncol * sizeof (char));
1674 else if (screen.cur.col < TermWin.ncol) 1533 else if (screen.cur.col < ncol)
1675 tabs[screen.cur.col] = (mode ? 1 : 0); 1534 tabs[screen.cur.col] = (mode ? 1 : 0);
1676} 1535}
1677 1536
1678/* ------------------------------------------------------------------------- */ 1537/* ------------------------------------------------------------------------- */
1679/* 1538/*
… …
1687 XGCValues gcvalue; 1546 XGCValues gcvalue;
1688 1547
1689 if (rvideo != mode) 1548 if (rvideo != mode)
1690 { 1549 {
1691 rvideo = mode; 1550 rvideo = mode;
1692 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1551 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1693#if XPM_BACKGROUND 1552#if XPM_BACKGROUND
1694 if (bgPixmap.pixmap == None) 1553 if (bgPixmap.pixmap == None)
1695#endif 1554#endif
1696#if TRANSPARENT 1555#if TRANSPARENT
1697 if (! (options & Opt_transparent) || am_transparent == 0) 1556 if (! (options & Opt_transparent) || am_transparent == 0)
1698#endif 1557#endif
1699 XSetWindowBackground (display->display, TermWin.vt, 1558 XSetWindowBackground (display->display, vt,
1700 pix_colors[Color_bg]); 1559 pix_colors[Color_bg]);
1701 1560
1702 gcvalue.foreground = pix_colors[Color_fg]; 1561 gcvalue.foreground = pix_colors[Color_fg];
1703 gcvalue.background = pix_colors[Color_bg]; 1562 gcvalue.background = pix_colors[Color_bg];
1704 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1563 XChangeGC (display->display, gc, GCBackground | GCForeground,
1705 &gcvalue); 1564 &gcvalue);
1706 scr_clear (); 1565 scr_clear ();
1707 scr_touch (true); 1566 scr_touch (true);
1708 } 1567 }
1709} 1568}
… …
1790bool 1649bool
1791rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1650rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1792{ 1651{
1793 bool found = false; 1652 bool found = false;
1794 1653
1795 for (int i = 0; i < TermWin.nrow; i++) 1654 for (int i = 0; i < nrow; i++)
1796 { 1655 {
1797 int col = 0; 1656 int col = 0;
1798 rend_t *drp = drawn_rend [i]; 1657 rend_t *drp = drawn_buf[i].r;
1799 1658
1800 for (; col < TermWin.ncol; col++, drp++) 1659 for (; col < ncol; col++, drp++)
1801 if ((*drp & mask) == value) 1660 if ((*drp & mask) == value)
1802 { 1661 {
1803 found = true; 1662 found = true;
1804 *drp = ~value; 1663 *drp = ~value;
1805 } 1664 }
… …
1816 PART_END, 1675 PART_END,
1817 RC_COUNT 1676 RC_COUNT
1818}; 1677};
1819 1678
1820void 1679void
1821rxvt_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)
1822{ 1681{
1823 int i; 1682 int i;
1824 row_col_t rc[RC_COUNT]; 1683 row_col_t rc[RC_COUNT];
1825 1684
1826 if (drawn_text == NULL) /* sanity check */ 1685 if (!drawn_buf) /* sanity check */
1827 return; 1686 return;
1828 1687
1829#ifndef NO_SLOW_LINK_SUPPORT 1688#ifndef NO_SLOW_LINK_SUPPORT
1830 if (refresh_type == FAST_REFRESH && !display->is_local) 1689 if (refresh_type == FAST_REFRESH && !display->is_local)
1831 { 1690 {
1832 y = 0; 1691 y = 0;
1833 height = TermWin.height; 1692 eheight = height;
1834 } 1693 }
1835#endif 1694#endif
1836 1695
1837#ifdef DEBUG_STRICT 1696#ifdef DEBUG_STRICT
1838 x = max (x, 0); 1697#if 0
1839 x = min (x, (int)TermWin.width); 1698 // that's not debugging //TODO //FIXME
1840 y = max (y, 0); 1699 clamp_it (x, 0, width);
1841 y = min (y, (int)TermWin.height); 1700 clamp_it (y, 0, height);
1701#endif
1842#endif 1702#endif
1843 1703
1844 /* round down */ 1704 /* round down */
1845 rc[PART_BEG].col = Pixel2Col (x); 1705 rc[PART_BEG].col = Pixel2Col (x);
1846 rc[PART_BEG].row = Pixel2Row (y); 1706 rc[PART_BEG].row = Pixel2Row (y);
1847 /* round up */ 1707 /* round up */
1848 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1708 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1849 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1709 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1850 1710
1851 /* sanity checks */ 1711 /* sanity checks */
1852 for (i = PART_BEG; i < RC_COUNT; i++) 1712 for (i = PART_BEG; i < RC_COUNT; i++)
1853 { 1713 {
1854 MIN_IT (rc[i].col, TermWin.ncol - 1); 1714 min_it (rc[i].col, ncol - 1);
1855 MIN_IT (rc[i].row, TermWin.nrow - 1); 1715 min_it (rc[i].row, nrow - 1);
1856 } 1716 }
1857 1717
1858 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++)
1859 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);
1860 1720
1861 if (refresh) 1721 if (refresh)
1862 scr_refresh (SLOW_REFRESH); 1722 scr_refresh (SLOW_REFRESH);
1863} 1723}
1864 1724
… …
1867 * Refresh the entire screen 1727 * Refresh the entire screen
1868 */ 1728 */
1869void 1729void
1870rxvt_term::scr_touch (bool refresh) 1730rxvt_term::scr_touch (bool refresh)
1871{ 1731{
1872 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1732 scr_expose (0, 0, width, height, refresh);
1873} 1733}
1874 1734
1875/* ------------------------------------------------------------------------- */ 1735/* ------------------------------------------------------------------------- */
1876/* 1736/*
1877 * 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
… …
1881rxvt_term::scr_move_to (int y, int len) 1741rxvt_term::scr_move_to (int y, int len)
1882{ 1742{
1883 long p = 0; 1743 long p = 0;
1884 unsigned int oldviewstart; 1744 unsigned int oldviewstart;
1885 1745
1886 oldviewstart = TermWin.view_start; 1746 oldviewstart = view_start;
1887 1747
1888 if (y < len) 1748 if (y < len)
1889 { 1749 {
1890 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1750 p = (nrow + nsaved) * (len - y) / len;
1891 p -= (long) (TermWin.nrow - 1); 1751 p -= (long) (nrow - 1);
1892 p = max (p, 0); 1752 p = max (p, 0);
1893 } 1753 }
1894 1754
1895 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1755 view_start = (unsigned int)min (p, nsaved);
1896 1756
1897 return scr_changeview (oldviewstart); 1757 return scr_changeview (oldviewstart);
1898} 1758}
1899 1759
1900/* ------------------------------------------------------------------------- */ 1760/* ------------------------------------------------------------------------- */
… …
1906rxvt_term::scr_page (enum page_dirn direction, int nlines) 1766rxvt_term::scr_page (enum page_dirn direction, int nlines)
1907{ 1767{
1908 int n; 1768 int n;
1909 unsigned int oldviewstart; 1769 unsigned int oldviewstart;
1910 1770
1911 oldviewstart = TermWin.view_start; 1771 oldviewstart = view_start;
1912 1772
1913 if (direction == UP) 1773 if (direction == UP)
1914 { 1774 {
1915 n = TermWin.view_start + nlines; 1775 n = view_start + nlines;
1916 TermWin.view_start = min (n, TermWin.nscrolled); 1776 view_start = min (n, nsaved);
1917 } 1777 }
1918 else 1778 else
1919 { 1779 {
1920 n = TermWin.view_start - nlines; 1780 n = view_start - nlines;
1921 TermWin.view_start = max (n, 0); 1781 view_start = max (n, 0);
1922 } 1782 }
1923 1783
1924 return scr_changeview (oldviewstart); 1784 return scr_changeview (oldviewstart);
1925} 1785}
1926 1786
1927int 1787int
1928rxvt_term::scr_changeview (unsigned int oldviewstart) 1788rxvt_term::scr_changeview (unsigned int oldviewstart)
1929{ 1789{
1930 if (TermWin.view_start != oldviewstart) 1790 if (view_start != oldviewstart)
1931 { 1791 {
1932 want_refresh = 1; 1792 want_refresh = 1;
1933 num_scr -= (TermWin.view_start - oldviewstart); 1793 num_scr -= (view_start - oldviewstart);
1934 } 1794 }
1935 1795
1936 return (int) (TermWin.view_start - oldviewstart); 1796 return (int) (view_start - oldviewstart);
1937} 1797}
1938 1798
1939/* ------------------------------------------------------------------------- */ 1799/* ------------------------------------------------------------------------- */
1940void 1800void
1941rxvt_term::scr_bell () 1801rxvt_term::scr_bell ()
1942{ 1802{
1943#ifndef NO_BELL 1803#ifndef NO_BELL
1804
1944# ifndef NO_MAPALERT 1805# ifndef NO_MAPALERT
1945# ifdef MAPALERT_OPTION 1806# ifdef MAPALERT_OPTION
1946 if (options & Opt_mapAlert) 1807 if (options & Opt_mapAlert)
1947# endif 1808# endif
1948 XMapWindow (display->display, TermWin.parent[0]); 1809 XMapWindow (display->display, parent[0]);
1949# endif 1810# endif
1811
1950 if (options & Opt_visualBell) 1812 if (options & Opt_visualBell)
1951 { 1813 {
1952 scr_rvideo_mode (!rvideo); /* refresh also done */ 1814 scr_rvideo_mode (!rvideo); /* refresh also done */
1815 rxvt_usleep (VISUAL_BELL_DURATION);
1953 scr_rvideo_mode (!rvideo); /* refresh also done */ 1816 scr_rvideo_mode (!rvideo); /* refresh also done */
1954 } 1817 }
1955 else 1818 else
1956 XBell (display->display, 0); 1819 XBell (display->display, 0);
1820
1957#endif 1821#endif
1958} 1822}
1959 1823
1960/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1961/* ARGSUSED */ 1825/* ARGSUSED */
1962void 1826void
1963rxvt_term::scr_printscreen (int fullhist) 1827rxvt_term::scr_printscreen (int fullhist)
1964{ 1828{
1965#ifdef PRINTPIPE 1829#ifdef PRINTPIPE
1966 int i, r1, nrows, row_offset; 1830 int nrows, row_start;
1967 FILE *fd; 1831 FILE *fd;
1968 1832
1969 if ((fd = popen_printer ()) == NULL) 1833 if ((fd = popen_printer ()) == NULL)
1970 return; 1834 return;
1971 1835
1972 nrows = TermWin.nrow;
1973 row_offset = TermWin.saveLines;
1974
1975 if (!fullhist) 1836 if (fullhist)
1976 row_offset -= TermWin.view_start; 1837 {
1838 nrows = nrow + nsaved;
1839 row_start = -nsaved;
1840 }
1977 else 1841 else
1978 { 1842 {
1979 nrows += TermWin.nscrolled; 1843 nrows = nrow;
1980 row_offset -= TermWin.nscrolled; 1844 row_start = -view_start;
1981 } 1845 }
1982 1846
1983 wctomb (0, 0); 1847 wctomb (0, 0);
1984 1848
1985 for (r1 = 0; r1 < nrows; r1++) 1849 for (int r1 = 0; r1 < nrows; r1++)
1986 { 1850 {
1987 text_t *tp = screen.text[r1 + row_offset]; 1851 text_t *tp = ROW(r1).t;
1988 int len = screen.tlen[r1 + row_offset]; 1852 int len = ROW(r1).l;
1989 1853
1990 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1854 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1991 { 1855 {
1992 char mb[MB_LEN_MAX]; 1856 char mb[MB_LEN_MAX];
1993 text_t t = *tp++; 1857 text_t t = *tp++;
1994 if (t == NOCHAR) 1858 if (t == NOCHAR)
1995 continue; 1859 continue;
… …
2016/* 1880/*
2017 * Refresh the screen 1881 * Refresh the screen
2018 * drawn_text/drawn_rend contain the screen information before the update. 1882 * drawn_text/drawn_rend contain the screen information before the update.
2019 * screen.text/screen.rend contain what the screen will change to. 1883 * screen.text/screen.rend contain what the screen will change to.
2020 */ 1884 */
2021
2022#define FONT_WIDTH(X, Y) \
2023 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2024#define FONT_RBEAR(X, Y) \
2025 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2026#define FONT_LBEAR(X, Y) \
2027 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2028#define IS_FONT_CHAR(X, Y) \
2029 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2030
2031void 1885void
2032rxvt_term::scr_refresh (unsigned char refresh_type) 1886rxvt_term::scr_refresh (unsigned char refresh_type)
2033{ 1887{
2034 unsigned char must_clear, /* use draw_string not draw_image_string */ 1888 unsigned char must_clear, /* use draw_string not draw_image_string */
2035 showcursor; /* show the cursor */ 1889 showcursor; /* show the cursor */
2036 int16_t col, row, /* column/row we're processing */ 1890 int16_t col, row, /* column/row we're processing */
2037 ocrow; /* old cursor row */ 1891 ocrow; /* old cursor row */
2038 int i, /* tmp */ 1892 int i; /* tmp */
2039 row_offset; /* basic offset in screen structure */
2040#ifndef NO_CURSORCOLOR 1893#ifndef NO_CURSORCOLOR
2041 rend_t cc1; /* store colours at cursor position (s) */ 1894 rend_t cc1; /* store colours at cursor position (s) */
2042#endif 1895#endif
2043 rend_t *crp; // cursor rendition pointer 1896 rend_t *crp; // cursor rendition pointer
2044 1897
2045 want_refresh = 0; /* screen is current */ 1898 want_refresh = 0; /* screen is current */
2046 1899
2047 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1900 if (refresh_type == NO_REFRESH || !mapped)
2048 return; 1901 return;
2049 1902
2050 /* 1903 /*
2051 * A: set up vars 1904 * A: set up vars
2052 */ 1905 */
2053 must_clear = 0; 1906 must_clear = 0;
2054 refresh_count = 0; 1907 refresh_count = 0;
2055 1908
2056 row_offset = TermWin.saveLines - TermWin.view_start;
2057
2058#if XPM_BACKGROUND 1909#if XPM_BACKGROUND
2059 must_clear |= (bgPixmap.pixmap != None); 1910 must_clear |= bgPixmap.pixmap != None;
2060#endif 1911#endif
2061#if TRANSPARENT 1912#if TRANSPARENT
2062 must_clear |= ((options & Opt_transparent) && am_transparent); 1913 must_clear |= (options & Opt_transparent) && am_transparent;
2063#endif 1914#endif
2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1915 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2065 1916
2066 /* 1917 /*
2067 * B: reverse any characters which are selected 1918 * B: reverse any characters which are selected
… …
2084 1935
2085 if (showcursor) 1936 if (showcursor)
2086 { 1937 {
2087 int col = screen.cur.col; 1938 int col = screen.cur.col;
2088 1939
2089 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 1940 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090 col--; 1941 col--;
2091 1942
2092 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 1943 crp = &ROW(screen.cur.row).r[col];
2093 1944
2094 if (showcursor && TermWin.focus) 1945 if (showcursor && focus)
2095 { 1946 {
1947 if (options & Opt_cursorUnderline)
1948 *crp ^= RS_Uline;
1949 else
1950 {
2096 *crp ^= RS_RVid; 1951 *crp ^= RS_RVid;
1952
2097#ifndef NO_CURSORCOLOR 1953#ifndef NO_CURSORCOLOR
2098 cc1 = *crp & (RS_fgMask | RS_bgMask); 1954 cc1 = *crp & (RS_fgMask | RS_bgMask);
2099 if (ISSET_PIXCOLOR (Color_cursor)) 1955 if (ISSET_PIXCOLOR (Color_cursor))
2100 ccol1 = Color_cursor; 1956 ccol1 = Color_cursor;
2101 else 1957 else
2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1958#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2103 ccol1 = GET_FGCOLOR (rstyle); 1959 ccol1 = GET_FGCOLOR (rstyle);
2104#else 1960#else
2105 ccol1 = Color_fg; 1961 ccol1 = Color_fg;
2106#endif 1962#endif
2107 if (ISSET_PIXCOLOR (Color_cursor2)) 1963 if (ISSET_PIXCOLOR (Color_cursor2))
2108 ccol2 = Color_cursor2; 1964 ccol2 = Color_cursor2;
2109 else 1965 else
2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1966#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2111 ccol2 = GET_BGCOLOR (rstyle); 1967 ccol2 = GET_BGCOLOR (rstyle);
2112#else 1968#else
2113 ccol2 = Color_bg; 1969 ccol2 = Color_bg;
2114#endif 1970#endif
2115 *crp = SET_FGCOLOR (*crp, ccol1); 1971 *crp = SET_FGCOLOR (*crp, ccol1);
2116 *crp = SET_BGCOLOR (*crp, ccol2); 1972 *crp = SET_BGCOLOR (*crp, ccol2);
2117#endif 1973#endif
1974 }
2118 } 1975 }
2119 } 1976 }
2120 1977
2121 /* make sure no outline cursor is left around */ 1978 /* make sure no outline cursor is left around */
2122 setoldcursor = 0; 1979 setoldcursor = 0;
2123 if (ocrow != -1) 1980 if (ocrow != -1)
2124 { 1981 {
2125 if (screen.cur.row + TermWin.view_start != ocrow 1982 if (screen.cur.row + view_start != ocrow
2126 || screen.cur.col != oldcursor.col) 1983 || screen.cur.col != oldcursor.col)
2127 { 1984 {
2128 if (ocrow < TermWin.nrow 1985 if (ocrow < nrow
2129 && oldcursor.col < TermWin.ncol) 1986 && oldcursor.col < ncol)
2130 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 1987 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2131 1988
2132 if (TermWin.focus || !showcursor) 1989 if (focus || !showcursor)
2133 oldcursor.row = -1; 1990 oldcursor.row = -1;
2134 else 1991 else
2135 setoldcursor = 1; 1992 setoldcursor = 1;
2136 } 1993 }
2137 } 1994 }
2138 else if (!TermWin.focus) 1995 else if (!focus)
2139 setoldcursor = 1; 1996 setoldcursor = 1;
2140 1997
2141 if (setoldcursor) 1998 if (setoldcursor)
2142 { 1999 {
2143 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2000 if (screen.cur.row + view_start >= nrow)
2144 oldcursor.row = -1; 2001 oldcursor.row = -1;
2145 else 2002 else
2146 { 2003 {
2147 oldcursor.row = screen.cur.row + TermWin.view_start; 2004 oldcursor.row = screen.cur.row + view_start;
2148 oldcursor.col = screen.cur.col; 2005 oldcursor.col = screen.cur.col;
2149 } 2006 }
2150 } 2007 }
2151 } 2008 }
2152 2009
2153#if ENABLE_OVERLAY 2010#if ENABLE_OVERLAY
2154 scr_swap_overlay (); 2011 scr_swap_overlay ();
2155#endif 2012#endif
2156
2157 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2158 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2159 2013
2160#ifndef NO_SLOW_LINK_SUPPORT 2014#ifndef NO_SLOW_LINK_SUPPORT
2161 /* 2015 /*
2162 * D: CopyArea pass - very useful for slower links 2016 * D: CopyArea pass - very useful for slower links
2163 * This has been deliberately kept simple. 2017 * This has been deliberately kept simple.
2164 */ 2018 */
2165 i = num_scr; 2019 i = num_scr;
2166 if (!display->is_local 2020 if (!display->is_local
2167 && refresh_type == FAST_REFRESH && num_scr_allow && i 2021 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2168 && abs (i) < TermWin.nrow && !must_clear) 2022 && abs (num_scr) < nrow && !must_clear)
2169 { 2023 {
2170 int16_t nits; 2024 int16_t nits;
2171 int j; 2025 int j;
2172 int len, wlen; 2026 int len, wlen;
2173 2027
2174 j = TermWin.nrow; 2028 j = nrow;
2175 wlen = len = -1; 2029 wlen = len = -1;
2176 row = i > 0 ? 0 : j - 1; 2030 row = i > 0 ? 0 : j - 1;
2177 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2031 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2178 { 2032 {
2179 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2033 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2180 { 2034 {
2181 text_t *stp = screen.text[row + row_offset]; 2035 line_t s = ROW(row - view_start);
2182 rend_t *srp = screen.rend[row + row_offset];
2183 text_t *dtp = drawn_text[row]; 2036 line_t d = drawn_buf[row];
2184 text_t *dtp2 = drawn_text[row + i]; 2037 line_t d2 = drawn_buf[row + i];
2185 rend_t *drp = drawn_rend[row];
2186 rend_t *drp2 = drawn_rend[row + i];
2187 2038
2188 for (nits = 0, col = TermWin.ncol; col--; ) 2039 for (nits = 0, col = ncol; col--; )
2189 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2040 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2190 nits--; 2041 nits--;
2191 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])
2192 nits++; 2043 nits++;
2193 2044
2194 if (nits > 8) /* XXX: arbitrary choice */ 2045 if (nits > 8) /* XXX: arbitrary choice */
2195 { 2046 {
2196 for (col = TermWin.ncol; col--; ) 2047 for (col = ncol; col--; )
2197 { 2048 {
2198 *dtp++ = *dtp2++; 2049 *d.t++ = *d2.t++;
2199 *drp++ = *drp2++; 2050 *d.r++ = *d2.r++;
2200 } 2051 }
2201 2052
2202 if (len == -1) 2053 if (len == -1)
2203 len = row; 2054 len = row;
2204 2055
… …
2209 2060
2210 if (len != -1) 2061 if (len != -1)
2211 { 2062 {
2212 /* also comes here at end if needed because of >= above */ 2063 /* also comes here at end if needed because of >= above */
2213 if (wlen < len) 2064 if (wlen < len)
2214 SWAP_IT (wlen, len, int); 2065 ::swap (wlen, len);
2215 2066
2216 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2067 XCopyArea (display->display, vt, vt,
2217 TermWin.gc, 0, Row2Pixel (len + i), 2068 gc, 0, Row2Pixel (len + i),
2218 (unsigned int)TermWin_TotalWidth (), 2069 (unsigned int)TermWin_TotalWidth (),
2219 (unsigned int)Height2Pixel (wlen - len + 1), 2070 (unsigned int)Height2Pixel (wlen - len + 1),
2220 0, Row2Pixel (len)); 2071 0, Row2Pixel (len));
2221 len = -1; 2072 len = -1;
2222 } 2073 }
… …
2225#endif 2076#endif
2226 2077
2227 /* 2078 /*
2228 * E: main pass across every character 2079 * E: main pass across every character
2229 */ 2080 */
2230 for (row = 0; row < TermWin.nrow; row++) 2081 for (row = 0; row < nrow; row++)
2231 { 2082 {
2232 text_t *stp = screen.text[row + row_offset]; 2083 text_t *stp = ROW(row - view_start).t;
2233 rend_t *srp = screen.rend[row + row_offset]; 2084 rend_t *srp = ROW(row - view_start).r;
2234 text_t *dtp = drawn_text[row]; 2085 text_t *dtp = drawn_buf[row].t;
2235 rend_t *drp = drawn_rend[row]; 2086 rend_t *drp = drawn_buf[row].r;
2236 2087
2237 /* 2088 /*
2238 * E2: OK, now the real pass 2089 * E2: OK, now the real pass
2239 */ 2090 */
2240 int ypixel = (int)Row2Pixel (row); 2091 int ypixel = (int)Row2Pixel (row);
2241 2092
2242 for (col = 0; col < TermWin.ncol; col++) 2093 for (col = 0; col < ncol; col++)
2243 { 2094 {
2244 /* compare new text with old - if exactly the same then continue */ 2095 /* compare new text with old - if exactly the same then continue */
2245 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2096 if (stp[col] == dtp[col] /* Must match characters to skip. */
2246 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2097 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2247 || (stp[col] == ' ' /* space w/ no background change */ 2098 || (stp[col] == ' ' /* space w/ no background change */
… …
2261 dtp[col] = stp[col]; 2112 dtp[col] = stp[col];
2262 drp[col] = rend; 2113 drp[col] = rend;
2263 2114
2264 int xpixel = Col2Pixel (col); 2115 int xpixel = Col2Pixel (col);
2265 2116
2266 for (i = 0; ++col < TermWin.ncol; ) 2117 for (i = 0; ++col < ncol; )
2267 { 2118 {
2268 if (stp[col] == NOCHAR) 2119 if (stp[col] == NOCHAR)
2269 { 2120 {
2270 dtp[col] = stp[col]; 2121 dtp[col] = stp[col];
2271 drp[col] = rend; 2122 drp[col] = rend;
… …
2299 2150
2300 // sometimes we optimize away the trailing NOCHAR's, add them back 2151 // sometimes we optimize away the trailing NOCHAR's, add them back
2301 while (i && text[count] == NOCHAR) 2152 while (i && text[count] == NOCHAR)
2302 count++, i--; 2153 count++, i--;
2303 2154
2304#if ENABLE_STYLES
2305 // force redraw after "careful" characters to avoid pixel droppings
2306 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2307 drp[col + 1] = ~srp[col + 1];
2308
2309 // include previous careful character(s) if possible, looks nicer (best effort...)
2310 while (text > stp
2311 && srp[text - stp - 1] & RS_Careful
2312 && RS_SAME (rend, srp[text - stp - 1]))
2313 text--, count++, xpixel -= TermWin.fwidth;
2314#endif
2315
2316 /* 2155 /*
2317 * Determine the attributes for the string 2156 * Determine the attributes for the string
2318 */ 2157 */
2319 int fore = GET_FGCOLOR (rend); // desired foreground 2158 int fore = GET_FGCOLOR (rend); // desired foreground
2320 int back = GET_BGCOLOR (rend); // desired background 2159 int back = GET_BGCOLOR (rend); // desired background
2321 2160
2322 // only do special processing if ana attributes are set, which is rare 2161 // only do special processing if any attributes are set, which is rare
2323 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2162 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2324 { 2163 {
2164#if ENABLE_STYLES
2165 // force redraw after "careful" characters to avoid pixel droppings
2166 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2167 drp[col + 1] = ~srp[col + 1];
2168
2169 // include previous careful character(s) if possible, looks nicer (best effort...)
2170 while (text > stp
2171 && srp[text - stp - 1] & RS_Careful
2172 && RS_SAME (rend, srp[text - stp - 1]))
2173 text--, count++, xpixel -= fwidth;
2174#endif
2175
2325 bool invert = rend & RS_RVid; 2176 bool invert = rend & RS_RVid;
2326 2177
2327#ifndef NO_BOLD_UNDERLINE_REVERSE 2178#ifndef NO_BOLD_UNDERLINE_REVERSE
2328 if (rend & RS_Bold 2179 if (rend & RS_Bold
2329 && fore == Color_fg) 2180 && fore == Color_fg)
… …
2351 fore = Color_UL; 2202 fore = Color_UL;
2352#endif 2203#endif
2353 2204
2354 if (invert) 2205 if (invert)
2355 { 2206 {
2356 SWAP_IT (fore, back, int); 2207 ::swap (fore, back);
2357 2208
2358#ifndef NO_BOLD_UNDERLINE_REVERSE 2209#ifndef NO_BOLD_UNDERLINE_REVERSE
2359 if (ISSET_PIXCOLOR (Color_RV)) 2210 if (ISSET_PIXCOLOR (Color_RV))
2360 back = Color_RV; 2211 back = Color_RV;
2212
2213 if (fore == back)
2214 {
2215 fore = Color_bg;
2216 back = Color_fg;
2217 }
2361#endif 2218#endif
2362 } 2219 }
2363 2220
2364#ifdef TEXT_BLINK 2221#ifdef TEXT_BLINK
2365 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2222 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2376 } 2233 }
2377 2234
2378 /* 2235 /*
2379 * Actually do the drawing of the string here 2236 * Actually do the drawing of the string here
2380 */ 2237 */
2381 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2238 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2382 2239
2383 if (back == fore) 2240 if (back == fore)
2384 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2241 font->clear_rect (*drawable, xpixel, ypixel,
2385 TermWin.fwidth * count, TermWin.fheight, 2242 fwidth * count, fheight,
2386 back); 2243 back);
2387 else if (back == Color_bg) 2244 else if (back == Color_bg)
2388 { 2245 {
2389 if (must_clear) 2246 if (must_clear)
2390 { 2247 {
2391 CLEAR_CHARS (xpixel, ypixel, count); 2248 CLEAR_CHARS (xpixel, ypixel, count);
2392 2249
2393 for (i = 0; i < count; i++) /* don't draw empty strings */ 2250 for (i = 0; i < count; i++) /* don't draw empty strings */
2394 if (text[i] != ' ') 2251 if (text[i] != ' ')
2395 { 2252 {
2396 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2253 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2397 break; 2254 break;
2398 } 2255 }
2399 } 2256 }
2400 else 2257 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2258 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2402 } 2259 }
2403 else 2260 else
2404 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2261 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2405 2262
2406 if (rend & RS_Uline && font->descent > 1 && fore != back) 2263 if (rend & RS_Uline && font->descent > 1 && fore != back)
2407 { 2264 {
2408#if ENABLE_FRILLS 2265#if ENABLE_FRILLS
2409 if (ISSET_PIXCOLOR (Color_underline)) 2266 if (ISSET_PIXCOLOR (Color_underline))
2410 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2267 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2411 else 2268 else
2412#endif 2269#endif
2413 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2270 XSetForeground (display->display, gc, pix_colors[fore]);
2414 2271
2415 XDrawLine (display->display, drawBuffer, TermWin.gc, 2272 XDrawLine (display->display, drawBuffer, gc,
2416 xpixel, ypixel + font->ascent + 1, 2273 xpixel, ypixel + font->ascent + 1,
2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2274 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2418 } 2275 }
2419 } /* for (col....) */ 2276 } /* for (col....) */
2420 } /* for (row....) */ 2277 } /* for (row....) */
… …
2426 /* 2283 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2284 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2285 */
2429 if (showcursor) 2286 if (showcursor)
2430 { 2287 {
2431 if (TermWin.focus) 2288 if (focus)
2289 {
2290 if (options & Opt_cursorUnderline)
2291 *crp ^= RS_Uline;
2292 else
2432 { 2293 {
2433 *crp ^= RS_RVid; 2294 *crp ^= RS_RVid;
2434#ifndef NO_CURSORCOLOR 2295#ifndef NO_CURSORCOLOR
2435 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2296 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2436#endif 2297#endif
2298 }
2437 } 2299 }
2438 else if (oldcursor.row >= 0) 2300 else if (oldcursor.row >= 0)
2439 { 2301 {
2302 int cursorwidth = 1;
2303 int col = oldcursor.col;
2304
2305 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2306 col--;
2307
2308 while (col + cursorwidth < ncol
2309 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2310 cursorwidth++;
2311
2440#ifndef NO_CURSORCOLOR 2312#ifndef NO_CURSORCOLOR
2441 if (ISSET_PIXCOLOR (Color_cursor)) 2313 if (ISSET_PIXCOLOR (Color_cursor))
2442 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2314 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2443#endif 2315#endif
2444 int cursorwidth = 1;
2445 while (oldcursor.col + cursorwidth < TermWin.ncol
2446 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2447 cursorwidth++;
2448 2316
2449 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2317 XDrawRectangle (display->display, drawBuffer, gc,
2450 Col2Pixel (oldcursor.col), 2318 Col2Pixel (col),
2451 Row2Pixel (oldcursor.row), 2319 Row2Pixel (oldcursor.row),
2452 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2320 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2453 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2321 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2454 } 2322 }
2455 } 2323 }
2456 2324
2457 /* 2325 /*
2458 * H: cleanup selection 2326 * H: cleanup selection
… …
2465 num_scr = 0; 2333 num_scr = 0;
2466 num_scr_allow = 1; 2334 num_scr_allow = 1;
2467} 2335}
2468 2336
2469void 2337void
2470rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2338rxvt_term::scr_remap_chars (const line_t &l)
2471{ 2339{
2472 if (!rp || !tp) 2340 if (!l.t)
2473 return; 2341 return;
2474 2342
2475 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2343 for (int i = ncol; i--; )
2476 *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]));
2477} 2345}
2478 2346
2479void 2347void
2480rxvt_term::scr_remap_chars () 2348rxvt_term::scr_remap_chars ()
2481{ 2349{
2482 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2350 for (int i = total_rows; i--; )
2483 scr_remap_chars (screen.text[i], screen.rend[i]); 2351 scr_remap_chars (row_buf [i]);
2484 2352
2485 for (int i = TermWin.nrow; i--; ) 2353 for (int i = nrow; i--; )
2486 { 2354 {
2487 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2355 scr_remap_chars (drawn_buf [i]);
2488 scr_remap_chars (swap.text[i], swap.rend[i]); 2356 scr_remap_chars (swap_buf [i]);
2489 } 2357 }
2490} 2358}
2491 2359
2492void 2360void
2493rxvt_term::scr_recolour () 2361rxvt_term::scr_recolour ()
… …
2499#if XPM_BACKGROUND 2367#if XPM_BACKGROUND
2500 && !bgPixmap.pixmap 2368 && !bgPixmap.pixmap
2501#endif 2369#endif
2502 ) 2370 )
2503 { 2371 {
2504 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2372 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2505 XClearWindow (display->display, TermWin.parent[0]); 2373 XClearWindow (display->display, parent[0]);
2506 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2374 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2507#if HAVE_SCROLLBARS 2375#if HAVE_SCROLLBARS
2508 if (scrollBar.win) 2376 if (scrollBar.win)
2509 { 2377 {
2510 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2378 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2511 scrollBar.setIdle (); 2379 scrollBar.setIdle ();
… …
2521 2389
2522/* ------------------------------------------------------------------------- */ 2390/* ------------------------------------------------------------------------- */
2523void 2391void
2524rxvt_term::scr_clear (bool really) 2392rxvt_term::scr_clear (bool really)
2525{ 2393{
2526 if (!TermWin.mapped) 2394 if (!mapped)
2527 return; 2395 return;
2528 2396
2529 num_scr_allow = 0; 2397 num_scr_allow = 0;
2530 want_refresh = 1; 2398 want_refresh = 1;
2531 2399
2532#if TRANSPARENT
2533 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2534 {
2535 int i;
2536
2537 if (!(options & Opt_transparent_all))
2538 i = 0;
2539 else
2540 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2541
2542 while (i--)
2543 if (TermWin.parent[i] != None)
2544 XClearWindow (display->display, TermWin.parent[i]);
2545 }
2546#endif
2547
2548 if (really) 2400 if (really)
2549 XClearWindow (display->display, TermWin.vt); 2401 XClearWindow (display->display, vt);
2550} 2402}
2551 2403
2552/* ------------------------------------------------------------------------- */ 2404/* ------------------------------------------------------------------------- */
2553void 2405void
2554rxvt_term::scr_reverse_selection () 2406rxvt_term::scr_reverse_selection ()
2555{ 2407{
2408 if (selection.op
2556 if (selection.op && current_screen == selection.screen) 2409 && current_screen == selection.screen
2410 && selection.end.row >= -view_start)
2557 { 2411 {
2558 int end_row = TermWin.saveLines - TermWin.view_start; 2412 int view_end = -view_start + nrow;
2559 int i = selection.beg.row + TermWin.saveLines; 2413 int row, col;
2560 int col, row = selection.end.row + TermWin.saveLines;
2561 rend_t *srp;
2562 2414
2563#if ENABLE_FRILLS 2415#if ENABLE_FRILLS
2564 if (selection.rect) 2416 if (selection.rect)
2565 { 2417 {
2566 end_row += TermWin.nrow; 2418 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2567
2568 for (; i <= row && i <= end_row; i++)
2569 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++)
2570 srp[col] ^= RS_RVid; 2420 srp[col] ^= RS_RVid;
2571 } 2421 }
2572 else 2422 else
2573#endif 2423#endif
2574 { 2424 {
2575 if (i >= end_row) 2425 if (selection.beg.row >= -view_start)
2426 {
2576 col = selection.beg.col; 2427 col = selection.beg.col;
2428 row = selection.beg.row;
2429 }
2577 else 2430 else
2578 { 2431 {
2579 col = 0; 2432 col = 0;
2580 i = end_row; 2433 row = view_start;
2581 } 2434 }
2582 2435
2583 end_row += TermWin.nrow; 2436 for (; row < min (selection.end.row, view_end); row++, col = 0)
2584 2437 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2585 for (; i < row && i < end_row; i++, col = 0)
2586 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2587 srp[col] ^= RS_RVid; 2438 srp[col] ^= RS_RVid;
2588 2439
2589 if (i == row && i < end_row) 2440 if (row == selection.end.row)
2590 for (srp = screen.rend[i]; col < selection.end.col; col++) 2441 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2591 srp[col] ^= RS_RVid; 2442 srp[col] ^= RS_RVid;
2592 } 2443 }
2593 } 2444 }
2594} 2445}
2595 2446
… …
2604{ 2455{
2605 int row, wrote; 2456 int row, wrote;
2606 unsigned int width, towrite; 2457 unsigned int width, towrite;
2607 char r1[] = "\n"; 2458 char r1[] = "\n";
2608 2459
2609 for (row = TermWin.saveLines - TermWin.nscrolled; 2460 for (row = saveLines - nsaved;
2610 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2461 row < saveLines + nrow - 1; row++)
2611 { 2462 {
2612 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2463 width = row_buf[row].l >= 0 ? row_buf[row].l
2613 : TermWin.ncol; 2464 : ncol;
2614 for (towrite = width; towrite; towrite -= wrote) 2465 for (towrite = width; towrite; towrite -= wrote)
2615 { 2466 {
2616 wrote = write (fd, & (screen.text[row][width - towrite]), 2467 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2617 towrite); 2468 towrite);
2618 if (wrote < 0) 2469 if (wrote < 0)
2619 return; /* XXX: death, no report */ 2470 return; /* XXX: death, no report */
2620 } 2471 }
2621 if (screen.tlen[row] >= 0) 2472 if (row_buf[row].l >= 0)
2622 if (write (fd, r1, 1) <= 0) 2473 if (write (fd, r1, 1) <= 0)
2623 return; /* XXX: death, no report */ 2474 return; /* XXX: death, no report */
2624 } 2475 }
2625} 2476}
2626#endif 2477#endif
2627 2478
2628/* ------------------------------------------------------------------------- * 2479/* ------------------------------------------------------------------------- *
2629 * CHARACTER SELECTION * 2480 * CHARACTER SELECTION *
2630 * ------------------------------------------------------------------------- */ 2481 * ------------------------------------------------------------------------- */
2631
2632/*
2633 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2634 */
2635void 2482void
2636rxvt_term::selection_check (int check_more) 2483rxvt_term::selection_check (int check_more)
2637{ 2484{
2638 row_col_t pos; 2485 row_col_t pos;
2639 2486
2640 if (!selection.op) 2487 if (!selection.op)
2641 return; 2488 return;
2642 2489
2643 pos.row = pos.col = 0; 2490 pos.row = pos.col = 0;
2644 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2491 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2645 || (selection.beg.row >= TermWin.nrow) 2492 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2646 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2493 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2647 || (selection.mark.row >= TermWin.nrow)
2648 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2649 || (selection.end.row >= TermWin.nrow)
2650 || (check_more == 1 2494 || (check_more == 1
2651 && current_screen == selection.screen 2495 && current_screen == selection.screen
2652 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2496 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2653 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2497 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2654 || (check_more == 2 2498 || (check_more == 2
… …
2656 && ROWCOL_IS_AFTER (selection.end, pos)) 2500 && ROWCOL_IS_AFTER (selection.end, pos))
2657 || (check_more == 3 2501 || (check_more == 3
2658 && ROWCOL_IS_AFTER (selection.end, pos)) 2502 && ROWCOL_IS_AFTER (selection.end, pos))
2659 || (check_more == 4 /* screen width change */ 2503 || (check_more == 4 /* screen width change */
2660 && (selection.beg.row != selection.end.row 2504 && (selection.beg.row != selection.end.row
2661 || selection.end.col > TermWin.ncol))) 2505 || selection.end.col > ncol)))
2662 CLEAR_SELECTION (); 2506 CLEAR_SELECTION ();
2663} 2507}
2664 2508
2665/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2666/* 2510/*
… …
2875 * EXT: button 2 release 2719 * EXT: button 2 release
2876 */ 2720 */
2877void 2721void
2878rxvt_term::selection_request (Time tm, int x, int y) 2722rxvt_term::selection_request (Time tm, int x, int y)
2879{ 2723{
2880 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2724 if (x < 0 || x >= width || y < 0 || y >= height)
2881 return; /* outside window */ 2725 return; /* outside window */
2882 2726
2883 if (selection.text) 2727 if (selection.text)
2884 { /* internal selection */ 2728 { /* internal selection */
2885 char *str = rxvt_wcstombs (selection.text, selection.len); 2729 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2914 2758
2915int 2759int
2916rxvt_term::selection_request_other (Atom target, int selnum) 2760rxvt_term::selection_request_other (Atom target, int selnum)
2917{ 2761{
2918 Atom sel; 2762 Atom sel;
2919#ifdef DEBUG_SELECT
2920 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2921#endif
2922 2763
2923 selection_type |= selnum; 2764 selection_type |= selnum;
2924 2765
2925 if (selnum == Sel_Primary) 2766 if (selnum == Sel_Primary)
2926 sel = XA_PRIMARY; 2767 sel = XA_PRIMARY;
… …
2930 sel = xa[XA_CLIPBOARD]; 2771 sel = xa[XA_CLIPBOARD];
2931 2772
2932 if (XGetSelectionOwner (display->display, sel) != None) 2773 if (XGetSelectionOwner (display->display, sel) != None)
2933 { 2774 {
2934 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2775 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2935 TermWin.vt, selection_request_time); 2776 vt, selection_request_time);
2936 return 1; 2777 return 1;
2937 } 2778 }
2938 2779
2939 return 0; 2780 return 0;
2940} 2781}
… …
2963 * EXT: button 1 or 3 release 2804 * EXT: button 1 or 3 release
2964 */ 2805 */
2965void 2806void
2966rxvt_term::selection_make (Time tm) 2807rxvt_term::selection_make (Time tm)
2967{ 2808{
2968 int i, col, end_col, row, end_row; 2809 int i;
2969 wchar_t *new_selection_text; 2810 wchar_t *new_selection_text;
2970 text_t *t; 2811 text_t *t;
2971 2812
2972 switch (selection.op) 2813 switch (selection.op)
2973 { 2814 {
… …
2986 selection.op = SELECTION_DONE; 2827 selection.op = SELECTION_DONE;
2987 2828
2988 if (selection.clicks == 4) 2829 if (selection.clicks == 4)
2989 return; /* nothing selected, go away */ 2830 return; /* nothing selected, go away */
2990 2831
2991 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2832 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2992 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));
2993 2834
2994 col = selection.beg.col;
2995 row = selection.beg.row + TermWin.saveLines;
2996 end_row = selection.end.row + TermWin.saveLines;
2997 int ofs = 0; 2835 int ofs = 0;
2998 int extra = 0; 2836 int extra = 0;
2999 2837
2838 int col = selection.beg.col;
2839 int row = selection.beg.row;
2840
2841 int end_col;
2842
3000 for (; row <= end_row; row++, col = 0) 2843 for (; row <= selection.end.row; row++, col = 0)
3001 { 2844 {
3002 end_col = screen.tlen[row];
3003
3004#if ENABLE_FRILLS 2845#if ENABLE_FRILLS
3005 if (selection.rect) 2846 if (selection.rect)
3006 { 2847 {
3007 col = selection.beg.col; 2848 col = selection.beg.col;
3008 end_col = TermWin.ncol + 1; 2849 end_col = ncol + 1;
3009 } 2850 }
2851 else
3010#endif 2852#endif
2853 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
3011 2854
3012 MAX_IT (col, 0); 2855 col = max (col, 0);
3013 2856
3014 if (end_col == -1)
3015 end_col = TermWin.ncol;
3016
3017 if (row == end_row || selection.rect) 2857 if (row == selection.end.row || selection.rect)
3018 MIN_IT (end_col, selection.end.col); 2858 end_col = min (end_col, selection.end.col);
3019 2859
3020 t = &screen.text[row][col]; 2860 t = ROW(row).t + col;
3021 for (; col < end_col; col++) 2861 for (; col < end_col; col++)
3022 { 2862 {
3023 if (*t == NOCHAR) 2863 if (*t == NOCHAR)
3024 t++; 2864 t++;
3025#if ENABLE_COMBINING 2865#if ENABLE_COMBINING
… …
3041#endif 2881#endif
3042 else 2882 else
3043 new_selection_text[ofs++] = *t++; 2883 new_selection_text[ofs++] = *t++;
3044 } 2884 }
3045 2885
3046 if (screen.tlen[row] != -1 && row != end_row) 2886 if (!ROW(row).is_longer () && row != selection.end.row)
3047 new_selection_text[ofs++] = C0_LF; 2887 new_selection_text[ofs++] = C0_LF;
3048 } 2888 }
3049 2889
3050 if (end_col != selection.end.col) 2890 if (end_col != selection.end.col)
3051 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
… …
3062 2902
3063 // 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
3064 selection.len = ofs; 2904 selection.len = ofs;
3065 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));
3066 2906
3067 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2907 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3068 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2908 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3069 display->set_selection_owner (this); 2909 display->set_selection_owner (this);
3070 else 2910 else
3071 rxvt_warn ("can't get primary selection, ignoring.\n"); 2911 rxvt_warn ("can't get primary selection, ignoring.\n");
3072 2912
3073#if 0 2913#if 0
… …
3096 2936
3097 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2937 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3098 2938
3099 if (clicks == 2 || clicks == 3) 2939 if (clicks == 2 || clicks == 3)
3100 selection_extend_colrow (selection.mark.col, 2940 selection_extend_colrow (selection.mark.col,
3101 selection.mark.row + TermWin.view_start, 2941 selection.mark.row + view_start,
3102 0, /* button 3 */ 2942 0, /* button 3 */
3103 1, /* button press */ 2943 1, /* button press */
3104 0); /* click change */ 2944 0); /* click change */
3105} 2945}
3106 2946
… …
3110 */ 2950 */
3111void 2951void
3112rxvt_term::selection_start_colrow (int col, int row) 2952rxvt_term::selection_start_colrow (int col, int row)
3113{ 2953{
3114 want_refresh = 1; 2954 want_refresh = 1;
2955
2956 selection.mark.row = row - view_start;
3115 selection.mark.col = col; 2957 selection.mark.col = col;
3116 selection.mark.row = row - TermWin.view_start;
3117 2958
3118 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2959 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3119 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2960 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3120 MAX_IT (selection.mark.col, 0);
3121 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3122 2961
3123 while (selection.mark.col > 0 2962 while (selection.mark.col > 0
3124 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 2963 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3125 --selection.mark.col; 2964 --selection.mark.col;
3126 2965
3127 if (selection.op) 2966 if (selection.op)
3128 { /* clear the old selection */ 2967 { /* clear the old selection */
3129 selection.beg.row = selection.end.row = selection.mark.row; 2968 selection.beg.row = selection.end.row = selection.mark.row;
… …
3153 text_t *stp; 2992 text_t *stp;
3154 rend_t *srp; 2993 rend_t *srp;
3155 2994
3156 if (dirn == UP) 2995 if (dirn == UP)
3157 { 2996 {
3158 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2997 bound.row = - nsaved - 1;
3159 bound.col = 0; 2998 bound.col = 0;
3160 dirnadd = -1; 2999 dirnadd = -1;
3161 } 3000 }
3162 else 3001 else
3163 { 3002 {
3164 bound.row = TermWin.saveLines + TermWin.nrow; 3003 bound.row = nrow;
3165 bound.col = TermWin.ncol - 1; 3004 bound.col = ncol - 1;
3166 dirnadd = 1; 3005 dirnadd = 1;
3167 } 3006 }
3168 3007
3169 row = mark->row + TermWin.saveLines; 3008 row = mark->row;
3170 col = mark->col; 3009 col = max (mark->col, 0);
3171 MAX_IT (col, 0); 3010
3172 /* find the edge of a word */ 3011 /* find the edge of a word */
3173 stp = &screen.text[row][col]; 3012 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3174 w1 = DELIMIT_TEXT (*stp); 3013 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3175
3176 srp = &screen.rend[row][col];
3177 w2 = DELIMIT_REND (*srp);
3178 3014
3179 for (;;) 3015 for (;;)
3180 { 3016 {
3181 for (; col != bound.col; col += dirnadd) 3017 for (; col != bound.col; col += dirnadd)
3182 { 3018 {
… …
3192 break; 3028 break;
3193 } 3029 }
3194 3030
3195 if ((col == bound.col) && (row != bound.row)) 3031 if ((col == bound.col) && (row != bound.row))
3196 { 3032 {
3197 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3033 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3198 { 3034 {
3199 trow = row + dirnadd; 3035 trow = row + dirnadd;
3200 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3036 tcol = dirn == UP ? ncol - 1 : 0;
3201 3037
3202 if (screen.text[trow] == NULL) 3038 if (!ROW(trow).t)
3203 break; 3039 break;
3204 3040
3205 stp = & (screen.text[trow][tcol]); 3041 stp = ROW(trow).t + tcol;
3206 srp = & (screen.rend[trow][tcol]); 3042 srp = ROW(trow).r + tcol;
3207 3043
3208 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3044 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3209 break; 3045 break;
3210 3046
3211 row = trow; 3047 row = trow;
… …
3219Old_Word_Selection_You_Die: 3055Old_Word_Selection_You_Die:
3220 if (dirn == DN) 3056 if (dirn == DN)
3221 col++; /* put us on one past the end */ 3057 col++; /* put us on one past the end */
3222 3058
3223 /* Poke the values back in */ 3059 /* Poke the values back in */
3224 ret->row = row - TermWin.saveLines; 3060 ret->row = row;
3225 ret->col = col; 3061 ret->col = col;
3226} 3062}
3227 3063
3228/* ------------------------------------------------------------------------- */ 3064/* ------------------------------------------------------------------------- */
3229/* 3065/*
… …
3234 * flag == 2 ==> button 3 motion 3070 * flag == 2 ==> button 3 motion
3235 */ 3071 */
3236void 3072void
3237rxvt_term::selection_extend (int x, int y, int flag) 3073rxvt_term::selection_extend (int x, int y, int flag)
3238{ 3074{
3239 int col, row; 3075 int col = clamp (Pixel2Col (x), 0, ncol);
3240 3076 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3241 col = Pixel2Col (x);
3242 row = Pixel2Row (y);
3243 MAX_IT (row, 0);
3244 MIN_IT (row, (int)TermWin.nrow - 1);
3245 MAX_IT (col, 0);
3246 MIN_IT (col, (int)TermWin.ncol);
3247 3077
3248 /* 3078 /*
3249 * 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
3250 * 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
3251 * 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
3252 * be _past_ a character for it to be selected. 3082 * be _past_ a character for it to be selected.
3253 */ 3083 */
3254 if (((selection.clicks % 3) == 1) && !flag 3084 if (((selection.clicks % 3) == 1) && !flag
3255 && (col == selection.mark.col 3085 && (col == selection.mark.col
3256 && (row == selection.mark.row + TermWin.view_start))) 3086 && (row == selection.mark.row + view_start)))
3257 { 3087 {
3258 /* select nothing */ 3088 /* select nothing */
3259 selection.beg.row = selection.end.row = 0; 3089 selection.beg.row = selection.end.row = 0;
3260 selection.beg.col = selection.end.col = 0; 3090 selection.beg.col = selection.end.col = 0;
3261 selection.clicks = 4; 3091 selection.clicks = 4;
… …
3276 * Extend the selection to the specified col/row 3106 * Extend the selection to the specified col/row
3277 */ 3107 */
3278void 3108void
3279rxvt_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)
3280{ 3110{
3281 int16_t ncol = TermWin.ncol;
3282 int end_col;
3283 row_col_t pos; 3111 row_col_t pos;
3284 enum { 3112 enum {
3285 LEFT, RIGHT 3113 LEFT, RIGHT
3286 } closeto = RIGHT; 3114 } closeto = RIGHT;
3287 3115
… …
3318 selection.beg.col = selection.end.col = selection.mark.col; 3146 selection.beg.col = selection.end.col = selection.mark.col;
3319 selection.beg.row = selection.end.row = selection.mark.row; 3147 selection.beg.row = selection.end.row = selection.mark.row;
3320 } 3148 }
3321 3149
3322 pos.col = col; 3150 pos.col = col;
3323 pos.row = row; 3151 pos.row = row - view_start;
3324
3325 pos.row -= TermWin.view_start; /* adjust for scroll */
3326 3152
3327 /* 3153 /*
3328 * 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
3329 * in the way button3 drag extension works. 3155 * in the way button3 drag extension works.
3330 * We're either doing: button1 drag; button3 press; or button3 drag 3156 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3389 } 3215 }
3390 } 3216 }
3391 3217
3392 if (selection.clicks == 1) 3218 if (selection.clicks == 1)
3393 { 3219 {
3394 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3220 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3395 3221 && !ROW(selection.beg.row).is_longer ()
3396 if (selection.beg.col > end_col
3397 && end_col != -1
3398#if ENABLE_FRILLS 3222#if ENABLE_FRILLS
3399 && !selection.rect 3223 && !selection.rect
3400#endif 3224#endif
3401 ) 3225 )
3402 selection.beg.col = ncol; 3226 selection.beg.col = ncol;
3403 3227
3404 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3405
3406 if ( 3228 if (
3407 selection.end.col > end_col 3229 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3408 && end_col != -1 3230 && !ROW(selection.end.row).is_longer ()
3409#if ENABLE_FRILLS 3231#if ENABLE_FRILLS
3410 && !selection.rect 3232 && !selection.rect
3411#endif 3233#endif
3412 ) 3234 )
3413 selection.end.col = ncol; 3235 selection.end.col = ncol;
… …
3423 else if (selection.clicks == 3) 3245 else if (selection.clicks == 3)
3424 { 3246 {
3425#if ENABLE_FRILLS 3247#if ENABLE_FRILLS
3426 if (options & Opt_tripleclickwords) 3248 if (options & Opt_tripleclickwords)
3427 { 3249 {
3428 int end_row;
3429
3430 selection_delimit_word (UP, &selection.beg, &selection.beg); 3250 selection_delimit_word (UP, &selection.beg, &selection.beg);
3431 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3432 3251
3433 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++)
3434 { 3253 {
3435 end_col = screen.tlen[end_row + TermWin.saveLines]; 3254 if (!ROW(end_row).is_longer ())
3436
3437 if (end_col != -1)
3438 { 3255 {
3439 selection.end.row = end_row; 3256 selection.end.row = end_row;
3440 selection.end.col = end_col; 3257 selection.end.col = ROW(end_row).l;
3441 selection_remove_trailing_spaces (); 3258 selection_remove_trailing_spaces ();
3442 break; 3259 break;
3443 } 3260 }
3444 } 3261 }
3445 } 3262 }
… …
3451 3268
3452 selection.beg.col = 0; 3269 selection.beg.col = 0;
3453 selection.end.col = ncol; 3270 selection.end.col = ncol;
3454 3271
3455 // select a complete logical line 3272 // select a complete logical line
3456 while (selection.beg.row > -TermWin.saveLines 3273 while (selection.beg.row > -saveLines
3457 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3274 && ROW(selection.beg.row - 1).is_longer ())
3458 selection.beg.row--; 3275 selection.beg.row--;
3459 3276
3460 while (selection.end.row < TermWin.nrow 3277 while (selection.end.row < nrow
3461 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3278 && ROW(selection.end.row).is_longer ())
3462 selection.end.row++; 3279 selection.end.row++;
3463 } 3280 }
3464 } 3281 }
3465 3282
3466 if (button3 && buttonpress) 3283 if (button3 && buttonpress)
… …
3477 } 3294 }
3478 } 3295 }
3479 3296
3480#if ENABLE_FRILLS 3297#if ENABLE_FRILLS
3481 if (selection.rect && selection.beg.col > selection.end.col) 3298 if (selection.rect && selection.beg.col > selection.end.col)
3482 SWAP_IT (selection.beg.col, selection.end.col, int); 3299 ::swap (selection.beg.col, selection.end.col);
3483#endif 3300#endif
3484} 3301}
3485 3302
3486#if ENABLE_FRILLS 3303#if ENABLE_FRILLS
3487void 3304void
… …
3491 text_t *stp; 3308 text_t *stp;
3492 3309
3493 end_col = selection.end.col; 3310 end_col = selection.end.col;
3494 end_row = selection.end.row; 3311 end_row = selection.end.row;
3495 3312
3496 for ( ; end_row >= selection.beg.row; ) 3313 for (; end_row >= selection.beg.row; )
3497 { 3314 {
3498 stp = screen.text[end_row + TermWin.saveLines]; 3315 stp = ROW(end_row).t;
3499 3316
3500 while (--end_col >= 0) 3317 while (--end_col >= 0)
3501 { 3318 {
3502 if (stp[end_col] != ' ' 3319 if (stp[end_col] != ' '
3503 && stp[end_col] != '\t' 3320 && stp[end_col] != '\t'
3504 && stp[end_col] != NOCHAR) 3321 && stp[end_col] != NOCHAR)
3505 break; 3322 break;
3506 } 3323 }
3507 3324
3508 if (end_col >= 0 3325 if (end_col >= 0
3509 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3326 || !ROW(end_row - 1).is_longer ())
3510 { 3327 {
3511 selection.end.col = end_col + 1; 3328 selection.end.col = end_col + 1;
3512 selection.end.row = end_row; 3329 selection.end.row = end_row;
3513 break; 3330 break;
3514 } 3331 }
3515 3332
3516 end_row--; 3333 end_row--;
3517 end_col = TermWin.ncol; 3334 end_col = ncol;
3518 } 3335 }
3519 3336
3520 if (selection.mark.row > selection.end.row) 3337 if (selection.mark.row > selection.end.row)
3521 { 3338 {
3522 selection.mark.row = selection.end.row; 3339 selection.mark.row = selection.end.row;
… …
3685 */ 3502 */
3686void 3503void
3687rxvt_term::pixel_position (int *x, int *y) 3504rxvt_term::pixel_position (int *x, int *y)
3688{ 3505{
3689 *x = Pixel2Col (*x); 3506 *x = Pixel2Col (*x);
3690 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3507 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3691 *y = Pixel2Row (*y); 3508 *y = Pixel2Row (*y);
3692 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3509 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3693} 3510}
3694 3511
3695/* ------------------------------------------------------------------------- */ 3512/* ------------------------------------------------------------------------- */
3696#ifdef USE_XIM 3513#ifdef USE_XIM
3697void 3514void
3698rxvt_term::im_set_position (XPoint &pos) 3515rxvt_term::im_set_position (XPoint &pos)
3699{ 3516{
3700 XWindowAttributes xwa; 3517 XWindowAttributes xwa;
3701 3518
3702 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3519 XGetWindowAttributes (display->display, vt, &xwa);
3703 3520
3704 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3521 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3705 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3522 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3706} 3523}
3707#endif 3524#endif
3708 3525
3709#if ENABLE_OVERLAY 3526#if ENABLE_OVERLAY
3710void 3527void
3711rxvt_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)
3712{ 3529{
3713 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3530 if (nrow < 3 || ncol < 3)
3714 return; 3531 return;
3715 3532
3716 want_refresh = 1; 3533 want_refresh = 1;
3717 3534
3718 scr_overlay_off (); 3535 scr_overlay_off ();
3719 3536
3720 if (x < 0) x = TermWin.ncol - w; 3537 if (x < 0) x = ncol - w;
3721 if (y < 0) y = TermWin.nrow - h; 3538 if (y < 0) y = nrow - h;
3722 3539
3723 // make space for border 3540 // make space for border
3724 w += 2; MIN_IT (w, TermWin.ncol); 3541 w += 2; min_it (w, ncol);
3725 h += 2; MIN_IT (h, TermWin.nrow); 3542 h += 2; min_it (h, nrow);
3726 3543
3727 x -= 1; MAX_IT (x, 0); 3544 x -= 1; clamp_it (x, 0, ncol - w);
3728 y -= 1; MAX_IT (y, 0); 3545 y -= 1; clamp_it (y, 0, nrow - h);
3729
3730 MIN_IT (x, TermWin.ncol - w);
3731 MIN_IT (y, TermWin.nrow - h);
3732 3546
3733 ov_x = x; ov_y = y; 3547 ov_x = x; ov_y = y;
3734 ov_w = w; ov_h = h; 3548 ov_w = w; ov_h = h;
3735 3549
3736 ov_text = new text_t *[h]; 3550 ov_text = new text_t *[h];
… …
3801 while (*s) 3615 while (*s)
3802 scr_overlay_set (x++, y, *s++); 3616 scr_overlay_set (x++, y, *s++);
3803} 3617}
3804 3618
3805void 3619void
3620rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3621{
3622 while (*s)
3623 {
3624 text_t t = *s++;
3625 int width = wcwidth (t);
3626
3627 while (width--)
3628 {
3629 scr_overlay_set (x++, y, t);
3630 t = NOCHAR;
3631 }
3632 }
3633}
3634
3635void
3806rxvt_term::scr_swap_overlay () 3636rxvt_term::scr_swap_overlay ()
3807{ 3637{
3808 if (!ov_text) 3638 if (!ov_text)
3809 return; 3639 return;
3810 3640
3811 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3812
3813 // swap screen mem with overlay 3641 // swap screen mem with overlay
3814 for (int y = ov_h; y--; ) 3642 for (int y = ov_h; y--; )
3815 { 3643 {
3816 text_t *t1 = ov_text[y]; 3644 text_t *t1 = ov_text[y];
3817 rend_t *r1 = ov_rend[y]; 3645 rend_t *r1 = ov_rend[y];
3818 3646
3819 text_t *t2 = screen.text[y + row_offset] + ov_x; 3647 text_t *t2 = ROW(y - view_start).t + ov_x;
3820 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3648 rend_t *r2 = ROW(y - view_start).r + ov_x;
3821 3649
3822 for (int x = ov_w; x--; ) 3650 for (int x = ov_w; x--; )
3823 { 3651 {
3824 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3652 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3825 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));
… …
3827 } 3655 }
3828} 3656}
3829 3657
3830#endif 3658#endif
3831/* ------------------------------------------------------------------------- */ 3659/* ------------------------------------------------------------------------- */
3660

Diff Legend

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