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.157 by root, Sun Feb 13 08:56:28 2005 UTC vs.
Revision 1.190 by root, Thu Dec 22 15:52:57 2005 UTC

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

Diff Legend

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