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.184 by root, Wed Dec 21 14:23:30 2005 UTC

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

Diff Legend

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