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.161 by root, Tue Feb 22 21:41:50 2005 UTC vs.
Revision 1.180 by root, Wed Dec 21 10:34:24 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 * ------------------------------------------------------------------------- */
151void 152void
152rxvt_term::scr_reset () 153rxvt_term::scr_reset ()
153{ 154{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q; 155 unsigned int p, q;
156 int k; 156 int k;
157 rend_t setrstyle;
158 157
159#if ENABLE_OVERLAY 158#if ENABLE_OVERLAY
160 scr_overlay_off (); 159 scr_overlay_off ();
161#endif 160#endif
162 161
163 TermWin.view_start = 0; 162 view_start = 0;
164 num_scr = 0; 163 num_scr = 0;
165 164
166 if (TermWin.ncol == 0) 165 if (ncol == 0)
167 TermWin.ncol = 80; 166 ncol = 80;
168 167
169 if (TermWin.nrow == 0) 168 if (nrow == 0)
170 TermWin.nrow = 24; 169 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 170
175 if (ncol == prev_ncol && nrow == prev_nrow) 171 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 172 return;
177 173
178 // we need at least two lines for wrapping to work correctly 174 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 175 if (nrow + saveLines < 2)
180 { 176 {
181 TermWin.saveLines++; 177 saveLines++;
182 prev_nrow--; 178 prev_nrow--;
183 TermWin.nscrolled++; 179 nsaved++;
184 } 180 }
185 181
186 want_refresh = 1; 182 want_refresh = 1;
187 183
188 prev_total_rows = prev_nrow + TermWin.saveLines; 184 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 185 total_rows = nrow + saveLines;
190 186
191 screen.tscroll = 0; 187 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 188 screen.bscroll = nrow - 1;
193 189
194 if (!talloc) 190 if (!save)
195 {
196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199
200 if (!screen.text)
201 { 191 {
202 /* 192 /*
203 * first time called so just malloc everything: don't rely on realloc 193 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 194 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 195 */
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 196 nsaved = 0; /* no saved lines */
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 197 term_start = 0;
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 198
199 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
210 206
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
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++) 207 for (p = nrow; p--; )
220 { 208 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
224 screen.tlen[q] = swap.tlen[p] = 0;
225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
226 } 212 }
227 213
228 memset (charsets, 'B', sizeof (charsets)); 214 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 215 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 216 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 217 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 218 screen.charset = 0;
234 current_screen = PRIMARY; 219 current_screen = PRIMARY;
… …
254 else 239 else
255 { 240 {
256 /* 241 /*
257 * add or delete rows as appropriate 242 * add or delete rows as appropriate
258 */ 243 */
259 setrstyle = DEFAULT_RSTYLE; 244
245 rxvt_salloc *old_ta;
246 rxvt_salloc *old_ra;
260 247
261 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
262 { 249 {
263 /* delete rows */ 250 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow); 251 k = min (nsaved, prev_nrow - nrow);
252 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 253 scr_scroll_text (0, (int)prev_nrow - 1, k);
266 254
267 for (p = nrow; p < prev_nrow; p++) 255 for (p = nrow; p < prev_nrow; p++)
268 { 256 {
269 q = p + TermWin.saveLines; 257 lfree (ROW(p));
270
271 if (screen.text[q])
272 {
273#ifdef DEBUG_STRICT
274 assert (screen.rend[q]);
275#endif
276 talloc->free (screen.text[q]);
277 ralloc->free (screen.rend[q]);
278 }
279
280 if (swap.text[p]) 258 lfree (swap_save[p]);
281 {
282#ifdef DEBUG_STRICT
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]); 259 lfree (drawn[p]);
293 ralloc->free (drawn_rend[p]);
294 } 260 }
295 261
296 /* we have fewer rows so fix up cursor position */ 262 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 263 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 264
… …
301 else if (nrow > prev_nrow) 267 else if (nrow > prev_nrow)
302 { 268 {
303 /* add rows */ 269 /* add rows */
304 scr_reset_realloc (); /* realloc _first_ */ 270 scr_reset_realloc (); /* realloc _first_ */
305 271
272 int ocol = ncol;
306 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
307 274
308 k = min (TermWin.nscrolled, nrow - prev_nrow); 275 k = min (nsaved, nrow - prev_nrow);
309 276
310 for (p = prev_total_rows; p < total_rows; p++) 277 for (p = prev_total_rows; p < total_rows; p++)
311 { 278 save[p].clear ();
312 screen.tlen[p] = 0;
313 screen.text[p] = NULL;
314 screen.rend[p] = NULL;
315 }
316 279
317 for (p = prev_total_rows; p < total_rows - k; p++) 280 for (p = prev_total_rows; p < total_rows - k; p++)
318 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); 281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
319 282
320 for (p = prev_nrow; p < nrow; p++) 283 for (p = prev_nrow; p < nrow; p++)
321 { 284 {
322 swap.tlen[p] = 0; 285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
323 swap.text[p] = NULL; 286 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
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 } 287 }
330 288
331 if (k > 0) 289 if (k > 0)
332 { 290 {
333 scr_scroll_text (0, (int)nrow - 1, -k, 1); 291 scr_scroll_text (0, (int)nrow - 1, -k);
334 screen.cur.row += k; 292 screen.cur.row += k;
335 screen.s_cur.row += k; 293 screen.s_cur.row += k;
336 TermWin.nscrolled -= k; 294 nsaved -= k;
337 } 295 }
338 296
339#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 298 assert (screen.cur.row < nrow);
341#else /* drive with your eyes closed */ 299#else /* drive with your eyes closed */
342 MIN_IT (screen.cur.row, nrow - 1); 300 MIN_IT (screen.cur.row, nrow - 1);
343#endif 301#endif
344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
345 } 303 }
346 304
347 /* resize columns */ 305 /* resize columns */
348 if (ncol != prev_ncol) 306 if (ncol != prev_ncol)
349 { 307 {
350 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 308 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
351 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 309 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
352 310
353 for (p = 0; p < total_rows; p++) 311 for (p = total_rows; p--; )
312 lresize (save[p]);
313
314 for (p = nrow; p--; )
354 { 315 {
355 if (screen.text[p]) 316 lresize (drawn[p]);
317 lresize (swap_save[p]);
318 }
319
320 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
321
322 delete old_ta;
323 delete old_ra;
324 }
325
326#if 0
327 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm.
329 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0)
342 {
343 --p;
344
345 printf ("pq %d:%d\n", p, q);
346 if (save[p].t)
347 {
348 int llen = save[p].l;
349
350 assert (llen >= 0);
351
352 while (p && save[p - 1].l < 0)
356 { 353 {
357 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); 354 --p;
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) 355 llen += prev_ncol;
363 scr_blank_line (&screen.text[p][prev_ncol], 356 }
364 &screen.rend[p][prev_ncol], 357
365 ncol - prev_ncol, setrstyle); 358 int qlines = llen / ncol + 1;
359 int lofs = 0;
360
361 q -= qlines;
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++)
367 {
368 if (qrow >= 0)
369 {
370 tp [qrow] = (text_t *)ta->alloc ();
371 rp [qrow] = (rend_t *)ra->alloc ();
372 tl [qrow] = LINE_CONT1;
373
374 int qcol = 0;
375
376 for (;;)
377 {
378 int prow = lofs / prev_ncol + p;
379 int pcol = lofs % prev_ncol;
380
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382
383 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);
384
385 if (len <= 0)
386 {
387 tl [qrow] = qcol;
388
389 TODO
390 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391 ncol - qcol, DEFAULT_RSTYLE);
392
393 break;
394 }
395
396 assert (lofs < 1000);
397
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
400
401 lofs += len;
402 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 }
408 else
409 lofs += ncol;
366 } 410 }
367 } 411 }
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 } 412 }
393 413
394 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 414 free (screen.text); screen.text = tp;
415 free (screen.rend); screen.rend = rp;
416 free (screen.tlen); screen.tlen = tl;
395 417
396 delete talloc; talloc = ta; 418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
397 delete ralloc; ralloc = ra; 419#endif
398 }
399 420
400 if (tabs) 421 if (tabs)
401 free (tabs); 422 free (tabs);
402 } 423 }
403 424
… …
413} 434}
414 435
415void 436void
416rxvt_term::scr_reset_realloc () 437rxvt_term::scr_reset_realloc ()
417{ 438{
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 *)); 439 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
427 440 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
428 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); 441 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
429 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); 442 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_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} 443}
437 444
438/* ------------------------------------------------------------------------- */ 445/* ------------------------------------------------------------------------- */
439/* 446/*
440 * Free everything. That way malloc debugging can find leakage. 447 * Free everything. That way malloc debugging can find leakage.
441 */ 448 */
442void 449void
443rxvt_term::scr_release () 450rxvt_term::scr_release ()
444{ 451{
445 unsigned int total_rows;
446 int i;
447
448 total_rows = TermWin.nrow + TermWin.saveLines;
449
450 delete talloc; talloc = 0; 452 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 453 delete ralloc; ralloc = 0;
452 454
453 free (screen.text); 455 free (save);
454 free (screen.tlen); 456 free (swap_save);
455 free (screen.rend);
456 free (drawn_text); 457 free (drawn);
457 free (drawn_rend);
458 free (swap.text);
459 free (swap.tlen);
460 free (swap.rend);
461 free (buf_text); 458 free (buf);
462 free (buf_rend);
463 free (tabs); 459 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} 460}
473 461
474/* ------------------------------------------------------------------------- */ 462/* ------------------------------------------------------------------------- */
475/* 463/*
476 * Hard reset 464 * Hard reset
… …
527 set_font_style (); 515 set_font_style ();
528 break; 516 break;
529 } 517 }
530 518
531 /* boundary check in case screen size changed between SAVE and RESTORE */ 519 /* boundary check in case screen size changed between SAVE and RESTORE */
532 MIN_IT (s->cur.row, TermWin.nrow - 1); 520 MIN_IT (s->cur.row, nrow - 1);
533 MIN_IT (s->cur.col, TermWin.ncol - 1); 521 MIN_IT (s->cur.col, ncol - 1);
534#ifdef DEBUG_STRICT 522#ifdef DEBUG_STRICT
535 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
536 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
537#else /* drive with your eyes closed */ 525#else /* drive with your eyes closed */
538 MAX_IT (s->cur.row, 0); 526 MAX_IT (s->cur.row, 0);
… …
547 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 535 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
548 */ 536 */
549int 537int
550rxvt_term::scr_change_screen (int scrn) 538rxvt_term::scr_change_screen (int scrn)
551{ 539{
552 int i;
553#if NSCREENS
554 int offset;
555#endif
556
557 want_refresh = 1; 540 want_refresh = 1;
558
559 TermWin.view_start = 0; 541 view_start = 0;
560 542
561 if (current_screen == scrn) 543 if (current_screen == scrn)
562 return scrn; 544 return scrn;
563 545
564 selection_check (2); /* check for boundary cross */ 546 selection_check (2); /* check for boundary cross */
565 547
566 i = current_screen; current_screen = scrn; scrn = i; 548 int i = current_screen; current_screen = scrn; scrn = i;
567 549
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 550 ::swap (screen.cur.row, swap.cur.row);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 551 ::swap (screen.cur.col, swap.cur.col);
570 MAX_IT (screen.cur.row, 0); 552
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 553 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0); 554 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574 555
575#if NSCREENS 556#if NSCREENS
576 if (options & Opt_secondaryScreen) 557 if (options & Opt_secondaryScreen)
577 { 558 {
578 num_scr = 0; 559 num_scr = 0;
579 offset = TermWin.saveLines;
580 560
581 for (i = prev_nrow; i--;) 561 for (int i = nrow; i--; )
582 { 562 ::swap (ROW(i), swap_save[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 563
588 SWAP_IT (screen.charset, swap.charset, int16_t); 564 ::swap (screen.charset, swap.charset);
589 SWAP_IT (screen.flags, swap.flags, int); 565 ::swap (screen.flags, swap.flags);
590 screen.flags |= Screen_VisibleCursor; 566 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 567 swap.flags |= Screen_VisibleCursor;
592 } 568 }
593 else 569 else
594#endif 570#endif
595 if (options & Opt_secondaryScroll) 571 if (options & Opt_secondaryScroll)
596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 572 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
597 573
598 return scrn; 574 return scrn;
599} 575}
600 576
601// clear WrapNext indicator, solidifying position on next line 577// clear WrapNext indicator, solidifying position on next line
… …
608 screen.flags &= ~Screen_WrapNext; 584 screen.flags &= ~Screen_WrapNext;
609 585
610 screen.cur.col = 0; 586 screen.cur.col = 0;
611 587
612 if (screen.cur.row == screen.bscroll) 588 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 589 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
614 else if (screen.cur.row < TermWin.nrow - 1) 590 else if (screen.cur.row < nrow - 1)
615 screen.cur.row++; 591 screen.cur.row++;
616} 592}
617 593
618/* ------------------------------------------------------------------------- */ 594/* ------------------------------------------------------------------------- */
619/* 595/*
… …
649/* ------------------------------------------------------------------------- */ 625/* ------------------------------------------------------------------------- */
650/* 626/*
651 * Scroll text between <row1> and <row2> inclusive, by <count> lines 627 * Scroll text between <row1> and <row2> inclusive, by <count> lines
652 * count positive ==> scroll up 628 * count positive ==> scroll up
653 * count negative ==> scroll down 629 * count negative ==> scroll down
654 * spec == 0 for normal routines
655 */ 630 */
656int 631int
657rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 632rxvt_term::scr_scroll_text (int row1, int row2, int count)
658{ 633{
659 int i, j;
660 long nscrolled;
661
662 if (count == 0 || (row1 > row2)) 634 if (count == 0 || (row1 > row2))
663 return 0; 635 return 0;
664 636
665 want_refresh = 1; 637 want_refresh = 1;
638 num_scr += count;
666 639
667 if (row1 == 0 && count > 0 640 if (count > 0
641 && row1 == 0
642 && row2 == nrow - 1
668 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 643 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
669 { 644 {
670 nscrolled = (long)TermWin.nscrolled + (long)count; 645 nsaved = min (nsaved + count, saveLines);
646 term_start = (term_start + count) % total_rows;
671 647
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) 648 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 } 649 {
701 else if (j >= row1 && j <= row2)
702 {
703 /* move selected region too */
704 selection.beg.row -= count; 650 selection.beg.row -= count;
705 selection.end.row -= count; 651 selection.end.row -= count;
706 selection.mark.row -= count; 652 selection.mark.row -= count;
707 }
708 }
709 653
710 selection_check (0); /* _after_ TermWin.nscrolled update */ 654 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 { 655 }
744 buf_text[i] = screen.text[j]; 656
745 buf_rend[i] = screen.rend[j]; 657 for (int i = count; i--; )
658 scr_blank_screen_mem (ROW(row2 - i), rstyle);
659
660 if ((options & Opt_scrollWithBuffer)
661 && view_start != 0
662 && view_start != saveLines)
663 scr_page (UP, count);
664 }
665 else
666 {
667 if (selection.op && current_screen == selection.screen)
746 } 668 {
669 int i = selection.beg.row;
670 int j = selection.end.row;
747 671
748 /* Rotate lines */ 672 if ((i < row1 && j > row1)
749 for (j = row2, i = j - count; i >= row1; i--, j--) 673 || (i < row2 && j > row2)
674 || (i - count < row1 && i >= row1)
675 || (i - count > row2 && i <= row2)
676 || (j - count < row1 && j >= row1)
677 || (j - count > row2 && j <= row2))
678 {
679 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
681 }
682 else if (j >= row1 && j <= row2)
683 {
684 /* move selected region too */
685 selection.beg.row -= count;
686 selection.end.row -= count;
687 selection.mark.row -= count;
688
689 selection_check (0);
690 }
750 { 691 }
751 screen.tlen[j] = screen.tlen[i]; 692
752 screen.text[j] = screen.text[i]; 693 // use a simple and robust scrolling algorithm, this
753 screen.rend[j] = screen.rend[i]; 694 // part of scr_scroll_text is not time-critical.
695
696 int rows = row2 - row1 + 1;
697
698 for (int row = 0; row < rows; row++)
754 } 699 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows);
755 701
756 j = row1, i = count; 702 if (!IN_RANGE_EXC (row + count, 0, rows))
757 count = -count; 703 scr_blank_screen_mem (buf [row], rstyle);
758 } 704 }
759 705
760 /* Resurrect lines */ 706 for (int row = 0; row < rows; row++)
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 707 ROW(row1 + row) = buf [row];
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 708 }
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 709
768 return count; 710 return count;
769} 711}
770 712
771/* ------------------------------------------------------------------------- */ 713/* ------------------------------------------------------------------------- */
… …
773 * Add text given in <str> of length <len> to screen struct 715 * Add text given in <str> of length <len> to screen struct
774 */ 716 */
775void 717void
776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 718rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
777{ 719{
720 if (len <= 0) /* sanity */
721 return;
722
778 unsigned char checksel; 723 unsigned char checksel;
779 unicode_t c; 724 unicode_t c;
780 int i, row, last_col; 725 int row, last_col;
781 text_t *stp; 726 const unicode_t *strend = str + len;
782 rend_t *srp;
783
784 if (len <= 0) /* sanity */
785 return;
786 727
787 want_refresh = 1; 728 want_refresh = 1;
788 ZERO_SCROLLBACK (); 729 ZERO_SCROLLBACK ();
789 last_col = TermWin.ncol; 730 last_col = ncol;
790 731
791 if (nlines > 0) 732 if (nlines > 0)
792 { 733 {
793 nlines += screen.cur.row - screen.bscroll; 734 nlines += screen.cur.row - screen.bscroll;
794 if ((nlines > 0) 735 if ((nlines > 0)
795 && (screen.tscroll == 0) 736 && (screen.tscroll == 0)
796 && (screen.bscroll == (TermWin.nrow - 1))) 737 && (screen.bscroll == (nrow - 1)))
797 { 738 {
798 /* _at least_ this many lines need to be scrolled */ 739 /* _at least_ this many lines need to be scrolled */
799 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
800 screen.cur.row -= nlines; 741 screen.cur.row -= nlines;
801 } 742 }
802 } 743 }
803 744
804#ifdef DEBUG_STRICT 745#ifdef DEBUG_STRICT
805 assert (screen.cur.col < last_col); 746 assert (screen.cur.col < last_col);
806 assert ((screen.cur.row < TermWin.nrow) 747 assert ((screen.cur.row < nrow)
807 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 748 && (screen.cur.row >= - (int32_t)nsaved));
808#else /* drive with your eyes closed */ 749#else /* drive with your eyes closed */
809 MIN_IT (screen.cur.col, last_col - 1); 750 MIN_IT (screen.cur.col, last_col - 1);
810 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 751 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
811 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 752 MAX_IT (screen.cur.row, - (int32_t)nsaved);
812#endif 753#endif
813 row = screen.cur.row + TermWin.saveLines; 754 row = screen.cur.row;
814 755
815 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 756 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816 757
817 stp = screen.text[row]; 758 line_t *line = &ROW(row);
818 srp = screen.rend[row];
819 759
820 while (len--) 760 while (str < strend)
821 { 761 {
822 c = *str++; 762 c = *str++;
823 763
824 if (c < 0x20) 764 if (c < 0x20)
825 switch (c) 765 if (c == C0_LF)
766 {
767 if (!line->is_longer ()) /* XXX: think about this */
768 MAX_IT (line->l, screen.cur.col);
769
770 screen.flags &= ~Screen_WrapNext;
771
772 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
774 else if (screen.cur.row < (nrow - 1))
775 row = ++screen.cur.row;
776
777 line = &ROW(row); /* _must_ refresh */
778 continue;
779 }
780 else if (c == C0_CR)
826 { 781 {
827 case C0_HT: 782 if (!line->is_longer ()) /* XXX: think about this */
828 scr_tab (1, true);
829 continue;
830
831 case C0_LF:
832 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col); 783 MAX_IT (line->l, screen.cur.col);
834 784
835 screen.flags &= ~Screen_WrapNext; 785 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; 786 screen.cur.col = 0;
852 continue; 787 continue;
788 }
789 else if (c == C0_HT)
790 {
791 scr_tab (1, true);
792 continue;
853 } 793 }
854 794
855 if (checksel /* see if we're writing within selection */ 795 if (checksel /* see if we're writing within selection */
856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 796 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
857 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 797 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
865 CLEAR_SELECTION (); 805 CLEAR_SELECTION ();
866 } 806 }
867 807
868 if (screen.flags & Screen_WrapNext) 808 if (screen.flags & Screen_WrapNext)
869 { 809 {
870 screen.tlen[row] = -1; 810 line->set_is_longer ();
871 811
872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 812 scr_do_wrap ();
873
874 stp = screen.text[row]; /* _must_ refresh */
875 srp = screen.rend[row]; /* _must_ refresh */
876 } 813
814 row = screen.cur.row;
815 line = &ROW(row); /* _must_ refresh */
816 }
817
818 // some utf-8 decoders "decode" surrogate characters: let's fix this.
819 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
820 c = 0xfffd;
877 821
878 // rely on wcwidth to tell us the character width, at least for non-latin1 822 // 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 823 // do wcwidth before further replacements, as wcwidth might return -1
880 // characters have width -1 (DOH!) on GNU/Linux sometimes. 824 // for the line drawing characters below as they might be invalid in the current
825 // locale.
881 int width = c < 0x100 ? 1 : wcwidth (c); 826 int width = c < 0x100 ? 1 : wcwidth (c);
882 827
883 if (charsets[screen.charset] == '0') // DEC SPECIAL 828 if (charsets[screen.charset] == '0') // DEC SPECIAL
884 { 829 {
885 // vt100 special graphics and line drawing 830 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100 831 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars 832 // 40-5e rxvt extension for extra curses acs chars
888 static uint16_t vt100_0[63] = { // 40 .. 7e 833 static uint16_t vt100_0[62] = { // 41 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 834 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 835 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 836 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 837 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 838 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 839 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 840 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 841 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897 }; 842 };
898 843
899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 844 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
900 { 845 {
901 c = vt100_0[c - 0x40]; 846 c = vt100_0[c - 0x41];
902 width = 1; 847 width = 1; // vt100 line drawing characters are always single-width
903 } 848 }
904 } 849 }
905 850
906 if (screen.flags & Screen_Insert) 851 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT); 852 scr_insdel_chars (width, INSERT);
908 853
909 if (width != 0) 854 if (width != 0)
910 { 855 {
911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3 856#if !UNICODE_3
916 // trim characters we can't store directly :( 857 // trim characters we can't store directly :(
917 if (c >= 0x10000) 858 if (c >= 0x10000)
918# if ENABLE_COMBINING 859# if ENABLE_COMBINING
919 c = rxvt_composite.compose (c); // map to lower 16 bits 860 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
921 c = 0xfffd; 862 c = 0xfffd;
922# endif 863# endif
923#endif 864#endif
924 865
925 // nuke the character at this position, if required 866 // nuke the character at this position, if required
926 if (stp[screen.cur.col] == NOCHAR 867 if (line->t[screen.cur.col] == NOCHAR
927 || (screen.cur.col < TermWin.ncol - 1 868 || (screen.cur.col < ncol - 1
928 && stp[screen.cur.col + 1] == NOCHAR)) 869 && line->t[screen.cur.col + 1] == NOCHAR))
929 { 870 {
930 int col = screen.cur.col; 871 int col = screen.cur.col;
931 872
932 // find begin 873 // find begin
933 while (col > 0 && stp[col] == NOCHAR) 874 while (col > 0 && line->t[col] == NOCHAR)
934 col--; 875 col--;
935 876
936 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 877 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
937 878
938 // found begin, nuke 879 // found begin, nuke
939 do { 880 do {
940 stp[col] = ' '; 881 line->t[col] = ' ';
941 srp[col] = rend; 882 line->r[col] = rend;
942 col++; 883 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR); 884 } while (col < ncol && line->t[col] == NOCHAR);
944 } 885 }
945 886
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 887 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
888
889 // if the character doesn't fit into the remaining columns...
890 if (screen.cur.col > last_col - width && last_col >= width)
891 {
892 // ...output spaces
893 c = ' ';
894 // and try the same character next loop iteration
895 --str;
896 }
947 897
948 do 898 do
949 { 899 {
950 stp[screen.cur.col] = c; 900 line->t[screen.cur.col] = c;
951 srp[screen.cur.col] = rend; 901 line->r[screen.cur.col] = rend;
952 902
953 if (screen.cur.col < last_col - 1) 903 if (screen.cur.col < last_col - 1)
954 screen.cur.col++; 904 screen.cur.col++;
955 else 905 else
956 { 906 {
957 screen.tlen[row] = last_col; 907 line->l = last_col;
958 if (screen.flags & Screen_Autowrap) 908 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 909 screen.flags |= Screen_WrapNext;
960 break; 910 break;
961 } 911 }
962 912
… …
964 } 914 }
965 while (--width > 0); 915 while (--width > 0);
966 916
967 // pad with spaces when overwriting wide character with smaller one 917 // pad with spaces when overwriting wide character with smaller one
968 if (!width) 918 if (!width)
969 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 919 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
970 { 920 {
971 stp[c] = ' '; 921 line->t[c] = ' ';
972 srp[c] = rend; 922 line->r[c] = rend;
973 } 923 }
974 } 924 }
975 else if (width == 0) 925 else // width == 0
976 { 926 {
977#if ENABLE_COMBINING 927#if ENABLE_COMBINING
978 // handle combining characters 928 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 929 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 930 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 931 // we don't handle double-width characters nicely yet.
982
983 text_t *tp; 932 text_t *tp;
984 rend_t *rp; 933 rend_t *rp;
985 934
986 if (screen.cur.col > 0) 935 if (screen.cur.col > 0)
987 { 936 {
988 tp = stp + screen.cur.col - 1; 937 tp = line->t + screen.cur.col - 1;
989 rp = srp + screen.cur.col - 1; 938 rp = line->r + screen.cur.col - 1;
990 939
991 while (*tp == NOCHAR && tp > stp) 940 while (*tp == NOCHAR && tp > line->t)
992 tp--, rp--; 941 tp--, rp--;
993 } 942 }
994 else if (screen.cur.row > 0 943 else if (screen.cur.row > 0
995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 944 && ROW(screen.cur.row - 1).is_longer ())
996 { 945 {
997 int line = screen.cur.row - 1 + TermWin.saveLines; 946 line_t *line = &ROW(screen.cur.row - 1);
998 947
999 tp = screen.text[line] + last_col - 1; 948 tp = line->t + last_col - 1;
1000 rp = screen.rend[line] + last_col - 1; 949 rp = line->r + last_col - 1;
1001 950
1002 while (*tp == NOCHAR && tp > screen.text[line]) 951 while (*tp == NOCHAR && tp > line->t)
1003 tp--, rp--; 952 tp--, rp--;
1004 } 953 }
1005 else 954 else
1006 continue; 955 continue;
1007 956
… …
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 963 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1015#endif 964#endif
1016 } 965 }
1017 } 966 }
1018 967
1019 if (screen.tlen[row] != -1) /* XXX: think about this */ 968 if (!line->is_longer ()) /* XXX: think about this */
1020 MAX_IT (screen.tlen[row], screen.cur.col); 969 MAX_IT (line->l, screen.cur.col);
1021 970
1022#ifdef DEBUG_STRICT 971#ifdef DEBUG_STRICT
1023 assert (screen.cur.row >= 0); 972 assert (screen.cur.row >= 0);
1024#else /* drive with your eyes closed */ 973#else /* drive with your eyes closed */
1025 MAX_IT (screen.cur.row, 0); 974 MAX_IT (screen.cur.row, 0);
… …
1039 if (screen.cur.col == 0) 988 if (screen.cur.col == 0)
1040 { 989 {
1041 if (screen.cur.row > 0) 990 if (screen.cur.row > 0)
1042 { 991 {
1043#ifdef TERMCAP_HAS_BW 992#ifdef TERMCAP_HAS_BW
1044 screen.cur.col = TermWin.ncol - 1; 993 screen.cur.col = ncol - 1;
1045 screen.cur.row--; 994 screen.cur.row--;
1046 return; 995 return;
1047#endif 996#endif
1048 } 997 }
1049 } 998 }
… …
1069 1018
1070 if (count == 0) 1019 if (count == 0)
1071 return; 1020 return;
1072 else if (count > 0) 1021 else if (count > 0)
1073 { 1022 {
1074 int row = TermWin.saveLines + screen.cur.row; 1023 int row = screen.cur.row;
1075 text_t *tp = screen.text[row]; 1024
1076 rend_t *rp = screen.rend[row]; 1025 line_t &l = ROW(row);
1077 rend_t base_rend = rp[i]; 1026 rend_t base_rend = l.r[i];
1078 ht &= tp[i] == ' '; 1027 ht &= l.t[i] == ' ';
1079 1028
1080 for (; ++i < TermWin.ncol; ) 1029 for (; ++i < ncol; )
1081 if (tabs[i]) 1030 if (tabs[i])
1082 { 1031 {
1083 x = i; 1032 x = i;
1084 if (!--count) 1033 if (!--count)
1085 break; 1034 break;
1086 } 1035 }
1087 else 1036 else
1088 ht &= tp[i] == ' ' 1037 ht &= l.t[i] == ' '
1089 && RS_SAME (rp[i], base_rend); 1038 && RS_SAME (l.r[i], base_rend);
1090 1039
1091 if (count) 1040 if (count)
1092 x = TermWin.ncol - 1; 1041 x = ncol - 1;
1093 1042
1094 // store horizontal tab commands as characters inside the text 1043 // store horizontal tab commands as characters inside the text
1095 // buffer so they can be selected and pasted. 1044 // buffer so they can be selected and pasted.
1096 if (ht && options & Opt_pastableTabs) 1045 if (ht && options & Opt_pastableTabs)
1097 { 1046 {
1098 base_rend = SET_FONT (base_rend, 0); 1047 base_rend = SET_FONT (base_rend, 0);
1099 1048
1100 if (screen.tlen[row] != -1) /* XXX: think about this */ 1049 if (!l.is_longer ()) /* XXX: think about this */
1101 MAX_IT (screen.tlen[row], x); 1050 MAX_IT (l.l, x);
1102 1051
1103 i = screen.cur.col; 1052 i = screen.cur.col;
1104 1053
1105 tp[i] = '\t'; 1054 l.t[i] = '\t';
1106 rp[i] = base_rend; 1055 l.r[i] = base_rend;
1107 1056
1108 while (++i < x) 1057 while (++i < x)
1109 { 1058 {
1110 tp[i] = NOCHAR; 1059 l.t[i] = NOCHAR;
1111 rp[i] = base_rend; 1060 l.r[i] = base_rend;
1112 } 1061 }
1113 } 1062 }
1114 } 1063 }
1115 else /* if (count < 0) */ 1064 else /* if (count < 0) */
1116 { 1065 {
… …
1142rxvt_term::scr_backindex () 1091rxvt_term::scr_backindex ()
1143{ 1092{
1144 if (screen.cur.col > 0) 1093 if (screen.cur.col > 0)
1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1146 else 1095 else
1147 {
1148 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1149 return; /* um, yeah? */
1150
1151 scr_insdel_chars (1, INSERT); 1096 scr_insdel_chars (1, INSERT);
1152 }
1153} 1097}
1154#endif 1098#endif
1155/* ------------------------------------------------------------------------- */ 1099/* ------------------------------------------------------------------------- */
1156/* 1100/*
1157 * Process DEC Forward Index 1101 * Process DEC Forward Index
… …
1163void 1107void
1164rxvt_term::scr_forwardindex () 1108rxvt_term::scr_forwardindex ()
1165{ 1109{
1166 int row; 1110 int row;
1167 1111
1168 if (screen.cur.col < TermWin.ncol - 1) 1112 if (screen.cur.col < ncol - 1)
1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1170 else 1114 else
1171 { 1115 {
1172 row = screen.cur.row + TermWin.saveLines; 1116 row = screen.cur.row;
1173 1117
1174 if (screen.tlen[row] == 0) 1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1175 return; /* um, yeah? */ 1119 ROW(row).l = ncol;
1176 else if (screen.tlen[row] == -1)
1177 screen.tlen[row] = TermWin.ncol;
1178 1120
1179 scr_gotorc (0, 0, R_RELATIVE); 1121 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1122 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1123 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1124 }
1183} 1125}
1184#endif 1126#endif
1185 1127
1186/* ------------------------------------------------------------------------- */ 1128/* ------------------------------------------------------------------------- */
… …
1193 want_refresh = 1; 1135 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1136 ZERO_SCROLLBACK ();
1195 1137
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1139 MAX_IT (screen.cur.col, 0);
1198 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1140 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1199 1141
1200 screen.flags &= ~Screen_WrapNext; 1142 screen.flags &= ~Screen_WrapNext;
1201 1143
1202 if (relative & R_RELATIVE) 1144 if (relative & R_RELATIVE)
1203 { 1145 {
… …
1228 else 1170 else
1229 screen.cur.row = row; 1171 screen.cur.row = row;
1230 } 1172 }
1231 1173
1232 MAX_IT (screen.cur.row, 0); 1174 MAX_IT (screen.cur.row, 0);
1233 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1175 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1234} 1176}
1235 1177
1236/* ------------------------------------------------------------------------- */ 1178/* ------------------------------------------------------------------------- */
1237/* 1179/*
1238 * direction should be UP or DN 1180 * direction should be UP or DN
… …
1249 1191
1250 screen.flags &= ~Screen_WrapNext; 1192 screen.flags &= ~Screen_WrapNext;
1251 1193
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1194 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1195 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1197 else
1256 screen.cur.row += dirn; 1198 screen.cur.row += dirn;
1257 1199
1258 MAX_IT (screen.cur.row, 0); 1200 MAX_IT (screen.cur.row, 0);
1259 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1201 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1260 selection_check (0); 1202 selection_check (0);
1261} 1203}
1262 1204
1263/* ------------------------------------------------------------------------- */ 1205/* ------------------------------------------------------------------------- */
1264/* 1206/*
… …
1275 want_refresh = 1; 1217 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1218 ZERO_SCROLLBACK ();
1277 1219
1278 selection_check (1); 1220 selection_check (1);
1279 1221
1280 row = TermWin.saveLines + screen.cur.row; 1222 row = screen.cur.row;
1223
1281 switch (mode) 1224 switch (mode)
1282 { 1225 {
1283 case 0: /* erase to end of line */ 1226 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1227 col = screen.cur.col;
1285 num = TermWin.ncol - col; 1228 num = ncol - col;
1286 MIN_IT (screen.tlen[row], (int16_t)col); 1229 MIN_IT (ROW(row).l, (int16_t)col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1232 CLEAR_SELECTION ();
1290 break; 1233 break;
1291 case 1: /* erase to beginning of line */ 1234 case 1: /* erase to beginning of line */
… …
1295 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1238 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1296 CLEAR_SELECTION (); 1239 CLEAR_SELECTION ();
1297 break; 1240 break;
1298 case 2: /* erase whole line */ 1241 case 2: /* erase whole line */
1299 col = 0; 1242 col = 0;
1300 num = TermWin.ncol; 1243 num = ncol;
1301 screen.tlen[row] = 0; 1244 ROW(row).l = 0;
1302 if (selection.beg.row <= screen.cur.row 1245 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1246 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1247 CLEAR_SELECTION ();
1305 break; 1248 break;
1306 default: 1249 default:
1307 return; 1250 return;
1308 } 1251 }
1309 1252
1310 if (screen.text[row]) 1253 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} 1254}
1315 1255
1316/* ------------------------------------------------------------------------- */ 1256/* ------------------------------------------------------------------------- */
1317/* 1257/*
1318 * Erase part of whole of the screen 1258 * Erase part of whole of the screen
… …
1322 */ 1262 */
1323void 1263void
1324rxvt_term::scr_erase_screen (int mode) 1264rxvt_term::scr_erase_screen (int mode)
1325{ 1265{
1326 int num; 1266 int num;
1327 int32_t row, row_offset; 1267 int32_t row;
1328 rend_t ren; 1268 rend_t ren;
1329 XGCValues gcvalue; 1269 XGCValues gcvalue;
1330 1270
1331 want_refresh = 1; 1271 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)TermWin.saveLines;
1335 1273
1336 switch (mode) 1274 switch (mode)
1337 { 1275 {
1338 case 0: /* erase to end of screen */ 1276 case 0: /* erase to end of screen */
1339 selection_check (1); 1277 selection_check (1);
1340 scr_erase_line (0); 1278 scr_erase_line (0);
1341 row = screen.cur.row + 1; /* possible OOB */ 1279 row = screen.cur.row + 1; /* possible OOB */
1342 num = TermWin.nrow - row; 1280 num = nrow - row;
1343 break; 1281 break;
1344 case 1: /* erase to beginning of screen */ 1282 case 1: /* erase to beginning of screen */
1345 selection_check (3); 1283 selection_check (3);
1346 scr_erase_line (1); 1284 scr_erase_line (1);
1347 row = 0; 1285 row = 0;
1348 num = screen.cur.row; 1286 num = screen.cur.row;
1349 break; 1287 break;
1350 case 2: /* erase whole screen */ 1288 case 2: /* erase whole screen */
1351 selection_check (3); 1289 selection_check (3);
1352 row = 0; 1290 row = 0;
1353 num = TermWin.nrow; 1291 num = nrow;
1354 break; 1292 break;
1355 default: 1293 default:
1356 return; 1294 return;
1357 } 1295 }
1358 1296
… …
1360 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1298 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1361 || (selection.end.row >= row 1299 || (selection.end.row >= row
1362 && selection.end.row <= row + num))) 1300 && selection.end.row <= row + num)))
1363 CLEAR_SELECTION (); 1301 CLEAR_SELECTION ();
1364 1302
1365 if (row >= TermWin.nrow) /* Out Of Bounds */ 1303 if (row >= nrow) /* Out Of Bounds */
1366 return; 1304 return;
1367 1305
1368 MIN_IT (num, (TermWin.nrow - row)); 1306 MIN_IT (num, (nrow - row));
1369 1307
1370 if (rstyle & (RS_RVid | RS_Uline)) 1308 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1309 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1310 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1311 {
… …
1376 } 1314 }
1377 else 1315 else
1378 { 1316 {
1379 ren = rstyle & (RS_fgMask | RS_bgMask); 1317 ren = rstyle & (RS_fgMask | RS_bgMask);
1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1318 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1319 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1382 ERASE_ROWS (row, num); 1320 ERASE_ROWS (row, num);
1383 gcvalue.foreground = pix_colors[Color_fg]; 1321 gcvalue.foreground = pix_colors[Color_fg];
1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1322 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1323 }
1386 1324
1387 for (; num--; row++) 1325 for (; num--; row++)
1388 { 1326 {
1389 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1327 scr_blank_screen_mem (ROW (row), rstyle);
1390 screen.tlen[row + row_offset] = 0; 1328 ROW (row).l = 0;
1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1329 scr_blank_line (drawn[row], 0, ncol, ren);
1392 } 1330 }
1393} 1331}
1394 1332
1395#if ENABLE_FRILLS 1333#if ENABLE_FRILLS
1396void 1334void
1397rxvt_term::scr_erase_savelines () 1335rxvt_term::scr_erase_savelines ()
1398{ 1336{
1399 want_refresh = 1; 1337 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1401 1339
1402 TermWin.nscrolled = 0; 1340 nsaved = 0;
1403} 1341}
1404#endif 1342#endif
1405 1343
1406/* ------------------------------------------------------------------------- */ 1344/* ------------------------------------------------------------------------- */
1407/* 1345/*
… …
1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1347 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1410 */ 1348 */
1411void 1349void
1412rxvt_term::scr_E () 1350rxvt_term::scr_E ()
1413{ 1351{
1414 int i, j, k;
1415 rend_t *r1, fs; 1352 rend_t fs;
1416 1353
1417 want_refresh = 1; 1354 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1355 ZERO_SCROLLBACK ();
1419 1356
1420 num_scr_allow = 0; 1357 num_scr_allow = 0;
1421 selection_check (3); 1358 selection_check (3);
1422 1359
1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1360 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1361 for (int row = nrow; row--; )
1425 { 1362 {
1426 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1363 line_t &line = ROW(row);
1364
1427 fill_text (screen.text[k], 'E', TermWin.ncol); 1365 fill_text (line.t, 'E', ncol);
1428 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1366 rend_t *r1 = line.r;
1367
1368 for (int j = ncol; j--; )
1429 *r1++ = fs; 1369 *r1++ = fs;
1370
1371 line.l = ncol; /* make the `E's selectable */
1430 } 1372 }
1431} 1373}
1432 1374
1433/* ------------------------------------------------------------------------- */ 1375/* ------------------------------------------------------------------------- */
1434/* 1376/*
… …
1455 count = end; 1397 count = end;
1456 } 1398 }
1457 1399
1458 scr_do_wrap (); 1400 scr_do_wrap ();
1459 1401
1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1402 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461} 1403}
1462 1404
1463/* ------------------------------------------------------------------------- */ 1405/* ------------------------------------------------------------------------- */
1464/* 1406/*
1465 * Insert/Delete <count> characters from the current position 1407 * Insert/Delete <count> characters from the current position
… …
1467void 1409void
1468rxvt_term::scr_insdel_chars (int count, int insdel) 1410rxvt_term::scr_insdel_chars (int count, int insdel)
1469{ 1411{
1470 int col, row; 1412 int col, row;
1471 rend_t tr; 1413 rend_t tr;
1472 text_t *stp;
1473 rend_t *srp;
1474 int16_t *slp;
1475 1414
1476 want_refresh = 1; 1415 want_refresh = 1;
1477 ZERO_SCROLLBACK (); 1416 ZERO_SCROLLBACK ();
1478 1417
1479 if (count <= 0) 1418 if (count <= 0)
1480 return; 1419 return;
1481 1420
1482 scr_do_wrap (); 1421 scr_do_wrap ();
1483 1422
1484 selection_check (1); 1423 selection_check (1);
1485 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1424 MIN_IT (count, (ncol - screen.cur.col));
1486 1425
1487 row = screen.cur.row + TermWin.saveLines;
1488
1489 stp = screen.text[row];
1490 srp = screen.rend[row]; 1426 row = screen.cur.row;
1491 slp = &screen.tlen[row]; 1427
1428 line_t *line = &ROW(row);
1492 1429
1493 switch (insdel) 1430 switch (insdel)
1494 { 1431 {
1495 case INSERT: 1432 case INSERT:
1496 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1433 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1497 { 1434 {
1498 stp[col] = stp[col - count]; 1435 line->t[col] = line->t[col - count];
1499 srp[col] = srp[col - count]; 1436 line->r[col] = line->r[col - count];
1500 } 1437 }
1501 1438
1502 if (*slp != -1) 1439 if (!line->is_longer ())
1503 { 1440 {
1504 *slp += count; 1441 line->l += count;
1505 MIN_IT (*slp, TermWin.ncol); 1442 MIN_IT (line->l, ncol);
1506 } 1443 }
1507 1444
1508 if (selection.op && current_screen == selection.screen 1445 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1447 {
1511 if (selection.end.row != screen.cur.row 1448 if (selection.end.row != screen.cur.row
1512 || (selection.end.col + count >= TermWin.ncol)) 1449 || (selection.end.col + count >= ncol))
1513 CLEAR_SELECTION (); 1450 CLEAR_SELECTION ();
1514 else 1451 else
1515 { /* shift selection */ 1452 { /* shift selection */
1516 selection.beg.col += count; 1453 selection.beg.col += count;
1517 selection.mark.col += count; /* XXX: yes? */ 1454 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1455 selection.end.col += count;
1519 } 1456 }
1520 } 1457 }
1521 1458
1522 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1459 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 (unsigned int)count, rstyle);
1524 break; 1460 break;
1525 1461
1526 case ERASE: 1462 case ERASE:
1527 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1463 screen.cur.col += count; /* don't worry if > ncol */
1528 selection_check (1); 1464 selection_check (1);
1529 screen.cur.col -= count; 1465 screen.cur.col -= count;
1530 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1466 scr_blank_line (*line, screen.cur.col, count, rstyle);
1531 (unsigned int)count, rstyle);
1532 break; 1467 break;
1533 1468
1534 case DELETE: 1469 case DELETE:
1535 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1470 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1536 1471
1537 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1472 for (col = screen.cur.col; (col + count) < ncol; col++)
1538 { 1473 {
1539 stp[col] = stp[col + count]; 1474 line->t[col] = line->t[col + count];
1540 srp[col] = srp[col + count]; 1475 line->r[col] = line->r[col + count];
1541 } 1476 }
1542 1477
1543 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1478 scr_blank_line (*line, ncol - count, count, tr);
1544 (unsigned int)count, tr);
1545 1479
1546 if (*slp == -1) /* break line continuation */ 1480 if (line->is_longer ()) /* break line continuation */
1547 *slp = TermWin.ncol; 1481 line->l = ncol;
1548 1482
1549 *slp -= count; 1483 line->l = max (line->l - count, 0);
1550 MAX_IT (*slp, 0);
1551 1484
1552 if (selection.op && current_screen == selection.screen 1485 if (selection.op && current_screen == selection.screen
1553 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1554 { 1487 {
1555 if (selection.end.row != screen.cur.row 1488 if (selection.end.row != screen.cur.row
1556 || (screen.cur.col >= selection.beg.col - count) 1489 || (screen.cur.col >= selection.beg.col - count)
1557 || selection.end.col >= TermWin.ncol) 1490 || selection.end.col >= ncol)
1558 CLEAR_SELECTION (); 1491 CLEAR_SELECTION ();
1559 else 1492 else
1560 { 1493 {
1561 /* shift selection */ 1494 /* shift selection */
1562 selection.beg.col -= count; 1495 selection.beg.col -= count;
… …
1576 */ 1509 */
1577void 1510void
1578rxvt_term::scr_scroll_region (int top, int bot) 1511rxvt_term::scr_scroll_region (int top, int bot)
1579{ 1512{
1580 MAX_IT (top, 0); 1513 MAX_IT (top, 0);
1581 MIN_IT (bot, (int)TermWin.nrow - 1); 1514 MIN_IT (bot, (int)nrow - 1);
1582 1515
1583 if (top > bot) 1516 if (top > bot)
1584 return; 1517 return;
1585 1518
1586 screen.tscroll = top; 1519 screen.tscroll = top;
… …
1665 */ 1598 */
1666void 1599void
1667rxvt_term::scr_set_tab (int mode) 1600rxvt_term::scr_set_tab (int mode)
1668{ 1601{
1669 if (mode < 0) 1602 if (mode < 0)
1670 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1603 memset (tabs, 0, ncol * sizeof (char));
1671 else if (screen.cur.col < TermWin.ncol) 1604 else if (screen.cur.col < ncol)
1672 tabs[screen.cur.col] = (mode ? 1 : 0); 1605 tabs[screen.cur.col] = (mode ? 1 : 0);
1673} 1606}
1674 1607
1675/* ------------------------------------------------------------------------- */ 1608/* ------------------------------------------------------------------------- */
1676/* 1609/*
… …
1691 if (bgPixmap.pixmap == None) 1624 if (bgPixmap.pixmap == None)
1692#endif 1625#endif
1693#if TRANSPARENT 1626#if TRANSPARENT
1694 if (! (options & Opt_transparent) || am_transparent == 0) 1627 if (! (options & Opt_transparent) || am_transparent == 0)
1695#endif 1628#endif
1696 XSetWindowBackground (display->display, TermWin.vt, 1629 XSetWindowBackground (display->display, vt,
1697 pix_colors[Color_bg]); 1630 pix_colors[Color_bg]);
1698 1631
1699 gcvalue.foreground = pix_colors[Color_fg]; 1632 gcvalue.foreground = pix_colors[Color_fg];
1700 gcvalue.background = pix_colors[Color_bg]; 1633 gcvalue.background = pix_colors[Color_bg];
1701 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1634 XChangeGC (display->display, gc, GCBackground | GCForeground,
1702 &gcvalue); 1635 &gcvalue);
1703 scr_clear (); 1636 scr_clear ();
1704 scr_touch (true); 1637 scr_touch (true);
1705 } 1638 }
1706} 1639}
… …
1787bool 1720bool
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1721rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1789{ 1722{
1790 bool found = false; 1723 bool found = false;
1791 1724
1792 for (int i = 0; i < TermWin.nrow; i++) 1725 for (int i = 0; i < nrow; i++)
1793 { 1726 {
1794 int col = 0; 1727 int col = 0;
1795 rend_t *drp = drawn_rend [i]; 1728 rend_t *drp = drawn[i].r;
1796 1729
1797 for (; col < TermWin.ncol; col++, drp++) 1730 for (; col < ncol; col++, drp++)
1798 if ((*drp & mask) == value) 1731 if ((*drp & mask) == value)
1799 { 1732 {
1800 found = true; 1733 found = true;
1801 *drp = ~value; 1734 *drp = ~value;
1802 } 1735 }
… …
1813 PART_END, 1746 PART_END,
1814 RC_COUNT 1747 RC_COUNT
1815}; 1748};
1816 1749
1817void 1750void
1818rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1819{ 1752{
1820 int i; 1753 int i;
1821 row_col_t rc[RC_COUNT]; 1754 row_col_t rc[RC_COUNT];
1822 1755
1823 if (drawn_text == NULL) /* sanity check */ 1756 if (!drawn) /* sanity check */
1824 return; 1757 return;
1825 1758
1826#ifndef NO_SLOW_LINK_SUPPORT 1759#ifndef NO_SLOW_LINK_SUPPORT
1827 if (refresh_type == FAST_REFRESH && !display->is_local) 1760 if (refresh_type == FAST_REFRESH && !display->is_local)
1828 { 1761 {
1829 y = 0; 1762 y = 0;
1830 height = TermWin.height; 1763 eheight = height;
1831 } 1764 }
1832#endif 1765#endif
1833 1766
1834#ifdef DEBUG_STRICT 1767#ifdef DEBUG_STRICT
1835 x = max (x, 0); 1768 x = max (x, 0);
1836 x = min (x, (int)TermWin.width); 1769 x = min (x, (int)width);
1837 y = max (y, 0); 1770 y = max (y, 0);
1838 y = min (y, (int)TermWin.height); 1771 y = min (y, (int)height);
1839#endif 1772#endif
1840 1773
1841 /* round down */ 1774 /* round down */
1842 rc[PART_BEG].col = Pixel2Col (x); 1775 rc[PART_BEG].col = Pixel2Col (x);
1843 rc[PART_BEG].row = Pixel2Row (y); 1776 rc[PART_BEG].row = Pixel2Row (y);
1844 /* round up */ 1777 /* round up */
1845 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1778 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1846 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1779 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1847 1780
1848 /* sanity checks */ 1781 /* sanity checks */
1849 for (i = PART_BEG; i < RC_COUNT; i++) 1782 for (i = PART_BEG; i < RC_COUNT; i++)
1850 { 1783 {
1851 MIN_IT (rc[i].col, TermWin.ncol - 1); 1784 MIN_IT (rc[i].col, ncol - 1);
1852 MIN_IT (rc[i].row, TermWin.nrow - 1); 1785 MIN_IT (rc[i].row, nrow - 1);
1853 } 1786 }
1854 1787
1855 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1788 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1856 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1789 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1857 1790
1858 if (refresh) 1791 if (refresh)
1859 scr_refresh (SLOW_REFRESH); 1792 scr_refresh (SLOW_REFRESH);
1860} 1793}
1861 1794
… …
1864 * Refresh the entire screen 1797 * Refresh the entire screen
1865 */ 1798 */
1866void 1799void
1867rxvt_term::scr_touch (bool refresh) 1800rxvt_term::scr_touch (bool refresh)
1868{ 1801{
1869 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1802 scr_expose (0, 0, width, height, refresh);
1870} 1803}
1871 1804
1872/* ------------------------------------------------------------------------- */ 1805/* ------------------------------------------------------------------------- */
1873/* 1806/*
1874 * Move the display so that the line represented by scrollbar value Y is at 1807 * Move the display so that the line represented by scrollbar value Y is at
… …
1878rxvt_term::scr_move_to (int y, int len) 1811rxvt_term::scr_move_to (int y, int len)
1879{ 1812{
1880 long p = 0; 1813 long p = 0;
1881 unsigned int oldviewstart; 1814 unsigned int oldviewstart;
1882 1815
1883 oldviewstart = TermWin.view_start; 1816 oldviewstart = view_start;
1884 1817
1885 if (y < len) 1818 if (y < len)
1886 { 1819 {
1887 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1820 p = (nrow + nsaved) * (len - y) / len;
1888 p -= (long) (TermWin.nrow - 1); 1821 p -= (long) (nrow - 1);
1889 p = max (p, 0); 1822 p = max (p, 0);
1890 } 1823 }
1891 1824
1892 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1825 view_start = (unsigned int)min (p, nsaved);
1893 1826
1894 return scr_changeview (oldviewstart); 1827 return scr_changeview (oldviewstart);
1895} 1828}
1896 1829
1897/* ------------------------------------------------------------------------- */ 1830/* ------------------------------------------------------------------------- */
… …
1903rxvt_term::scr_page (enum page_dirn direction, int nlines) 1836rxvt_term::scr_page (enum page_dirn direction, int nlines)
1904{ 1837{
1905 int n; 1838 int n;
1906 unsigned int oldviewstart; 1839 unsigned int oldviewstart;
1907 1840
1908 oldviewstart = TermWin.view_start; 1841 oldviewstart = view_start;
1909 1842
1910 if (direction == UP) 1843 if (direction == UP)
1911 { 1844 {
1912 n = TermWin.view_start + nlines; 1845 n = view_start + nlines;
1913 TermWin.view_start = min (n, TermWin.nscrolled); 1846 view_start = min (n, nsaved);
1914 } 1847 }
1915 else 1848 else
1916 { 1849 {
1917 n = TermWin.view_start - nlines; 1850 n = view_start - nlines;
1918 TermWin.view_start = max (n, 0); 1851 view_start = max (n, 0);
1919 } 1852 }
1920 1853
1921 return scr_changeview (oldviewstart); 1854 return scr_changeview (oldviewstart);
1922} 1855}
1923 1856
1924int 1857int
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1858rxvt_term::scr_changeview (unsigned int oldviewstart)
1926{ 1859{
1927 if (TermWin.view_start != oldviewstart) 1860 if (view_start != oldviewstart)
1928 { 1861 {
1929 want_refresh = 1; 1862 want_refresh = 1;
1930 num_scr -= (TermWin.view_start - oldviewstart); 1863 num_scr -= (view_start - oldviewstart);
1931 } 1864 }
1932 1865
1933 return (int) (TermWin.view_start - oldviewstart); 1866 return (int) (view_start - oldviewstart);
1934} 1867}
1935 1868
1936/* ------------------------------------------------------------------------- */ 1869/* ------------------------------------------------------------------------- */
1937void 1870void
1938rxvt_term::scr_bell () 1871rxvt_term::scr_bell ()
1939{ 1872{
1940#ifndef NO_BELL 1873#ifndef NO_BELL
1874
1941# ifndef NO_MAPALERT 1875# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1876# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1877 if (options & Opt_mapAlert)
1944# endif 1878# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1879 XMapWindow (display->display, parent[0]);
1946# endif 1880# endif
1881
1947 if (options & Opt_visualBell) 1882 if (options & Opt_visualBell)
1948 { 1883 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1884 scr_rvideo_mode (!rvideo); /* refresh also done */
1885 rxvt_usleep (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1886 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1887 }
1952 else 1888 else
1953 XBell (display->display, 0); 1889 XBell (display->display, 0);
1890
1954#endif 1891#endif
1955} 1892}
1956 1893
1957/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1895/* ARGSUSED */
1959void 1896void
1960rxvt_term::scr_printscreen (int fullhist) 1897rxvt_term::scr_printscreen (int fullhist)
1961{ 1898{
1962#ifdef PRINTPIPE 1899#ifdef PRINTPIPE
1963 int i, r1, nrows, row_offset; 1900 int nrows, row_start;
1964 FILE *fd; 1901 FILE *fd;
1965 1902
1966 if ((fd = popen_printer ()) == NULL) 1903 if ((fd = popen_printer ()) == NULL)
1967 return; 1904 return;
1968 1905
1969 nrows = TermWin.nrow;
1970 row_offset = TermWin.saveLines;
1971
1972 if (!fullhist) 1906 if (fullhist)
1973 row_offset -= TermWin.view_start; 1907 {
1908 nrows = nrow + nsaved;
1909 row_start = -nsaved;
1910 }
1974 else 1911 else
1975 { 1912 {
1976 nrows += TermWin.nscrolled; 1913 nrows = nrow;
1977 row_offset -= TermWin.nscrolled; 1914 row_start = -view_start;
1978 } 1915 }
1979 1916
1980 wctomb (0, 0); 1917 wctomb (0, 0);
1981 1918
1982 for (r1 = 0; r1 < nrows; r1++) 1919 for (int r1 = 0; r1 < nrows; r1++)
1983 { 1920 {
1984 text_t *tp = screen.text[r1 + row_offset]; 1921 text_t *tp = ROW(r1).t;
1985 int len = screen.tlen[r1 + row_offset]; 1922 int len = ROW(r1).l;
1986 1923
1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1924 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1988 { 1925 {
1989 char mb[MB_LEN_MAX]; 1926 char mb[MB_LEN_MAX];
1990 text_t t = *tp++; 1927 text_t t = *tp++;
1991 if (t == NOCHAR) 1928 if (t == NOCHAR)
1992 continue; 1929 continue;
… …
2013/* 1950/*
2014 * Refresh the screen 1951 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 1952 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 1953 * screen.text/screen.rend contain what the screen will change to.
2017 */ 1954 */
2018
2019#define FONT_WIDTH(X, Y) \
2020 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2021#define FONT_RBEAR(X, Y) \
2022 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2023#define FONT_LBEAR(X, Y) \
2024 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2025#define IS_FONT_CHAR(X, Y) \
2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2027
2028void 1955void
2029rxvt_term::scr_refresh (unsigned char refresh_type) 1956rxvt_term::scr_refresh (unsigned char refresh_type)
2030{ 1957{
2031 unsigned char must_clear, /* use draw_string not draw_image_string */ 1958 unsigned char must_clear, /* use draw_string not draw_image_string */
2032 showcursor; /* show the cursor */ 1959 showcursor; /* show the cursor */
2033 int16_t col, row, /* column/row we're processing */ 1960 int16_t col, row, /* column/row we're processing */
2034 ocrow; /* old cursor row */ 1961 ocrow; /* old cursor row */
2035 int i, /* tmp */ 1962 int i; /* tmp */
2036 row_offset; /* basic offset in screen structure */
2037#ifndef NO_CURSORCOLOR 1963#ifndef NO_CURSORCOLOR
2038 rend_t cc1; /* store colours at cursor position (s) */ 1964 rend_t cc1; /* store colours at cursor position (s) */
2039#endif 1965#endif
2040 rend_t *crp; // cursor rendition pointer 1966 rend_t *crp; // cursor rendition pointer
2041 1967
2042 want_refresh = 0; /* screen is current */ 1968 want_refresh = 0; /* screen is current */
2043 1969
2044 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1970 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 1971 return;
2046 1972
2047 /* 1973 /*
2048 * A: set up vars 1974 * A: set up vars
2049 */ 1975 */
2050 must_clear = 0; 1976 must_clear = 0;
2051 refresh_count = 0; 1977 refresh_count = 0;
2052 1978
2053 row_offset = TermWin.saveLines - TermWin.view_start;
2054
2055#if XPM_BACKGROUND 1979#if XPM_BACKGROUND
2056 must_clear |= (bgPixmap.pixmap != None); 1980 must_clear |= bgPixmap.pixmap != None;
2057#endif 1981#endif
2058#if TRANSPARENT 1982#if TRANSPARENT
2059 must_clear |= ((options & Opt_transparent) && am_transparent); 1983 must_clear |= (options & Opt_transparent) && am_transparent;
2060#endif 1984#endif
2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1985 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062 1986
2063 /* 1987 /*
2064 * B: reverse any characters which are selected 1988 * B: reverse any characters which are selected
… …
2081 2005
2082 if (showcursor) 2006 if (showcursor)
2083 { 2007 {
2084 int col = screen.cur.col; 2008 int col = screen.cur.col;
2085 2009
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2010 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2011 col--;
2088 2012
2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2013 crp = &ROW(screen.cur.row).r[col];
2090 2014
2091 if (showcursor && TermWin.focus) 2015 if (showcursor && focus)
2092 { 2016 {
2017 if (options & Opt_cursorUnderline)
2018 *crp ^= RS_Uline;
2019 else
2020 {
2093 *crp ^= RS_RVid; 2021 *crp ^= RS_RVid;
2022
2094#ifndef NO_CURSORCOLOR 2023#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask); 2024 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2025 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2026 ccol1 = Color_cursor;
2098 else 2027 else
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2028#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100 ccol1 = GET_FGCOLOR (rstyle); 2029 ccol1 = GET_FGCOLOR (rstyle);
2101#else 2030#else
2102 ccol1 = Color_fg; 2031 ccol1 = Color_fg;
2103#endif 2032#endif
2104 if (ISSET_PIXCOLOR (Color_cursor2)) 2033 if (ISSET_PIXCOLOR (Color_cursor2))
2105 ccol2 = Color_cursor2; 2034 ccol2 = Color_cursor2;
2106 else 2035 else
2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2036#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2108 ccol2 = GET_BGCOLOR (rstyle); 2037 ccol2 = GET_BGCOLOR (rstyle);
2109#else 2038#else
2110 ccol2 = Color_bg; 2039 ccol2 = Color_bg;
2111#endif 2040#endif
2112 *crp = SET_FGCOLOR (*crp, ccol1); 2041 *crp = SET_FGCOLOR (*crp, ccol1);
2113 *crp = SET_BGCOLOR (*crp, ccol2); 2042 *crp = SET_BGCOLOR (*crp, ccol2);
2114#endif 2043#endif
2044 }
2115 } 2045 }
2116 } 2046 }
2117 2047
2118 /* make sure no outline cursor is left around */ 2048 /* make sure no outline cursor is left around */
2119 setoldcursor = 0; 2049 setoldcursor = 0;
2120 if (ocrow != -1) 2050 if (ocrow != -1)
2121 { 2051 {
2122 if (screen.cur.row + TermWin.view_start != ocrow 2052 if (screen.cur.row + view_start != ocrow
2123 || screen.cur.col != oldcursor.col) 2053 || screen.cur.col != oldcursor.col)
2124 { 2054 {
2125 if (ocrow < TermWin.nrow 2055 if (ocrow < nrow
2126 && oldcursor.col < TermWin.ncol) 2056 && oldcursor.col < ncol)
2127 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2057 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2128 2058
2129 if (TermWin.focus || !showcursor) 2059 if (focus || !showcursor)
2130 oldcursor.row = -1; 2060 oldcursor.row = -1;
2131 else 2061 else
2132 setoldcursor = 1; 2062 setoldcursor = 1;
2133 } 2063 }
2134 } 2064 }
2135 else if (!TermWin.focus) 2065 else if (!focus)
2136 setoldcursor = 1; 2066 setoldcursor = 1;
2137 2067
2138 if (setoldcursor) 2068 if (setoldcursor)
2139 { 2069 {
2140 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2070 if (screen.cur.row + view_start >= nrow)
2141 oldcursor.row = -1; 2071 oldcursor.row = -1;
2142 else 2072 else
2143 { 2073 {
2144 oldcursor.row = screen.cur.row + TermWin.view_start; 2074 oldcursor.row = screen.cur.row + view_start;
2145 oldcursor.col = screen.cur.col; 2075 oldcursor.col = screen.cur.col;
2146 } 2076 }
2147 } 2077 }
2148 } 2078 }
2149 2079
2150#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2151 scr_swap_overlay (); 2081 scr_swap_overlay ();
2152#endif 2082#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156 2083
2157#ifndef NO_SLOW_LINK_SUPPORT 2084#ifndef NO_SLOW_LINK_SUPPORT
2158 /* 2085 /*
2159 * D: CopyArea pass - very useful for slower links 2086 * D: CopyArea pass - very useful for slower links
2160 * This has been deliberately kept simple. 2087 * This has been deliberately kept simple.
2161 */ 2088 */
2162 i = num_scr; 2089 i = num_scr;
2163 if (!display->is_local 2090 if (!display->is_local
2164 && refresh_type == FAST_REFRESH && num_scr_allow && i 2091 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2165 && abs (i) < TermWin.nrow && !must_clear) 2092 && abs (num_scr) < nrow && !must_clear)
2166 { 2093 {
2167 int16_t nits; 2094 int16_t nits;
2168 int j; 2095 int j;
2169 int len, wlen; 2096 int len, wlen;
2170 2097
2171 j = TermWin.nrow; 2098 j = nrow;
2172 wlen = len = -1; 2099 wlen = len = -1;
2173 row = i > 0 ? 0 : j - 1; 2100 row = i > 0 ? 0 : j - 1;
2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2101 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2175 { 2102 {
2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2103 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2177 { 2104 {
2178 text_t *stp = screen.text[row + row_offset]; 2105 line_t s = ROW(row - view_start);
2179 rend_t *srp = screen.rend[row + row_offset];
2180 text_t *dtp = drawn_text[row]; 2106 line_t d = drawn[row];
2181 text_t *dtp2 = drawn_text[row + i]; 2107 line_t d2 = drawn[row + i];
2182 rend_t *drp = drawn_rend[row];
2183 rend_t *drp2 = drawn_rend[row + i];
2184 2108
2185 for (nits = 0, col = TermWin.ncol; col--; ) 2109 for (nits = 0, col = ncol; col--; )
2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2110 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2187 nits--; 2111 nits--;
2188 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2112 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2189 nits++; 2113 nits++;
2190 2114
2191 if (nits > 8) /* XXX: arbitrary choice */ 2115 if (nits > 8) /* XXX: arbitrary choice */
2192 { 2116 {
2193 for (col = TermWin.ncol; col--; ) 2117 for (col = ncol; col--; )
2194 { 2118 {
2195 *dtp++ = *dtp2++; 2119 *d.t++ = *d2.t++;
2196 *drp++ = *drp2++; 2120 *d.r++ = *d2.r++;
2197 } 2121 }
2198 2122
2199 if (len == -1) 2123 if (len == -1)
2200 len = row; 2124 len = row;
2201 2125
… …
2208 { 2132 {
2209 /* also comes here at end if needed because of >= above */ 2133 /* also comes here at end if needed because of >= above */
2210 if (wlen < len) 2134 if (wlen < len)
2211 SWAP_IT (wlen, len, int); 2135 SWAP_IT (wlen, len, int);
2212 2136
2213 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2137 XCopyArea (display->display, vt, vt,
2214 TermWin.gc, 0, Row2Pixel (len + i), 2138 gc, 0, Row2Pixel (len + i),
2215 (unsigned int)TermWin_TotalWidth (), 2139 (unsigned int)TermWin_TotalWidth (),
2216 (unsigned int)Height2Pixel (wlen - len + 1), 2140 (unsigned int)Height2Pixel (wlen - len + 1),
2217 0, Row2Pixel (len)); 2141 0, Row2Pixel (len));
2218 len = -1; 2142 len = -1;
2219 } 2143 }
… …
2222#endif 2146#endif
2223 2147
2224 /* 2148 /*
2225 * E: main pass across every character 2149 * E: main pass across every character
2226 */ 2150 */
2227 for (row = 0; row < TermWin.nrow; row++) 2151 for (row = 0; row < nrow; row++)
2228 { 2152 {
2229 text_t *stp = screen.text[row + row_offset]; 2153 text_t *stp = ROW(row - view_start).t;
2230 rend_t *srp = screen.rend[row + row_offset]; 2154 rend_t *srp = ROW(row - view_start).r;
2231 text_t *dtp = drawn_text[row]; 2155 text_t *dtp = drawn[row].t;
2232 rend_t *drp = drawn_rend[row]; 2156 rend_t *drp = drawn[row].r;
2233 2157
2234 /* 2158 /*
2235 * E2: OK, now the real pass 2159 * E2: OK, now the real pass
2236 */ 2160 */
2237 int ypixel = (int)Row2Pixel (row); 2161 int ypixel = (int)Row2Pixel (row);
2238 2162
2239 for (col = 0; col < TermWin.ncol; col++) 2163 for (col = 0; col < ncol; col++)
2240 { 2164 {
2241 /* compare new text with old - if exactly the same then continue */ 2165 /* compare new text with old - if exactly the same then continue */
2242 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2166 if (stp[col] == dtp[col] /* Must match characters to skip. */
2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2167 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244 || (stp[col] == ' ' /* space w/ no background change */ 2168 || (stp[col] == ' ' /* space w/ no background change */
… …
2258 dtp[col] = stp[col]; 2182 dtp[col] = stp[col];
2259 drp[col] = rend; 2183 drp[col] = rend;
2260 2184
2261 int xpixel = Col2Pixel (col); 2185 int xpixel = Col2Pixel (col);
2262 2186
2263 for (i = 0; ++col < TermWin.ncol; ) 2187 for (i = 0; ++col < ncol; )
2264 { 2188 {
2265 if (stp[col] == NOCHAR) 2189 if (stp[col] == NOCHAR)
2266 { 2190 {
2267 dtp[col] = stp[col]; 2191 dtp[col] = stp[col];
2268 drp[col] = rend; 2192 drp[col] = rend;
… …
2296 2220
2297 // sometimes we optimize away the trailing NOCHAR's, add them back 2221 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR) 2222 while (i && text[count] == NOCHAR)
2299 count++, i--; 2223 count++, i--;
2300 2224
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2312
2313 /* 2225 /*
2314 * Determine the attributes for the string 2226 * Determine the attributes for the string
2315 */ 2227 */
2316 int fore = GET_FGCOLOR (rend); // desired foreground 2228 int fore = GET_FGCOLOR (rend); // desired foreground
2317 int back = GET_BGCOLOR (rend); // desired background 2229 int back = GET_BGCOLOR (rend); // desired background
2318 2230
2319 // only do special processing if ana attributes are set, which is rare 2231 // only do special processing if any attributes are set, which is rare
2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2232 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2321 { 2233 {
2234#if ENABLE_STYLES
2235 // force redraw after "careful" characters to avoid pixel droppings
2236 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2237 drp[col + 1] = ~srp[col + 1];
2238
2239 // include previous careful character(s) if possible, looks nicer (best effort...)
2240 while (text > stp
2241 && srp[text - stp - 1] & RS_Careful
2242 && RS_SAME (rend, srp[text - stp - 1]))
2243 text--, count++, xpixel -= fwidth;
2244#endif
2245
2322 bool invert = rend & RS_RVid; 2246 bool invert = rend & RS_RVid;
2323 2247
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2248#ifndef NO_BOLD_UNDERLINE_REVERSE
2325 if (rend & RS_Bold 2249 if (rend & RS_Bold
2326 && fore == Color_fg) 2250 && fore == Color_fg)
… …
2353 SWAP_IT (fore, back, int); 2277 SWAP_IT (fore, back, int);
2354 2278
2355#ifndef NO_BOLD_UNDERLINE_REVERSE 2279#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV)) 2280 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV; 2281 back = Color_RV;
2282
2283 if (fore == back)
2284 {
2285 fore = Color_bg;
2286 back = Color_fg;
2287 }
2358#endif 2288#endif
2359 } 2289 }
2360 2290
2361#ifdef TEXT_BLINK 2291#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2292 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2373 } 2303 }
2374 2304
2375 /* 2305 /*
2376 * Actually do the drawing of the string here 2306 * Actually do the drawing of the string here
2377 */ 2307 */
2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2308 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2379 2309
2380 if (back == fore) 2310 if (back == fore)
2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2311 font->clear_rect (*drawable, xpixel, ypixel,
2382 TermWin.fwidth * count, TermWin.fheight, 2312 fwidth * count, fheight,
2383 back); 2313 back);
2384 else if (back == Color_bg) 2314 else if (back == Color_bg)
2385 { 2315 {
2386 if (must_clear) 2316 if (must_clear)
2387 { 2317 {
2388 CLEAR_CHARS (xpixel, ypixel, count); 2318 CLEAR_CHARS (xpixel, ypixel, count);
2389 2319
2390 for (i = 0; i < count; i++) /* don't draw empty strings */ 2320 for (i = 0; i < count; i++) /* don't draw empty strings */
2391 if (text[i] != ' ') 2321 if (text[i] != ' ')
2392 { 2322 {
2393 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2323 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2394 break; 2324 break;
2395 } 2325 }
2396 } 2326 }
2397 else 2327 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2328 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2399 } 2329 }
2400 else 2330 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2331 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2402 2332
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2333 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2334 {
2405#if ENABLE_FRILLS 2335#if ENABLE_FRILLS
2406 if (ISSET_PIXCOLOR (Color_underline)) 2336 if (ISSET_PIXCOLOR (Color_underline))
2407 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2337 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2408 else 2338 else
2409#endif 2339#endif
2410 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2340 XSetForeground (display->display, gc, pix_colors[fore]);
2411 2341
2412 XDrawLine (display->display, drawBuffer, TermWin.gc, 2342 XDrawLine (display->display, drawBuffer, gc,
2413 xpixel, ypixel + font->ascent + 1, 2343 xpixel, ypixel + font->ascent + 1,
2414 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2344 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2415 } 2345 }
2416 } /* for (col....) */ 2346 } /* for (col....) */
2417 } /* for (row....) */ 2347 } /* for (row....) */
… …
2423 /* 2353 /*
2424 * G: cleanup cursor and display outline cursor if necessary 2354 * G: cleanup cursor and display outline cursor if necessary
2425 */ 2355 */
2426 if (showcursor) 2356 if (showcursor)
2427 { 2357 {
2428 if (TermWin.focus) 2358 if (focus)
2359 {
2360 if (options & Opt_cursorUnderline)
2361 *crp ^= RS_Uline;
2362 else
2429 { 2363 {
2430 *crp ^= RS_RVid; 2364 *crp ^= RS_RVid;
2431#ifndef NO_CURSORCOLOR 2365#ifndef NO_CURSORCOLOR
2432 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2366 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2433#endif 2367#endif
2368 }
2434 } 2369 }
2435 else if (oldcursor.row >= 0) 2370 else if (oldcursor.row >= 0)
2436 { 2371 {
2372 int cursorwidth = 1;
2373 int col = oldcursor.col;
2374
2375 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2376 col--;
2377
2378 while (col + cursorwidth < ncol
2379 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2380 cursorwidth++;
2381
2437#ifndef NO_CURSORCOLOR 2382#ifndef NO_CURSORCOLOR
2438 if (ISSET_PIXCOLOR (Color_cursor)) 2383 if (ISSET_PIXCOLOR (Color_cursor))
2439 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2384 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2440#endif 2385#endif
2441 int cursorwidth = 1;
2442 while (oldcursor.col + cursorwidth < TermWin.ncol
2443 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2444 cursorwidth++;
2445 2386
2446 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2387 XDrawRectangle (display->display, drawBuffer, gc,
2447 Col2Pixel (oldcursor.col), 2388 Col2Pixel (col),
2448 Row2Pixel (oldcursor.row), 2389 Row2Pixel (oldcursor.row),
2449 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2390 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2450 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2391 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2451 } 2392 }
2452 } 2393 }
2453 2394
2454 /* 2395 /*
2455 * H: cleanup selection 2396 * H: cleanup selection
… …
2462 num_scr = 0; 2403 num_scr = 0;
2463 num_scr_allow = 1; 2404 num_scr_allow = 1;
2464} 2405}
2465 2406
2466void 2407void
2467rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2408rxvt_term::scr_remap_chars (const line_t &l)
2468{ 2409{
2469 if (!rp || !tp) 2410 if (!l.t)
2470 return; 2411 return;
2471 2412
2472 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2413 for (int i = ncol; i--; )
2473 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2414 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2474} 2415}
2475 2416
2476void 2417void
2477rxvt_term::scr_remap_chars () 2418rxvt_term::scr_remap_chars ()
2478{ 2419{
2479 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2420 for (int i = total_rows; i--; )
2480 scr_remap_chars (screen.text[i], screen.rend[i]); 2421 scr_remap_chars (save[i]);
2481 2422
2482 for (int i = TermWin.nrow; i--; ) 2423 for (int i = nrow; i--; )
2483 { 2424 {
2484 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2425 scr_remap_chars (drawn[i]);
2485 scr_remap_chars (swap.text[i], swap.rend[i]); 2426 scr_remap_chars (swap_save[i]);
2486 } 2427 }
2487} 2428}
2488 2429
2489void 2430void
2490rxvt_term::scr_recolour () 2431rxvt_term::scr_recolour ()
… …
2496#if XPM_BACKGROUND 2437#if XPM_BACKGROUND
2497 && !bgPixmap.pixmap 2438 && !bgPixmap.pixmap
2498#endif 2439#endif
2499 ) 2440 )
2500 { 2441 {
2501 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2442 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2502 XClearWindow (display->display, TermWin.parent[0]); 2443 XClearWindow (display->display, parent[0]);
2503 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2444 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2504#if HAVE_SCROLLBARS 2445#if HAVE_SCROLLBARS
2505 if (scrollBar.win) 2446 if (scrollBar.win)
2506 { 2447 {
2507 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2448 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2508 scrollBar.setIdle (); 2449 scrollBar.setIdle ();
… …
2518 2459
2519/* ------------------------------------------------------------------------- */ 2460/* ------------------------------------------------------------------------- */
2520void 2461void
2521rxvt_term::scr_clear (bool really) 2462rxvt_term::scr_clear (bool really)
2522{ 2463{
2523 if (!TermWin.mapped) 2464 if (!mapped)
2524 return; 2465 return;
2525 2466
2526 num_scr_allow = 0; 2467 num_scr_allow = 0;
2527 want_refresh = 1; 2468 want_refresh = 1;
2528 2469
2529#if TRANSPARENT
2530 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2531 {
2532 int i;
2533
2534 if (!(options & Opt_transparent_all))
2535 i = 0;
2536 else
2537 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2538
2539 while (i--)
2540 if (TermWin.parent[i] != None)
2541 XClearWindow (display->display, TermWin.parent[i]);
2542 }
2543#endif
2544
2545 if (really) 2470 if (really)
2546 XClearWindow (display->display, TermWin.vt); 2471 XClearWindow (display->display, vt);
2547} 2472}
2548 2473
2549/* ------------------------------------------------------------------------- */ 2474/* ------------------------------------------------------------------------- */
2550void 2475void
2551rxvt_term::scr_reverse_selection () 2476rxvt_term::scr_reverse_selection ()
2552{ 2477{
2478 if (selection.op
2553 if (selection.op && current_screen == selection.screen) 2479 && current_screen == selection.screen
2480 && selection.end.row >= -view_start)
2554 { 2481 {
2555 int end_row = TermWin.saveLines - TermWin.view_start; 2482 int view_end = -view_start + nrow;
2556 int i = selection.beg.row + TermWin.saveLines; 2483 int row, col;
2557 int col, row = selection.end.row + TermWin.saveLines;
2558 rend_t *srp;
2559 2484
2560#if ENABLE_FRILLS 2485#if ENABLE_FRILLS
2561 if (selection.rect) 2486 if (selection.rect)
2562 { 2487 {
2563 end_row += TermWin.nrow; 2488 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2564
2565 for (; i <= row && i <= end_row; i++)
2566 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2489 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2567 srp[col] ^= RS_RVid; 2490 srp[col] ^= RS_RVid;
2568 } 2491 }
2569 else 2492 else
2570#endif 2493#endif
2571 { 2494 {
2572 if (i >= end_row) 2495 if (selection.beg.row >= -view_start)
2496 {
2573 col = selection.beg.col; 2497 col = selection.beg.col;
2498 row = selection.beg.row;
2499 }
2574 else 2500 else
2575 { 2501 {
2576 col = 0; 2502 col = 0;
2577 i = end_row; 2503 row = view_start;
2578 } 2504 }
2579 2505
2580 end_row += TermWin.nrow; 2506 for (; row < min (selection.end.row, view_end); row++, col = 0)
2581 2507 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2582 for (; i < row && i < end_row; i++, col = 0)
2583 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2584 srp[col] ^= RS_RVid; 2508 srp[col] ^= RS_RVid;
2585 2509
2586 if (i == row && i < end_row) 2510 if (row == selection.end.row)
2587 for (srp = screen.rend[i]; col < selection.end.col; col++) 2511 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2588 srp[col] ^= RS_RVid; 2512 srp[col] ^= RS_RVid;
2589 } 2513 }
2590 } 2514 }
2591} 2515}
2592 2516
… …
2601{ 2525{
2602 int row, wrote; 2526 int row, wrote;
2603 unsigned int width, towrite; 2527 unsigned int width, towrite;
2604 char r1[] = "\n"; 2528 char r1[] = "\n";
2605 2529
2606 for (row = TermWin.saveLines - TermWin.nscrolled; 2530 for (row = saveLines - nsaved;
2607 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2531 row < saveLines + nrow - 1; row++)
2608 { 2532 {
2609 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2533 width = save[row].l >= 0 ? save[row].l
2610 : TermWin.ncol; 2534 : ncol;
2611 for (towrite = width; towrite; towrite -= wrote) 2535 for (towrite = width; towrite; towrite -= wrote)
2612 { 2536 {
2613 wrote = write (fd, & (screen.text[row][width - towrite]), 2537 wrote = write (fd, & (save[row].t[width - towrite]),
2614 towrite); 2538 towrite);
2615 if (wrote < 0) 2539 if (wrote < 0)
2616 return; /* XXX: death, no report */ 2540 return; /* XXX: death, no report */
2617 } 2541 }
2618 if (screen.tlen[row] >= 0) 2542 if (save[row].l >= 0)
2619 if (write (fd, r1, 1) <= 0) 2543 if (write (fd, r1, 1) <= 0)
2620 return; /* XXX: death, no report */ 2544 return; /* XXX: death, no report */
2621 } 2545 }
2622} 2546}
2623#endif 2547#endif
2624 2548
2625/* ------------------------------------------------------------------------- * 2549/* ------------------------------------------------------------------------- *
2626 * CHARACTER SELECTION * 2550 * CHARACTER SELECTION *
2627 * ------------------------------------------------------------------------- */ 2551 * ------------------------------------------------------------------------- */
2628
2629/*
2630 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2631 */
2632void 2552void
2633rxvt_term::selection_check (int check_more) 2553rxvt_term::selection_check (int check_more)
2634{ 2554{
2635 row_col_t pos; 2555 row_col_t pos;
2636 2556
2637 if (!selection.op) 2557 if (!selection.op)
2638 return; 2558 return;
2639 2559
2640 pos.row = pos.col = 0; 2560 pos.row = pos.col = 0;
2641 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2561 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2642 || (selection.beg.row >= TermWin.nrow) 2562 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2643 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2563 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2644 || (selection.mark.row >= TermWin.nrow)
2645 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2646 || (selection.end.row >= TermWin.nrow)
2647 || (check_more == 1 2564 || (check_more == 1
2648 && current_screen == selection.screen 2565 && current_screen == selection.screen
2649 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2566 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2650 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2567 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2651 || (check_more == 2 2568 || (check_more == 2
… …
2653 && ROWCOL_IS_AFTER (selection.end, pos)) 2570 && ROWCOL_IS_AFTER (selection.end, pos))
2654 || (check_more == 3 2571 || (check_more == 3
2655 && ROWCOL_IS_AFTER (selection.end, pos)) 2572 && ROWCOL_IS_AFTER (selection.end, pos))
2656 || (check_more == 4 /* screen width change */ 2573 || (check_more == 4 /* screen width change */
2657 && (selection.beg.row != selection.end.row 2574 && (selection.beg.row != selection.end.row
2658 || selection.end.col > TermWin.ncol))) 2575 || selection.end.col > ncol)))
2659 CLEAR_SELECTION (); 2576 CLEAR_SELECTION ();
2660} 2577}
2661 2578
2662/* ------------------------------------------------------------------------- */ 2579/* ------------------------------------------------------------------------- */
2663/* 2580/*
… …
2872 * EXT: button 2 release 2789 * EXT: button 2 release
2873 */ 2790 */
2874void 2791void
2875rxvt_term::selection_request (Time tm, int x, int y) 2792rxvt_term::selection_request (Time tm, int x, int y)
2876{ 2793{
2877 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2794 if (x < 0 || x >= width || y < 0 || y >= height)
2878 return; /* outside window */ 2795 return; /* outside window */
2879 2796
2880 if (selection.text) 2797 if (selection.text)
2881 { /* internal selection */ 2798 { /* internal selection */
2882 char *str = rxvt_wcstombs (selection.text, selection.len); 2799 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2924 sel = xa[XA_CLIPBOARD]; 2841 sel = xa[XA_CLIPBOARD];
2925 2842
2926 if (XGetSelectionOwner (display->display, sel) != None) 2843 if (XGetSelectionOwner (display->display, sel) != None)
2927 { 2844 {
2928 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2845 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2929 TermWin.vt, selection_request_time); 2846 vt, selection_request_time);
2930 return 1; 2847 return 1;
2931 } 2848 }
2932 2849
2933 return 0; 2850 return 0;
2934} 2851}
… …
2957 * EXT: button 1 or 3 release 2874 * EXT: button 1 or 3 release
2958 */ 2875 */
2959void 2876void
2960rxvt_term::selection_make (Time tm) 2877rxvt_term::selection_make (Time tm)
2961{ 2878{
2962 int i, col, end_col, row, end_row; 2879 int i;
2963 wchar_t *new_selection_text; 2880 wchar_t *new_selection_text;
2964 text_t *t; 2881 text_t *t;
2965 2882
2966 switch (selection.op) 2883 switch (selection.op)
2967 { 2884 {
… …
2980 selection.op = SELECTION_DONE; 2897 selection.op = SELECTION_DONE;
2981 2898
2982 if (selection.clicks == 4) 2899 if (selection.clicks == 4)
2983 return; /* nothing selected, go away */ 2900 return; /* nothing selected, go away */
2984 2901
2985 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2902 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2986 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2903 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2987 2904
2988 col = selection.beg.col;
2989 row = selection.beg.row + TermWin.saveLines;
2990 end_row = selection.end.row + TermWin.saveLines;
2991 int ofs = 0; 2905 int ofs = 0;
2992 int extra = 0; 2906 int extra = 0;
2993 2907
2908 int col = selection.beg.col;
2909 int row = selection.beg.row;
2910
2911 int end_col;
2912
2994 for (; row <= end_row; row++, col = 0) 2913 for (; row <= selection.end.row; row++, col = 0)
2995 { 2914 {
2996 end_col = screen.tlen[row];
2997
2998#if ENABLE_FRILLS 2915#if ENABLE_FRILLS
2999 if (selection.rect) 2916 if (selection.rect)
3000 { 2917 {
3001 col = selection.beg.col; 2918 col = selection.beg.col;
3002 end_col = TermWin.ncol + 1; 2919 end_col = ncol + 1;
3003 } 2920 }
2921 else
3004#endif 2922#endif
2923 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
3005 2924
3006 MAX_IT (col, 0); 2925 col = max (col, 0);
3007 2926
3008 if (end_col == -1)
3009 end_col = TermWin.ncol;
3010
3011 if (row == end_row || selection.rect) 2927 if (row == selection.end.row || selection.rect)
3012 MIN_IT (end_col, selection.end.col); 2928 end_col = min (end_col, selection.end.col);
3013 2929
3014 t = &screen.text[row][col]; 2930 t = ROW(row).t + col;
3015 for (; col < end_col; col++) 2931 for (; col < end_col; col++)
3016 { 2932 {
3017 if (*t == NOCHAR) 2933 if (*t == NOCHAR)
3018 t++; 2934 t++;
3019#if ENABLE_COMBINING 2935#if ENABLE_COMBINING
… …
3035#endif 2951#endif
3036 else 2952 else
3037 new_selection_text[ofs++] = *t++; 2953 new_selection_text[ofs++] = *t++;
3038 } 2954 }
3039 2955
3040 if (screen.tlen[row] != -1 && row != end_row) 2956 if (!ROW(row).is_longer () && row != selection.end.row)
3041 new_selection_text[ofs++] = C0_LF; 2957 new_selection_text[ofs++] = C0_LF;
3042 } 2958 }
3043 2959
3044 if (end_col != selection.end.col) 2960 if (end_col != selection.end.col)
3045 new_selection_text[ofs++] = C0_LF; 2961 new_selection_text[ofs++] = C0_LF;
… …
3056 2972
3057 // we usually allocate much more than necessary, so realloc it smaller again 2973 // we usually allocate much more than necessary, so realloc it smaller again
3058 selection.len = ofs; 2974 selection.len = ofs;
3059 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2975 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3060 2976
3061 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2977 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3062 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2978 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3063 display->set_selection_owner (this); 2979 display->set_selection_owner (this);
3064 else 2980 else
3065 rxvt_warn ("can't get primary selection, ignoring.\n"); 2981 rxvt_warn ("can't get primary selection, ignoring.\n");
3066 2982
3067#if 0 2983#if 0
… …
3090 3006
3091 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3007 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3092 3008
3093 if (clicks == 2 || clicks == 3) 3009 if (clicks == 2 || clicks == 3)
3094 selection_extend_colrow (selection.mark.col, 3010 selection_extend_colrow (selection.mark.col,
3095 selection.mark.row + TermWin.view_start, 3011 selection.mark.row + view_start,
3096 0, /* button 3 */ 3012 0, /* button 3 */
3097 1, /* button press */ 3013 1, /* button press */
3098 0); /* click change */ 3014 0); /* click change */
3099} 3015}
3100 3016
… …
3104 */ 3020 */
3105void 3021void
3106rxvt_term::selection_start_colrow (int col, int row) 3022rxvt_term::selection_start_colrow (int col, int row)
3107{ 3023{
3108 want_refresh = 1; 3024 want_refresh = 1;
3025
3026 selection.mark.row = row - view_start;
3109 selection.mark.col = col; 3027 selection.mark.col = col;
3110 selection.mark.row = row - TermWin.view_start;
3111 3028
3112 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3029 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3113 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3030 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3114 MAX_IT (selection.mark.col, 0);
3115 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3116 3031
3117 while (selection.mark.col > 0 3032 while (selection.mark.col > 0
3118 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3033 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3119 --selection.mark.col; 3034 --selection.mark.col;
3120 3035
3121 if (selection.op) 3036 if (selection.op)
3122 { /* clear the old selection */ 3037 { /* clear the old selection */
3123 selection.beg.row = selection.end.row = selection.mark.row; 3038 selection.beg.row = selection.end.row = selection.mark.row;
… …
3147 text_t *stp; 3062 text_t *stp;
3148 rend_t *srp; 3063 rend_t *srp;
3149 3064
3150 if (dirn == UP) 3065 if (dirn == UP)
3151 { 3066 {
3152 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3067 bound.row = - nsaved - 1;
3153 bound.col = 0; 3068 bound.col = 0;
3154 dirnadd = -1; 3069 dirnadd = -1;
3155 } 3070 }
3156 else 3071 else
3157 { 3072 {
3158 bound.row = TermWin.saveLines + TermWin.nrow; 3073 bound.row = nrow;
3159 bound.col = TermWin.ncol - 1; 3074 bound.col = ncol - 1;
3160 dirnadd = 1; 3075 dirnadd = 1;
3161 } 3076 }
3162 3077
3163 row = mark->row + TermWin.saveLines; 3078 row = mark->row;
3164 col = mark->col; 3079 col = max (mark->col, 0);
3165 MAX_IT (col, 0); 3080
3166 /* find the edge of a word */ 3081 /* find the edge of a word */
3167 stp = &screen.text[row][col]; 3082 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3168 w1 = DELIMIT_TEXT (*stp); 3083 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3169
3170 srp = &screen.rend[row][col];
3171 w2 = DELIMIT_REND (*srp);
3172 3084
3173 for (;;) 3085 for (;;)
3174 { 3086 {
3175 for (; col != bound.col; col += dirnadd) 3087 for (; col != bound.col; col += dirnadd)
3176 { 3088 {
… …
3186 break; 3098 break;
3187 } 3099 }
3188 3100
3189 if ((col == bound.col) && (row != bound.row)) 3101 if ((col == bound.col) && (row != bound.row))
3190 { 3102 {
3191 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3103 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3192 { 3104 {
3193 trow = row + dirnadd; 3105 trow = row + dirnadd;
3194 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3106 tcol = dirn == UP ? ncol - 1 : 0;
3195 3107
3196 if (screen.text[trow] == NULL) 3108 if (!ROW(trow).t)
3197 break; 3109 break;
3198 3110
3199 stp = & (screen.text[trow][tcol]); 3111 stp = ROW(trow).t + tcol;
3200 srp = & (screen.rend[trow][tcol]); 3112 srp = ROW(trow).r + tcol;
3201 3113
3202 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3114 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3203 break; 3115 break;
3204 3116
3205 row = trow; 3117 row = trow;
… …
3213Old_Word_Selection_You_Die: 3125Old_Word_Selection_You_Die:
3214 if (dirn == DN) 3126 if (dirn == DN)
3215 col++; /* put us on one past the end */ 3127 col++; /* put us on one past the end */
3216 3128
3217 /* Poke the values back in */ 3129 /* Poke the values back in */
3218 ret->row = row - TermWin.saveLines; 3130 ret->row = row;
3219 ret->col = col; 3131 ret->col = col;
3220} 3132}
3221 3133
3222/* ------------------------------------------------------------------------- */ 3134/* ------------------------------------------------------------------------- */
3223/* 3135/*
… …
3228 * flag == 2 ==> button 3 motion 3140 * flag == 2 ==> button 3 motion
3229 */ 3141 */
3230void 3142void
3231rxvt_term::selection_extend (int x, int y, int flag) 3143rxvt_term::selection_extend (int x, int y, int flag)
3232{ 3144{
3233 int col, row; 3145 int col = clamp (Pixel2Col (x), 0, ncol);
3234 3146 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3235 col = Pixel2Col (x);
3236 row = Pixel2Row (y);
3237 MAX_IT (row, 0);
3238 MIN_IT (row, (int)TermWin.nrow - 1);
3239 MAX_IT (col, 0);
3240 MIN_IT (col, (int)TermWin.ncol);
3241 3147
3242 /* 3148 /*
3243 * If we're selecting characters (single click) then we must check first 3149 * If we're selecting characters (single click) then we must check first
3244 * if we are at the same place as the original mark. If we are then 3150 * if we are at the same place as the original mark. If we are then
3245 * select nothing. Otherwise, if we're to the right of the mark, you have to 3151 * select nothing. Otherwise, if we're to the right of the mark, you have to
3246 * be _past_ a character for it to be selected. 3152 * be _past_ a character for it to be selected.
3247 */ 3153 */
3248 if (((selection.clicks % 3) == 1) && !flag 3154 if (((selection.clicks % 3) == 1) && !flag
3249 && (col == selection.mark.col 3155 && (col == selection.mark.col
3250 && (row == selection.mark.row + TermWin.view_start))) 3156 && (row == selection.mark.row + view_start)))
3251 { 3157 {
3252 /* select nothing */ 3158 /* select nothing */
3253 selection.beg.row = selection.end.row = 0; 3159 selection.beg.row = selection.end.row = 0;
3254 selection.beg.col = selection.end.col = 0; 3160 selection.beg.col = selection.end.col = 0;
3255 selection.clicks = 4; 3161 selection.clicks = 4;
… …
3270 * Extend the selection to the specified col/row 3176 * Extend the selection to the specified col/row
3271 */ 3177 */
3272void 3178void
3273rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3179rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3274{ 3180{
3275 int16_t ncol = TermWin.ncol;
3276 int end_col;
3277 row_col_t pos; 3181 row_col_t pos;
3278 enum { 3182 enum {
3279 LEFT, RIGHT 3183 LEFT, RIGHT
3280 } closeto = RIGHT; 3184 } closeto = RIGHT;
3281 3185
… …
3312 selection.beg.col = selection.end.col = selection.mark.col; 3216 selection.beg.col = selection.end.col = selection.mark.col;
3313 selection.beg.row = selection.end.row = selection.mark.row; 3217 selection.beg.row = selection.end.row = selection.mark.row;
3314 } 3218 }
3315 3219
3316 pos.col = col; 3220 pos.col = col;
3317 pos.row = row; 3221 pos.row = row - view_start;
3318
3319 pos.row -= TermWin.view_start; /* adjust for scroll */
3320 3222
3321 /* 3223 /*
3322 * This is mainly xterm style selection with a couple of differences, mainly 3224 * This is mainly xterm style selection with a couple of differences, mainly
3323 * in the way button3 drag extension works. 3225 * in the way button3 drag extension works.
3324 * We're either doing: button1 drag; button3 press; or button3 drag 3226 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3383 } 3285 }
3384 } 3286 }
3385 3287
3386 if (selection.clicks == 1) 3288 if (selection.clicks == 1)
3387 { 3289 {
3388 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3290 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3389 3291 && !ROW(selection.beg.row).is_longer ()
3390 if (selection.beg.col > end_col
3391 && end_col != -1
3392#if ENABLE_FRILLS 3292#if ENABLE_FRILLS
3393 && !selection.rect 3293 && !selection.rect
3394#endif 3294#endif
3395 ) 3295 )
3396 selection.beg.col = ncol; 3296 selection.beg.col = ncol;
3397 3297
3398 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3399
3400 if ( 3298 if (
3401 selection.end.col > end_col 3299 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3402 && end_col != -1 3300 && !ROW(selection.end.row).is_longer ()
3403#if ENABLE_FRILLS 3301#if ENABLE_FRILLS
3404 && !selection.rect 3302 && !selection.rect
3405#endif 3303#endif
3406 ) 3304 )
3407 selection.end.col = ncol; 3305 selection.end.col = ncol;
… …
3417 else if (selection.clicks == 3) 3315 else if (selection.clicks == 3)
3418 { 3316 {
3419#if ENABLE_FRILLS 3317#if ENABLE_FRILLS
3420 if (options & Opt_tripleclickwords) 3318 if (options & Opt_tripleclickwords)
3421 { 3319 {
3422 int end_row;
3423
3424 selection_delimit_word (UP, &selection.beg, &selection.beg); 3320 selection_delimit_word (UP, &selection.beg, &selection.beg);
3425 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3426 3321
3427 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3322 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3428 { 3323 {
3429 end_col = screen.tlen[end_row + TermWin.saveLines]; 3324 if (!ROW(end_row).is_longer ())
3430
3431 if (end_col != -1)
3432 { 3325 {
3433 selection.end.row = end_row; 3326 selection.end.row = end_row;
3434 selection.end.col = end_col; 3327 selection.end.col = ROW(end_row).l;
3435 selection_remove_trailing_spaces (); 3328 selection_remove_trailing_spaces ();
3436 break; 3329 break;
3437 } 3330 }
3438 } 3331 }
3439 } 3332 }
… …
3445 3338
3446 selection.beg.col = 0; 3339 selection.beg.col = 0;
3447 selection.end.col = ncol; 3340 selection.end.col = ncol;
3448 3341
3449 // select a complete logical line 3342 // select a complete logical line
3450 while (selection.beg.row > -TermWin.saveLines 3343 while (selection.beg.row > -saveLines
3451 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3344 && ROW(selection.beg.row - 1).is_longer ())
3452 selection.beg.row--; 3345 selection.beg.row--;
3453 3346
3454 while (selection.end.row < TermWin.nrow 3347 while (selection.end.row < nrow
3455 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3348 && ROW(selection.end.row).is_longer ())
3456 selection.end.row++; 3349 selection.end.row++;
3457 } 3350 }
3458 } 3351 }
3459 3352
3460 if (button3 && buttonpress) 3353 if (button3 && buttonpress)
… …
3485 text_t *stp; 3378 text_t *stp;
3486 3379
3487 end_col = selection.end.col; 3380 end_col = selection.end.col;
3488 end_row = selection.end.row; 3381 end_row = selection.end.row;
3489 3382
3490 for ( ; end_row >= selection.beg.row; ) 3383 for (; end_row >= selection.beg.row; )
3491 { 3384 {
3492 stp = screen.text[end_row + TermWin.saveLines]; 3385 stp = ROW(end_row).t;
3493 3386
3494 while (--end_col >= 0) 3387 while (--end_col >= 0)
3495 { 3388 {
3496 if (stp[end_col] != ' ' 3389 if (stp[end_col] != ' '
3497 && stp[end_col] != '\t' 3390 && stp[end_col] != '\t'
3498 && stp[end_col] != NOCHAR) 3391 && stp[end_col] != NOCHAR)
3499 break; 3392 break;
3500 } 3393 }
3501 3394
3502 if (end_col >= 0 3395 if (end_col >= 0
3503 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3396 || !ROW(end_row - 1).is_longer ())
3504 { 3397 {
3505 selection.end.col = end_col + 1; 3398 selection.end.col = end_col + 1;
3506 selection.end.row = end_row; 3399 selection.end.row = end_row;
3507 break; 3400 break;
3508 } 3401 }
3509 3402
3510 end_row--; 3403 end_row--;
3511 end_col = TermWin.ncol; 3404 end_col = ncol;
3512 } 3405 }
3513 3406
3514 if (selection.mark.row > selection.end.row) 3407 if (selection.mark.row > selection.end.row)
3515 { 3408 {
3516 selection.mark.row = selection.end.row; 3409 selection.mark.row = selection.end.row;
… …
3679 */ 3572 */
3680void 3573void
3681rxvt_term::pixel_position (int *x, int *y) 3574rxvt_term::pixel_position (int *x, int *y)
3682{ 3575{
3683 *x = Pixel2Col (*x); 3576 *x = Pixel2Col (*x);
3684 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3577 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3685 *y = Pixel2Row (*y); 3578 *y = Pixel2Row (*y);
3686 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3579 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3687} 3580}
3688 3581
3689/* ------------------------------------------------------------------------- */ 3582/* ------------------------------------------------------------------------- */
3690#ifdef USE_XIM 3583#ifdef USE_XIM
3691void 3584void
3692rxvt_term::im_set_position (XPoint &pos) 3585rxvt_term::im_set_position (XPoint &pos)
3693{ 3586{
3694 XWindowAttributes xwa; 3587 XWindowAttributes xwa;
3695 3588
3696 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3589 XGetWindowAttributes (display->display, vt, &xwa);
3697 3590
3698 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3591 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3699 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3592 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3700} 3593}
3701#endif 3594#endif
3702 3595
3703#if ENABLE_OVERLAY 3596#if ENABLE_OVERLAY
3704void 3597void
3705rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3598rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3706{ 3599{
3707 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3600 if (nrow < 3 || ncol < 3)
3708 return; 3601 return;
3709 3602
3710 want_refresh = 1; 3603 want_refresh = 1;
3711 3604
3712 scr_overlay_off (); 3605 scr_overlay_off ();
3713 3606
3714 if (x < 0) x = TermWin.ncol - w; 3607 if (x < 0) x = ncol - w;
3715 if (y < 0) y = TermWin.nrow - h; 3608 if (y < 0) y = nrow - h;
3716 3609
3717 // make space for border 3610 // make space for border
3718 w += 2; MIN_IT (w, TermWin.ncol); 3611 w += 2; MIN_IT (w, ncol);
3719 h += 2; MIN_IT (h, TermWin.nrow); 3612 h += 2; MIN_IT (h, nrow);
3720 3613
3721 x -= 1; MAX_IT (x, 0); 3614 x -= 1; MAX_IT (x, 0);
3722 y -= 1; MAX_IT (y, 0); 3615 y -= 1; MAX_IT (y, 0);
3723 3616
3724 MIN_IT (x, TermWin.ncol - w); 3617 MIN_IT (x, ncol - w);
3725 MIN_IT (y, TermWin.nrow - h); 3618 MIN_IT (y, nrow - h);
3726 3619
3727 ov_x = x; ov_y = y; 3620 ov_x = x; ov_y = y;
3728 ov_w = w; ov_h = h; 3621 ov_w = w; ov_h = h;
3729 3622
3730 ov_text = new text_t *[h]; 3623 ov_text = new text_t *[h];
… …
3795 while (*s) 3688 while (*s)
3796 scr_overlay_set (x++, y, *s++); 3689 scr_overlay_set (x++, y, *s++);
3797} 3690}
3798 3691
3799void 3692void
3693rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3694{
3695 while (*s)
3696 {
3697 text_t t = *s++;
3698 int width = wcwidth (t);
3699
3700 while (width--)
3701 {
3702 scr_overlay_set (x++, y, t);
3703 t = NOCHAR;
3704 }
3705 }
3706}
3707
3708void
3800rxvt_term::scr_swap_overlay () 3709rxvt_term::scr_swap_overlay ()
3801{ 3710{
3802 if (!ov_text) 3711 if (!ov_text)
3803 return; 3712 return;
3804 3713
3805 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3806
3807 // swap screen mem with overlay 3714 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3715 for (int y = ov_h; y--; )
3809 { 3716 {
3810 text_t *t1 = ov_text[y]; 3717 text_t *t1 = ov_text[y];
3811 rend_t *r1 = ov_rend[y]; 3718 rend_t *r1 = ov_rend[y];
3812 3719
3813 text_t *t2 = screen.text[y + row_offset] + ov_x; 3720 text_t *t2 = ROW(y - view_start).t + ov_x;
3814 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3721 rend_t *r2 = ROW(y - view_start).r + ov_x;
3815 3722
3816 for (int x = ov_w; x--; ) 3723 for (int x = ov_w; x--; )
3817 { 3724 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3725 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3726 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3821 } 3728 }
3822} 3729}
3823 3730
3824#endif 3731#endif
3825/* ------------------------------------------------------------------------- */ 3732/* ------------------------------------------------------------------------- */
3733

Diff Legend

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