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.164 by root, Wed Jun 22 14:33:23 2005 UTC vs.
Revision 1.197 by root, Tue Dec 27 00:52:38 2005 UTC

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

Diff Legend

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