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.168 by root, Thu Aug 11 13:23:06 2005 UTC vs.
Revision 1.175 by root, Tue Dec 20 19:30:59 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 \
… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 87
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
88/* 91/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 92 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 93 * 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 94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 95 */
93#define drawBuffer TermWin.vt 96#define drawBuffer vt
94 97
95#define CLEAR_ROWS(row, num) \ 98#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 99 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 100 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 101 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 102 (unsigned int)Height2Pixel (num), False)
100 103
101#define CLEAR_CHARS(x, y, num) \ 104#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 105 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 106 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 107 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 108 (unsigned int)Height2Pixel (1), False)
106 109
107#define ERASE_ROWS(row, num) \ 110#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 111 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 112 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 113 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 114 (unsigned int)Height2Pixel (num))
112 115
113/* ------------------------------------------------------------------------- * 116/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 117 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 118 * ------------------------------------------------------------------------- */
116 119
117/* Fill part/all of a line with blanks. */ 120/* Fill part/all of a line with blanks. */
118void 121void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 122rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 123{
124 if (!l.t)
125 {
126 lalloc (l);
127 col = 0;
128 width = ncol;
129 }
130
121 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 133
134 text_t *et = l.t + col;
135 rend_t *er = l.r + col;
136
124 while (width--) 137 while (width--)
125 { 138 {
126 *et++ = ' '; 139 *et++ = ' ';
127 *er++ = efs; 140 *er++ = efs;
128 } 141 }
129} 142}
130 143
131/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
132/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
133void 146void
134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
135{ 148{
136#ifdef DEBUG_STRICT 149 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} 150}
147 151
148/* ------------------------------------------------------------------------- * 152/* ------------------------------------------------------------------------- *
149 * SCREEN INITIALISATION * 153 * SCREEN INITIALISATION *
150 * ------------------------------------------------------------------------- */ 154 * ------------------------------------------------------------------------- */
151void 155void
152rxvt_term::scr_reset () 156rxvt_term::scr_reset ()
153{ 157{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q; 158 unsigned int p, q;
156 int k; 159 int k;
157 rend_t setrstyle;
158 160
159#if ENABLE_OVERLAY 161#if ENABLE_OVERLAY
160 scr_overlay_off (); 162 scr_overlay_off ();
161#endif 163#endif
162 164
163 TermWin.view_start = 0; 165 view_start = 0;
164 num_scr = 0; 166 num_scr = 0;
165 167
166 if (TermWin.ncol == 0) 168 if (ncol == 0)
167 TermWin.ncol = 80; 169 ncol = 80;
168 170
169 if (TermWin.nrow == 0) 171 if (nrow == 0)
170 TermWin.nrow = 24; 172 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 173
175 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 175 return;
177 176
178 // we need at least two lines for wrapping to work correctly 177 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 178 if (nrow + saveLines < 2)
180 { 179 {
181 TermWin.saveLines++; 180 saveLines++;
182 prev_nrow--; 181 prev_nrow--;
183 TermWin.nscrolled++; 182 nsaved++;
184 } 183 }
185 184
186 want_refresh = 1; 185 want_refresh = 1;
187 186
188 prev_total_rows = prev_nrow + TermWin.saveLines; 187 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 188 total_rows = nrow + saveLines;
190 189
191 screen.tscroll = 0; 190 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 191 screen.bscroll = nrow - 1;
193 192
194 if (!talloc) 193 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 { 194 {
202 /* 195 /*
203 * first time called so just malloc everything: don't rely on realloc 196 * 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 197 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 198 */
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 199 nsaved = 0; /* no saved lines */
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 200 term_start = 0;
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 201
202 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204
205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
210 209
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++) 210 for (p = nrow; p--; )
220 { 211 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 213 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); 214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
226 } 215 }
227 216
228 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 220 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 221 screen.charset = 0;
234 current_screen = PRIMARY; 222 current_screen = PRIMARY;
… …
254 else 242 else
255 { 243 {
256 /* 244 /*
257 * add or delete rows as appropriate 245 * add or delete rows as appropriate
258 */ 246 */
259 setrstyle = DEFAULT_RSTYLE; 247
248 rxvt_salloc *old_ta;
249 rxvt_salloc *old_ra;
260 250
261 if (nrow < prev_nrow) 251 if (nrow < prev_nrow)
262 { 252 {
263 /* delete rows */ 253 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow); 254 k = min (nsaved, prev_nrow - nrow);
255 // 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); 256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
266 257
267 for (p = nrow; p < prev_nrow; p++) 258 for (p = nrow; p < prev_nrow; p++)
268 { 259 {
269 q = p + TermWin.saveLines; 260 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]) 261 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]); 262 lfree (drawn[p]);
293 ralloc->free (drawn_rend[p]);
294 } 263 }
295 264
296 /* we have fewer rows so fix up cursor position */ 265 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 266 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 267
… …
301 else if (nrow > prev_nrow) 270 else if (nrow > prev_nrow)
302 { 271 {
303 /* add rows */ 272 /* add rows */
304 scr_reset_realloc (); /* realloc _first_ */ 273 scr_reset_realloc (); /* realloc _first_ */
305 274
275 int ocol = ncol;
306 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
307 277
308 k = min (TermWin.nscrolled, nrow - prev_nrow); 278 k = min (nsaved, nrow - prev_nrow);
309 279
310 for (p = prev_total_rows; p < total_rows; p++) 280 for (p = prev_total_rows; p < total_rows; p++)
311 { 281 save[p].clear ();
312 screen.tlen[p] = 0;
313 screen.text[p] = NULL;
314 screen.rend[p] = NULL;
315 }
316 282
317 for (p = prev_total_rows; p < total_rows - k; p++) 283 for (p = prev_total_rows; p < total_rows - k; p++)
318 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); 284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
319 285
320 for (p = prev_nrow; p < nrow; p++) 286 for (p = prev_nrow; p < nrow; p++)
321 { 287 {
322 swap.tlen[p] = 0; 288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
323 swap.text[p] = NULL; 289 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 } 290 }
330 291
331 if (k > 0) 292 if (k > 0)
332 { 293 {
333 scr_scroll_text (0, (int)nrow - 1, -k, 1); 294 scr_scroll_text (0, (int)nrow - 1, -k, 1);
334 screen.cur.row += k; 295 screen.cur.row += k;
335 screen.s_cur.row += k; 296 screen.s_cur.row += k;
336 TermWin.nscrolled -= k; 297 nsaved -= k;
337 } 298 }
338 299
339#ifdef DEBUG_STRICT 300#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 301 assert (screen.cur.row < nrow);
341#else /* drive with your eyes closed */ 302#else /* drive with your eyes closed */
342 MIN_IT (screen.cur.row, nrow - 1); 303 MIN_IT (screen.cur.row, nrow - 1);
343#endif 304#endif
344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
345 } 306 }
346 307
347 /* resize columns */ 308 /* resize columns */
348 if (ncol != prev_ncol) 309 if (ncol != prev_ncol)
349 { 310 {
350 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
351 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
352 313
353 for (p = 0; p < total_rows; p++) 314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
354 { 318 {
355 if (screen.text[p]) 319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l;
352
353 assert (llen >= 0);
354
355 while (p && save[p - 1].l < 0)
356 { 356 {
357 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); 357 --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) 358 llen += prev_ncol;
363 scr_blank_line (&screen.text[p][prev_ncol], 359 }
364 &screen.rend[p][prev_ncol], 360
365 ncol - prev_ncol, setrstyle); 361 int qlines = llen / ncol + 1;
362 int lofs = 0;
363
364 q -= qlines;
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++)
370 {
371 if (qrow >= 0)
372 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p;
382 int pcol = lofs % prev_ncol;
383
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385
386 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);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000);
400
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
403
404 lofs += len;
405 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 }
411 else
412 lofs += ncol;
366 } 413 }
367 } 414 }
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 } 415 }
393 416
394 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 417 free (screen.text); screen.text = tp;
418 free (screen.rend); screen.rend = rp;
419 free (screen.tlen); screen.tlen = tl;
395 420
396 delete talloc; talloc = ta; 421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
397 delete ralloc; ralloc = ra; 422#endif
398 }
399 423
400 if (tabs) 424 if (tabs)
401 free (tabs); 425 free (tabs);
402 } 426 }
403 427
… …
413} 437}
414 438
415void 439void
416rxvt_term::scr_reset_realloc () 440rxvt_term::scr_reset_realloc ()
417{ 441{
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 *)); 442 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
427 443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
428 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); 444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
429 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); 445 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} 446}
437 447
438/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
439/* 449/*
440 * Free everything. That way malloc debugging can find leakage. 450 * Free everything. That way malloc debugging can find leakage.
441 */ 451 */
442void 452void
443rxvt_term::scr_release () 453rxvt_term::scr_release ()
444{ 454{
445 unsigned int total_rows;
446 int i;
447
448 total_rows = TermWin.nrow + TermWin.saveLines;
449
450 delete talloc; talloc = 0; 455 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 456 delete ralloc; ralloc = 0;
452 457
453 free (screen.text); 458 free (save);
454 free (screen.tlen); 459 free (swap_save);
455 free (screen.rend);
456 free (drawn_text); 460 free (drawn);
457 free (drawn_rend);
458 free (swap.text);
459 free (swap.tlen);
460 free (swap.rend);
461 free (buf_text); 461 free (buf);
462 free (buf_rend);
463 free (tabs); 462 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} 463}
473 464
474/* ------------------------------------------------------------------------- */ 465/* ------------------------------------------------------------------------- */
475/* 466/*
476 * Hard reset 467 * Hard reset
… …
527 set_font_style (); 518 set_font_style ();
528 break; 519 break;
529 } 520 }
530 521
531 /* boundary check in case screen size changed between SAVE and RESTORE */ 522 /* boundary check in case screen size changed between SAVE and RESTORE */
532 MIN_IT (s->cur.row, TermWin.nrow - 1); 523 MIN_IT (s->cur.row, nrow - 1);
533 MIN_IT (s->cur.col, TermWin.ncol - 1); 524 MIN_IT (s->cur.col, ncol - 1);
534#ifdef DEBUG_STRICT 525#ifdef DEBUG_STRICT
535 assert (s->cur.row >= 0); 526 assert (s->cur.row >= 0);
536 assert (s->cur.col >= 0); 527 assert (s->cur.col >= 0);
537#else /* drive with your eyes closed */ 528#else /* drive with your eyes closed */
538 MAX_IT (s->cur.row, 0); 529 MAX_IT (s->cur.row, 0);
… …
554 int offset; 545 int offset;
555#endif 546#endif
556 547
557 want_refresh = 1; 548 want_refresh = 1;
558 549
559 TermWin.view_start = 0; 550 view_start = 0;
560 551
561 if (current_screen == scrn) 552 if (current_screen == scrn)
562 return scrn; 553 return scrn;
563 554
564 selection_check (2); /* check for boundary cross */ 555 selection_check (2); /* check for boundary cross */
… …
574 565
575#if NSCREENS 566#if NSCREENS
576 if (options & Opt_secondaryScreen) 567 if (options & Opt_secondaryScreen)
577 { 568 {
578 num_scr = 0; 569 num_scr = 0;
579 offset = TermWin.saveLines; 570 offset = saveLines;
580 571
581 for (i = prev_nrow; i--;) 572 for (i = prev_nrow; i--;)
582 { 573 SWAP_IT (ROW(i), swap_save[i], line_t);
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 574
588 SWAP_IT (screen.charset, swap.charset, int16_t); 575 SWAP_IT (screen.charset, swap.charset, int16_t);
589 SWAP_IT (screen.flags, swap.flags, int); 576 SWAP_IT (screen.flags, swap.flags, int);
590 screen.flags |= Screen_VisibleCursor; 577 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 578 swap.flags |= Screen_VisibleCursor;
… …
609 596
610 screen.cur.col = 0; 597 screen.cur.col = 0;
611 598
612 if (screen.cur.row == screen.bscroll) 599 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 600 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
614 else if (screen.cur.row < TermWin.nrow - 1) 601 else if (screen.cur.row < nrow - 1)
615 screen.cur.row++; 602 screen.cur.row++;
616} 603}
617 604
618/* ------------------------------------------------------------------------- */ 605/* ------------------------------------------------------------------------- */
619/* 606/*
… …
655 */ 642 */
656int 643int
657rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 644rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
658{ 645{
659 int i, j; 646 int i, j;
660 long nscrolled;
661 647
662 if (count == 0 || (row1 > row2)) 648 if (count == 0 || (row1 > row2))
663 return 0; 649 return 0;
664 650
665 want_refresh = 1; 651 want_refresh = 1;
666 652
667 if (row1 == 0 && count > 0 653 if (row1 == 0 && count > 0
668 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 654 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
669 { 655 {
670 nscrolled = (long)TermWin.nscrolled + (long)count; 656 nsaved = min (nsaved + count, saveLines);
657 term_start = (term_start + count) % total_rows;
671 658
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) 659 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 } 660 {
701 else if (j >= row1 && j <= row2)
702 {
703 /* move selected region too */
704 selection.beg.row -= count; 661 selection.beg.row -= count;
705 selection.end.row -= count; 662 selection.end.row -= count;
706 selection.mark.row -= count; 663 selection.mark.row -= count;
707 } 664 }
665
666 for (int i = count; i--; )
667 scr_blank_screen_mem (ROW(row2 - i), rstyle);
668
669 if ((options & Opt_scrollWithBuffer)
670 && view_start != 0
671 && view_start != saveLines)
672 scr_page (UP, count);
673 }
674 else
708 } 675 {
676 if (!spec)
677 row1 += saveLines;
709 678
679 row2 += saveLines;
680
681 if (selection.op && current_screen == selection.screen)
682 {
683 i = selection.beg.row + saveLines;
684 j = selection.end.row + saveLines;
685
686 if ((i < row1 && j > row1)
687 || (i < row2 && j > row2)
688 || (i - count < row1 && i >= row1)
689 || (i - count > row2 && i <= row2)
690 || (j - count < row1 && j >= row1)
691 || (j - count > row2 && j <= row2))
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
695 }
696 else if (j >= row1 && j <= row2)
697 {
698 /* move selected region too */
699 selection.beg.row -= count;
700 selection.end.row -= count;
701 selection.mark.row -= count;
702 }
703 }
704
710 selection_check (0); /* _after_ TermWin.nscrolled update */ 705 selection_check (0); /* _after_ nsaved update */
711 706
712 num_scr += count; 707 num_scr += count;
713 j = count; 708 j = count;
714 709
715 if (count < 0) 710 if (count < 0)
716 count = -count; 711 count = -count;
717 712
718 i = row2 - row1 + 1; 713 i = row2 - row1 + 1;
719 MIN_IT (count, i); 714 MIN_IT (count, i);
720 715
721 if (j > 0) 716 if (j > 0)
722 { 717 {
723 /* scroll up */ 718 /* scroll up */
724 719
725 /* Copy lines that will get clobbered by the rotation */ 720 /* Copy lines that will get clobbered by the rotation */
726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 721 memcpy (buf, save + row1, count * sizeof (line_t));
727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728 722
729 /* Rotate lines */ 723 /* Rotate lines */
730 i = row2 - row1 - count + 1; 724 i = row2 - row1 - count + 1;
731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 725 memmove (save + row1, save + row1 + count, i * sizeof (line_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 726
735 j = row2 - count + 1, i = count; 727 j = row2 - count + 1, i = count;
736 } 728 }
737 else /* if (j < 0) */ 729 else /* if (j < 0) */
738 { 730 {
739 /* scroll down */ 731 /* scroll down */
740 732
741 /* Copy lines that will get clobbered by the rotation */ 733 /* Copy lines that will get clobbered by the rotation */
742 for (i = 0, j = row2; i < count; i++, j--) 734 for (i = 0, j = row2; i < count; i++, j--)
743 { 735 buf[i] = save[j];
744 buf_text[i] = screen.text[j];
745 buf_rend[i] = screen.rend[j];
746 }
747 736
748 /* Rotate lines */ 737 /* Rotate lines */
749 for (j = row2, i = j - count; i >= row1; i--, j--) 738 for (j = row2, i = j - count; i >= row1; i--, j--)
750 { 739 save[j] = save[i];
751 screen.tlen[j] = screen.tlen[i];
752 screen.text[j] = screen.text[i];
753 screen.rend[j] = screen.rend[i];
754 }
755 740
756 j = row1, i = count; 741 j = row1, i = count;
757 count = -count; 742 count = -count;
758 } 743 }
759 744
760 /* Resurrect lines */ 745 /* Resurrect lines */
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 746 memcpy (save + j, buf, i * sizeof (line_t));
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 747
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
764 if (!spec) /* line length may not equal TermWin.ncol */ 748 if (!spec) /* line length may not equal ncol */
765 for (; i--; j++) 749 for (; i--; j++)
766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); 750 scr_blank_screen_mem (save[j], rstyle);
751 }
767 752
768 return count; 753 return count;
769} 754}
770 755
771/* ------------------------------------------------------------------------- */ 756/* ------------------------------------------------------------------------- */
… …
778 if (len <= 0) /* sanity */ 763 if (len <= 0) /* sanity */
779 return; 764 return;
780 765
781 unsigned char checksel; 766 unsigned char checksel;
782 unicode_t c; 767 unicode_t c;
783 int i, row, last_col; 768 int row, last_col;
784 text_t *stp;
785 rend_t *srp;
786 const unicode_t *strend = str + len; 769 const unicode_t *strend = str + len;
787 770
788 want_refresh = 1; 771 want_refresh = 1;
789 ZERO_SCROLLBACK (); 772 ZERO_SCROLLBACK ();
790 last_col = TermWin.ncol; 773 last_col = ncol;
791 774
792 if (nlines > 0) 775 if (nlines > 0)
793 { 776 {
794 nlines += screen.cur.row - screen.bscroll; 777 nlines += screen.cur.row - screen.bscroll;
795 if ((nlines > 0) 778 if ((nlines > 0)
796 && (screen.tscroll == 0) 779 && (screen.tscroll == 0)
797 && (screen.bscroll == (TermWin.nrow - 1))) 780 && (screen.bscroll == (nrow - 1)))
798 { 781 {
799 /* _at least_ this many lines need to be scrolled */ 782 /* _at least_ this many lines need to be scrolled */
800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 783 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
801 screen.cur.row -= nlines; 784 screen.cur.row -= nlines;
802 } 785 }
803 } 786 }
804 787
805#ifdef DEBUG_STRICT 788#ifdef DEBUG_STRICT
806 assert (screen.cur.col < last_col); 789 assert (screen.cur.col < last_col);
807 assert ((screen.cur.row < TermWin.nrow) 790 assert ((screen.cur.row < nrow)
808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 791 && (screen.cur.row >= - (int32_t)nsaved));
809#else /* drive with your eyes closed */ 792#else /* drive with your eyes closed */
810 MIN_IT (screen.cur.col, last_col - 1); 793 MIN_IT (screen.cur.col, last_col - 1);
811 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 794 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
812 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 795 MAX_IT (screen.cur.row, - (int32_t)nsaved);
813#endif 796#endif
814 row = screen.cur.row + TermWin.saveLines; 797 row = screen.cur.row;
815 798
816 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 799 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
817 800
818 stp = screen.text[row]; 801 line_t *line = &ROW(row);
819 srp = screen.rend[row];
820 802
821 while (str < strend) 803 while (str < strend)
822 { 804 {
823 c = *str++; 805 c = *str++;
824 806
825 if (c < 0x20) 807 if (c < 0x20)
826 if (c == C0_LF) 808 if (c == C0_LF)
827 { 809 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */ 810 if (!line->is_longer ()) /* XXX: think about this */
829 MAX_IT (screen.tlen[row], screen.cur.col); 811 MAX_IT (line->l, screen.cur.col);
830 812
831 screen.flags &= ~Screen_WrapNext; 813 screen.flags &= ~Screen_WrapNext;
832 814
833 if (screen.cur.row == screen.bscroll) 815 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 816 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
835 else if (screen.cur.row < (TermWin.nrow - 1)) 817 else if (screen.cur.row < (nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines; 818 row = ++screen.cur.row;
837 819
838 stp = screen.text[row]; /* _must_ refresh */ 820 line = &ROW(row); /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue; 821 continue;
841 } 822 }
842 else if (c == C0_CR) 823 else if (c == C0_CR)
843 { 824 {
844 if (screen.tlen[row] != -1) /* XXX: think about this */ 825 if (!line->is_longer ()) /* XXX: think about this */
845 MAX_IT (screen.tlen[row], screen.cur.col); 826 MAX_IT (line->l, screen.cur.col);
846 827
847 screen.flags &= ~Screen_WrapNext; 828 screen.flags &= ~Screen_WrapNext;
848 screen.cur.col = 0; 829 screen.cur.col = 0;
849 continue; 830 continue;
850 } 831 }
… …
867 CLEAR_SELECTION (); 848 CLEAR_SELECTION ();
868 } 849 }
869 850
870 if (screen.flags & Screen_WrapNext) 851 if (screen.flags & Screen_WrapNext)
871 { 852 {
872 screen.tlen[row] = -1; 853 line->set_is_longer ();
873 854
874 scr_do_wrap (); 855 scr_do_wrap ();
875 856
876 row = screen.cur.row + TermWin.saveLines; 857 row = screen.cur.row;
877 stp = screen.text[row]; /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
878 srp = screen.rend[row]; /* _must_ refresh */
879 } 859 }
880 860
881 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
882 if (IN_RANGE (c, 0xd800, 0xdfff)) 862 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
883 c = 0xfffd; 863 c = 0xfffd;
884 864
885 // rely on wcwidth to tell us the character width, at least for non-latin1 865 // rely on wcwidth to tell us the character width, at least for non-latin1
886 // do wcwidth before further replacements, as wcwidth might return -1 866 // do wcwidth before further replacements, as wcwidth might return -1
887 // for the line drawing characters below as they might be invalid in the current 867 // for the line drawing characters below as they might be invalid in the current
… …
925 c = 0xfffd; 905 c = 0xfffd;
926# endif 906# endif
927#endif 907#endif
928 908
929 // nuke the character at this position, if required 909 // nuke the character at this position, if required
930 if (stp[screen.cur.col] == NOCHAR 910 if (line->t[screen.cur.col] == NOCHAR
931 || (screen.cur.col < TermWin.ncol - 1 911 || (screen.cur.col < ncol - 1
932 && stp[screen.cur.col + 1] == NOCHAR)) 912 && line->t[screen.cur.col + 1] == NOCHAR))
933 { 913 {
934 int col = screen.cur.col; 914 int col = screen.cur.col;
935 915
936 // find begin 916 // find begin
937 while (col > 0 && stp[col] == NOCHAR) 917 while (col > 0 && line->t[col] == NOCHAR)
938 col--; 918 col--;
939 919
940 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 920 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
941 921
942 // found begin, nuke 922 // found begin, nuke
943 do { 923 do {
944 stp[col] = ' '; 924 line->t[col] = ' ';
945 srp[col] = rend; 925 line->r[col] = rend;
946 col++; 926 col++;
947 } while (col < TermWin.ncol && stp[col] == NOCHAR); 927 } while (col < ncol && line->t[col] == NOCHAR);
948 } 928 }
949 929
950 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 930 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951 931
952 // if the character doesn't fit into the remaining columns... 932 // if the character doesn't fit into the remaining columns...
… …
958 --str; 938 --str;
959 } 939 }
960 940
961 do 941 do
962 { 942 {
963 stp[screen.cur.col] = c; 943 line->t[screen.cur.col] = c;
964 srp[screen.cur.col] = rend; 944 line->r[screen.cur.col] = rend;
965 945
966 if (screen.cur.col < last_col - 1) 946 if (screen.cur.col < last_col - 1)
967 screen.cur.col++; 947 screen.cur.col++;
968 else 948 else
969 { 949 {
970 screen.tlen[row] = last_col; 950 line->l = last_col;
971 if (screen.flags & Screen_Autowrap) 951 if (screen.flags & Screen_Autowrap)
972 screen.flags |= Screen_WrapNext; 952 screen.flags |= Screen_WrapNext;
973 break; 953 break;
974 } 954 }
975 955
… …
977 } 957 }
978 while (--width > 0); 958 while (--width > 0);
979 959
980 // pad with spaces when overwriting wide character with smaller one 960 // pad with spaces when overwriting wide character with smaller one
981 if (!width) 961 if (!width)
982 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 962 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
983 { 963 {
984 stp[c] = ' '; 964 line->t[c] = ' ';
985 srp[c] = rend; 965 line->r[c] = rend;
986 } 966 }
987 } 967 }
988 else // width == 0 968 else // width == 0
989 { 969 {
990#if ENABLE_COMBINING 970#if ENABLE_COMBINING
… …
995 text_t *tp; 975 text_t *tp;
996 rend_t *rp; 976 rend_t *rp;
997 977
998 if (screen.cur.col > 0) 978 if (screen.cur.col > 0)
999 { 979 {
1000 tp = stp + screen.cur.col - 1; 980 tp = line->t + screen.cur.col - 1;
1001 rp = srp + screen.cur.col - 1; 981 rp = line->r + screen.cur.col - 1;
1002 982
1003 while (*tp == NOCHAR && tp > stp) 983 while (*tp == NOCHAR && tp > line->t)
1004 tp--, rp--; 984 tp--, rp--;
1005 } 985 }
1006 else if (screen.cur.row > 0 986 else if (screen.cur.row > 0
1007 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 987 && ROW(screen.cur.row - 1).is_longer ())
1008 { 988 {
1009 int line = screen.cur.row - 1 + TermWin.saveLines; 989 line_t *line = &ROW(screen.cur.row - 1);
1010 990
1011 tp = screen.text[line] + last_col - 1; 991 tp = line->t + last_col - 1;
1012 rp = screen.rend[line] + last_col - 1; 992 rp = line->r + last_col - 1;
1013 993
1014 while (*tp == NOCHAR && tp > screen.text[line]) 994 while (*tp == NOCHAR && tp > line->t)
1015 tp--, rp--; 995 tp--, rp--;
1016 } 996 }
1017 else 997 else
1018 continue; 998 continue;
1019 999
… …
1026 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 1006 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1027#endif 1007#endif
1028 } 1008 }
1029 } 1009 }
1030 1010
1031 if (screen.tlen[row] != -1) /* XXX: think about this */ 1011 if (!line->is_longer ()) /* XXX: think about this */
1032 MAX_IT (screen.tlen[row], screen.cur.col); 1012 MAX_IT (line->l, screen.cur.col);
1033 1013
1034#ifdef DEBUG_STRICT 1014#ifdef DEBUG_STRICT
1035 assert (screen.cur.row >= 0); 1015 assert (screen.cur.row >= 0);
1036#else /* drive with your eyes closed */ 1016#else /* drive with your eyes closed */
1037 MAX_IT (screen.cur.row, 0); 1017 MAX_IT (screen.cur.row, 0);
… …
1051 if (screen.cur.col == 0) 1031 if (screen.cur.col == 0)
1052 { 1032 {
1053 if (screen.cur.row > 0) 1033 if (screen.cur.row > 0)
1054 { 1034 {
1055#ifdef TERMCAP_HAS_BW 1035#ifdef TERMCAP_HAS_BW
1056 screen.cur.col = TermWin.ncol - 1; 1036 screen.cur.col = ncol - 1;
1057 screen.cur.row--; 1037 screen.cur.row--;
1058 return; 1038 return;
1059#endif 1039#endif
1060 } 1040 }
1061 } 1041 }
… …
1081 1061
1082 if (count == 0) 1062 if (count == 0)
1083 return; 1063 return;
1084 else if (count > 0) 1064 else if (count > 0)
1085 { 1065 {
1086 int row = TermWin.saveLines + screen.cur.row; 1066 int row = screen.cur.row;
1087 text_t *tp = screen.text[row]; 1067
1088 rend_t *rp = screen.rend[row]; 1068 line_t &l = ROW(row);
1089 rend_t base_rend = rp[i]; 1069 rend_t base_rend = l.r[i];
1090 ht &= tp[i] == ' '; 1070 ht &= l.t[i] == ' ';
1091 1071
1092 for (; ++i < TermWin.ncol; ) 1072 for (; ++i < ncol; )
1093 if (tabs[i]) 1073 if (tabs[i])
1094 { 1074 {
1095 x = i; 1075 x = i;
1096 if (!--count) 1076 if (!--count)
1097 break; 1077 break;
1098 } 1078 }
1099 else 1079 else
1100 ht &= tp[i] == ' ' 1080 ht &= l.t[i] == ' '
1101 && RS_SAME (rp[i], base_rend); 1081 && RS_SAME (l.r[i], base_rend);
1102 1082
1103 if (count) 1083 if (count)
1104 x = TermWin.ncol - 1; 1084 x = ncol - 1;
1105 1085
1106 // store horizontal tab commands as characters inside the text 1086 // store horizontal tab commands as characters inside the text
1107 // buffer so they can be selected and pasted. 1087 // buffer so they can be selected and pasted.
1108 if (ht && options & Opt_pastableTabs) 1088 if (ht && options & Opt_pastableTabs)
1109 { 1089 {
1110 base_rend = SET_FONT (base_rend, 0); 1090 base_rend = SET_FONT (base_rend, 0);
1111 1091
1112 if (screen.tlen[row] != -1) /* XXX: think about this */ 1092 if (!l.is_longer ()) /* XXX: think about this */
1113 MAX_IT (screen.tlen[row], x); 1093 MAX_IT (l.l, x);
1114 1094
1115 i = screen.cur.col; 1095 i = screen.cur.col;
1116 1096
1117 tp[i] = '\t'; 1097 l.t[i] = '\t';
1118 rp[i] = base_rend; 1098 l.r[i] = base_rend;
1119 1099
1120 while (++i < x) 1100 while (++i < x)
1121 { 1101 {
1122 tp[i] = NOCHAR; 1102 l.t[i] = NOCHAR;
1123 rp[i] = base_rend; 1103 l.r[i] = base_rend;
1124 } 1104 }
1125 } 1105 }
1126 } 1106 }
1127 else /* if (count < 0) */ 1107 else /* if (count < 0) */
1128 { 1108 {
… …
1154rxvt_term::scr_backindex () 1134rxvt_term::scr_backindex ()
1155{ 1135{
1156 if (screen.cur.col > 0) 1136 if (screen.cur.col > 0)
1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1158 else 1138 else
1159 {
1160 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1161 return; /* um, yeah? */
1162
1163 scr_insdel_chars (1, INSERT); 1139 scr_insdel_chars (1, INSERT);
1164 }
1165} 1140}
1166#endif 1141#endif
1167/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1168/* 1143/*
1169 * Process DEC Forward Index 1144 * Process DEC Forward Index
… …
1175void 1150void
1176rxvt_term::scr_forwardindex () 1151rxvt_term::scr_forwardindex ()
1177{ 1152{
1178 int row; 1153 int row;
1179 1154
1180 if (screen.cur.col < TermWin.ncol - 1) 1155 if (screen.cur.col < ncol - 1)
1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1156 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1182 else 1157 else
1183 { 1158 {
1184 row = screen.cur.row + TermWin.saveLines; 1159 row = screen.cur.row;
1185 1160
1186 if (screen.tlen[row] == 0) 1161 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1187 return; /* um, yeah? */ 1162 ROW(row).l = ncol;
1188 else if (screen.tlen[row] == -1)
1189 screen.tlen[row] = TermWin.ncol;
1190 1163
1191 scr_gotorc (0, 0, R_RELATIVE); 1164 scr_gotorc (0, 0, R_RELATIVE);
1192 scr_insdel_chars (1, DELETE); 1165 scr_insdel_chars (1, DELETE);
1193 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1166 scr_gotorc (0, ncol - 1, R_RELATIVE);
1194 } 1167 }
1195} 1168}
1196#endif 1169#endif
1197 1170
1198/* ------------------------------------------------------------------------- */ 1171/* ------------------------------------------------------------------------- */
… …
1205 want_refresh = 1; 1178 want_refresh = 1;
1206 ZERO_SCROLLBACK (); 1179 ZERO_SCROLLBACK ();
1207 1180
1208 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1181 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1209 MAX_IT (screen.cur.col, 0); 1182 MAX_IT (screen.cur.col, 0);
1210 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1183 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1211 1184
1212 screen.flags &= ~Screen_WrapNext; 1185 screen.flags &= ~Screen_WrapNext;
1213 1186
1214 if (relative & R_RELATIVE) 1187 if (relative & R_RELATIVE)
1215 { 1188 {
… …
1240 else 1213 else
1241 screen.cur.row = row; 1214 screen.cur.row = row;
1242 } 1215 }
1243 1216
1244 MAX_IT (screen.cur.row, 0); 1217 MAX_IT (screen.cur.row, 0);
1245 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1218 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1246} 1219}
1247 1220
1248/* ------------------------------------------------------------------------- */ 1221/* ------------------------------------------------------------------------- */
1249/* 1222/*
1250 * direction should be UP or DN 1223 * direction should be UP or DN
… …
1266 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1239 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1267 else 1240 else
1268 screen.cur.row += dirn; 1241 screen.cur.row += dirn;
1269 1242
1270 MAX_IT (screen.cur.row, 0); 1243 MAX_IT (screen.cur.row, 0);
1271 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1244 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1272 selection_check (0); 1245 selection_check (0);
1273} 1246}
1274 1247
1275/* ------------------------------------------------------------------------- */ 1248/* ------------------------------------------------------------------------- */
1276/* 1249/*
… …
1287 want_refresh = 1; 1260 want_refresh = 1;
1288 ZERO_SCROLLBACK (); 1261 ZERO_SCROLLBACK ();
1289 1262
1290 selection_check (1); 1263 selection_check (1);
1291 1264
1292 row = TermWin.saveLines + screen.cur.row; 1265 row = screen.cur.row;
1266
1293 switch (mode) 1267 switch (mode)
1294 { 1268 {
1295 case 0: /* erase to end of line */ 1269 case 0: /* erase to end of line */
1296 col = screen.cur.col; 1270 col = screen.cur.col;
1297 num = TermWin.ncol - col; 1271 num = ncol - col;
1298 MIN_IT (screen.tlen[row], (int16_t)col); 1272 MIN_IT (ROW(row).l, (int16_t)col);
1299 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1273 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1300 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1274 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1301 CLEAR_SELECTION (); 1275 CLEAR_SELECTION ();
1302 break; 1276 break;
1303 case 1: /* erase to beginning of line */ 1277 case 1: /* erase to beginning of line */
… …
1307 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1281 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1308 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1309 break; 1283 break;
1310 case 2: /* erase whole line */ 1284 case 2: /* erase whole line */
1311 col = 0; 1285 col = 0;
1312 num = TermWin.ncol; 1286 num = ncol;
1313 screen.tlen[row] = 0; 1287 ROW(row).l = 0;
1314 if (selection.beg.row <= screen.cur.row 1288 if (selection.beg.row <= screen.cur.row
1315 && selection.end.row >= screen.cur.row) 1289 && selection.end.row >= screen.cur.row)
1316 CLEAR_SELECTION (); 1290 CLEAR_SELECTION ();
1317 break; 1291 break;
1318 default: 1292 default:
1319 return; 1293 return;
1320 } 1294 }
1321 1295
1322 if (screen.text[row]) 1296 scr_blank_line (ROW(row), col, num, rstyle);
1323 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1324 else
1325 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1326} 1297}
1327 1298
1328/* ------------------------------------------------------------------------- */ 1299/* ------------------------------------------------------------------------- */
1329/* 1300/*
1330 * Erase part of whole of the screen 1301 * Erase part of whole of the screen
… …
1341 XGCValues gcvalue; 1312 XGCValues gcvalue;
1342 1313
1343 want_refresh = 1; 1314 want_refresh = 1;
1344 ZERO_SCROLLBACK (); 1315 ZERO_SCROLLBACK ();
1345 1316
1346 row_offset = (int32_t)TermWin.saveLines; 1317 row_offset = (int32_t)saveLines;
1347 1318
1348 switch (mode) 1319 switch (mode)
1349 { 1320 {
1350 case 0: /* erase to end of screen */ 1321 case 0: /* erase to end of screen */
1351 selection_check (1); 1322 selection_check (1);
1352 scr_erase_line (0); 1323 scr_erase_line (0);
1353 row = screen.cur.row + 1; /* possible OOB */ 1324 row = screen.cur.row + 1; /* possible OOB */
1354 num = TermWin.nrow - row; 1325 num = nrow - row;
1355 break; 1326 break;
1356 case 1: /* erase to beginning of screen */ 1327 case 1: /* erase to beginning of screen */
1357 selection_check (3); 1328 selection_check (3);
1358 scr_erase_line (1); 1329 scr_erase_line (1);
1359 row = 0; 1330 row = 0;
1360 num = screen.cur.row; 1331 num = screen.cur.row;
1361 break; 1332 break;
1362 case 2: /* erase whole screen */ 1333 case 2: /* erase whole screen */
1363 selection_check (3); 1334 selection_check (3);
1364 row = 0; 1335 row = 0;
1365 num = TermWin.nrow; 1336 num = nrow;
1366 break; 1337 break;
1367 default: 1338 default:
1368 return; 1339 return;
1369 } 1340 }
1370 1341
… …
1372 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1343 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1373 || (selection.end.row >= row 1344 || (selection.end.row >= row
1374 && selection.end.row <= row + num))) 1345 && selection.end.row <= row + num)))
1375 CLEAR_SELECTION (); 1346 CLEAR_SELECTION ();
1376 1347
1377 if (row >= TermWin.nrow) /* Out Of Bounds */ 1348 if (row >= nrow) /* Out Of Bounds */
1378 return; 1349 return;
1379 1350
1380 MIN_IT (num, (TermWin.nrow - row)); 1351 MIN_IT (num, (nrow - row));
1381 1352
1382 if (rstyle & (RS_RVid | RS_Uline)) 1353 if (rstyle & (RS_RVid | RS_Uline))
1383 ren = (rend_t) ~RS_None; 1354 ren = (rend_t) ~RS_None;
1384 else if (GET_BASEBG (rstyle) == Color_bg) 1355 else if (GET_BASEBG (rstyle) == Color_bg)
1385 { 1356 {
… …
1388 } 1359 }
1389 else 1360 else
1390 { 1361 {
1391 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1392 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1363 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1364 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1394 ERASE_ROWS (row, num); 1365 ERASE_ROWS (row, num);
1395 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1396 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1367 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1397 } 1368 }
1398 1369
1399 for (; num--; row++) 1370 for (; num--; row++)
1400 { 1371 {
1401 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1372 scr_blank_screen_mem (save[row + row_offset], rstyle);
1402 screen.tlen[row + row_offset] = 0; 1373 save[row + row_offset].l = 0;
1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1374 scr_blank_line (drawn[row], 0, ncol, ren);
1404 } 1375 }
1405} 1376}
1406 1377
1407#if ENABLE_FRILLS 1378#if ENABLE_FRILLS
1408void 1379void
1409rxvt_term::scr_erase_savelines () 1380rxvt_term::scr_erase_savelines ()
1410{ 1381{
1411 want_refresh = 1; 1382 want_refresh = 1;
1412 ZERO_SCROLLBACK (); 1383 ZERO_SCROLLBACK ();
1413 1384
1414 TermWin.nscrolled = 0; 1385 nsaved = 0;
1415} 1386}
1416#endif 1387#endif
1417 1388
1418/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1419/* 1390/*
… …
1431 1402
1432 num_scr_allow = 0; 1403 num_scr_allow = 0;
1433 selection_check (3); 1404 selection_check (3);
1434 1405
1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1406 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1436 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1407 for (k = saveLines, i = nrow; i--; k++)
1437 { 1408 {
1438 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1409 line_t &line = save[k];
1410
1439 fill_text (screen.text[k], 'E', TermWin.ncol); 1411 fill_text (line.t, 'E', ncol);
1412
1440 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1413 for (r1 = line.r, j = ncol; j--; )
1441 *r1++ = fs; 1414 *r1++ = fs;
1415
1416 line.l = ncol; /* make the `E's selectable */
1442 } 1417 }
1443} 1418}
1444 1419
1445/* ------------------------------------------------------------------------- */ 1420/* ------------------------------------------------------------------------- */
1446/* 1421/*
… …
1479void 1454void
1480rxvt_term::scr_insdel_chars (int count, int insdel) 1455rxvt_term::scr_insdel_chars (int count, int insdel)
1481{ 1456{
1482 int col, row; 1457 int col, row;
1483 rend_t tr; 1458 rend_t tr;
1484 text_t *stp;
1485 rend_t *srp;
1486 int16_t *slp;
1487 1459
1488 want_refresh = 1; 1460 want_refresh = 1;
1489 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1490 1462
1491 if (count <= 0) 1463 if (count <= 0)
1492 return; 1464 return;
1493 1465
1494 scr_do_wrap (); 1466 scr_do_wrap ();
1495 1467
1496 selection_check (1); 1468 selection_check (1);
1497 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1469 MIN_IT (count, (ncol - screen.cur.col));
1498 1470
1499 row = screen.cur.row + TermWin.saveLines; 1471 row = screen.cur.row + saveLines;
1500 1472
1501 stp = screen.text[row]; 1473 line_t *line = save + row;
1502 srp = screen.rend[row];
1503 slp = &screen.tlen[row];
1504 1474
1505 switch (insdel) 1475 switch (insdel)
1506 { 1476 {
1507 case INSERT: 1477 case INSERT:
1508 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1478 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1509 { 1479 {
1510 stp[col] = stp[col - count]; 1480 line->t[col] = line->t[col - count];
1511 srp[col] = srp[col - count]; 1481 line->r[col] = line->r[col - count];
1512 } 1482 }
1513 1483
1514 if (*slp != -1) 1484 if (!line->is_longer ())
1515 { 1485 {
1516 *slp += count; 1486 line->l += count;
1517 MIN_IT (*slp, TermWin.ncol); 1487 MIN_IT (line->l, ncol);
1518 } 1488 }
1519 1489
1520 if (selection.op && current_screen == selection.screen 1490 if (selection.op && current_screen == selection.screen
1521 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1491 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1522 { 1492 {
1523 if (selection.end.row != screen.cur.row 1493 if (selection.end.row != screen.cur.row
1524 || (selection.end.col + count >= TermWin.ncol)) 1494 || (selection.end.col + count >= ncol))
1525 CLEAR_SELECTION (); 1495 CLEAR_SELECTION ();
1526 else 1496 else
1527 { /* shift selection */ 1497 { /* shift selection */
1528 selection.beg.col += count; 1498 selection.beg.col += count;
1529 selection.mark.col += count; /* XXX: yes? */ 1499 selection.mark.col += count; /* XXX: yes? */
1530 selection.end.col += count; 1500 selection.end.col += count;
1531 } 1501 }
1532 } 1502 }
1533 1503
1534 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1504 scr_blank_line (save[row], screen.cur.col, count, rstyle);
1535 (unsigned int)count, rstyle);
1536 break; 1505 break;
1537 1506
1538 case ERASE: 1507 case ERASE:
1539 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1508 screen.cur.col += count; /* don't worry if > ncol */
1540 selection_check (1); 1509 selection_check (1);
1541 screen.cur.col -= count; 1510 screen.cur.col -= count;
1542 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1511 scr_blank_line (save[row], screen.cur.col, count, rstyle);
1543 (unsigned int)count, rstyle);
1544 break; 1512 break;
1545 1513
1546 case DELETE: 1514 case DELETE:
1547 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1515 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1548 1516
1549 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1517 for (col = screen.cur.col; (col + count) < ncol; col++)
1550 { 1518 {
1551 stp[col] = stp[col + count]; 1519 line->t[col] = line->t[col + count];
1552 srp[col] = srp[col + count]; 1520 line->r[col] = line->r[col + count];
1553 } 1521 }
1554 1522
1555 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1523 scr_blank_line (*line, ncol - count, count, tr);
1556 (unsigned int)count, tr);
1557 1524
1558 if (*slp == -1) /* break line continuation */ 1525 if (line->is_longer ()) /* break line continuation */
1559 *slp = TermWin.ncol; 1526 line->l = ncol;
1560 1527
1561 *slp -= count; 1528 line->l -= count;
1562 MAX_IT (*slp, 0); 1529 MAX_IT (line->l, 0);
1563 1530
1564 if (selection.op && current_screen == selection.screen 1531 if (selection.op && current_screen == selection.screen
1565 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1532 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1566 { 1533 {
1567 if (selection.end.row != screen.cur.row 1534 if (selection.end.row != screen.cur.row
1568 || (screen.cur.col >= selection.beg.col - count) 1535 || (screen.cur.col >= selection.beg.col - count)
1569 || selection.end.col >= TermWin.ncol) 1536 || selection.end.col >= ncol)
1570 CLEAR_SELECTION (); 1537 CLEAR_SELECTION ();
1571 else 1538 else
1572 { 1539 {
1573 /* shift selection */ 1540 /* shift selection */
1574 selection.beg.col -= count; 1541 selection.beg.col -= count;
… …
1588 */ 1555 */
1589void 1556void
1590rxvt_term::scr_scroll_region (int top, int bot) 1557rxvt_term::scr_scroll_region (int top, int bot)
1591{ 1558{
1592 MAX_IT (top, 0); 1559 MAX_IT (top, 0);
1593 MIN_IT (bot, (int)TermWin.nrow - 1); 1560 MIN_IT (bot, (int)nrow - 1);
1594 1561
1595 if (top > bot) 1562 if (top > bot)
1596 return; 1563 return;
1597 1564
1598 screen.tscroll = top; 1565 screen.tscroll = top;
… …
1677 */ 1644 */
1678void 1645void
1679rxvt_term::scr_set_tab (int mode) 1646rxvt_term::scr_set_tab (int mode)
1680{ 1647{
1681 if (mode < 0) 1648 if (mode < 0)
1682 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1649 memset (tabs, 0, ncol * sizeof (char));
1683 else if (screen.cur.col < TermWin.ncol) 1650 else if (screen.cur.col < ncol)
1684 tabs[screen.cur.col] = (mode ? 1 : 0); 1651 tabs[screen.cur.col] = (mode ? 1 : 0);
1685} 1652}
1686 1653
1687/* ------------------------------------------------------------------------- */ 1654/* ------------------------------------------------------------------------- */
1688/* 1655/*
… …
1703 if (bgPixmap.pixmap == None) 1670 if (bgPixmap.pixmap == None)
1704#endif 1671#endif
1705#if TRANSPARENT 1672#if TRANSPARENT
1706 if (! (options & Opt_transparent) || am_transparent == 0) 1673 if (! (options & Opt_transparent) || am_transparent == 0)
1707#endif 1674#endif
1708 XSetWindowBackground (display->display, TermWin.vt, 1675 XSetWindowBackground (display->display, vt,
1709 pix_colors[Color_bg]); 1676 pix_colors[Color_bg]);
1710 1677
1711 gcvalue.foreground = pix_colors[Color_fg]; 1678 gcvalue.foreground = pix_colors[Color_fg];
1712 gcvalue.background = pix_colors[Color_bg]; 1679 gcvalue.background = pix_colors[Color_bg];
1713 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1680 XChangeGC (display->display, gc, GCBackground | GCForeground,
1714 &gcvalue); 1681 &gcvalue);
1715 scr_clear (); 1682 scr_clear ();
1716 scr_touch (true); 1683 scr_touch (true);
1717 } 1684 }
1718} 1685}
… …
1799bool 1766bool
1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1767rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1801{ 1768{
1802 bool found = false; 1769 bool found = false;
1803 1770
1804 for (int i = 0; i < TermWin.nrow; i++) 1771 for (int i = 0; i < nrow; i++)
1805 { 1772 {
1806 int col = 0; 1773 int col = 0;
1807 rend_t *drp = drawn_rend [i]; 1774 rend_t *drp = drawn[i].r;
1808 1775
1809 for (; col < TermWin.ncol; col++, drp++) 1776 for (; col < ncol; col++, drp++)
1810 if ((*drp & mask) == value) 1777 if ((*drp & mask) == value)
1811 { 1778 {
1812 found = true; 1779 found = true;
1813 *drp = ~value; 1780 *drp = ~value;
1814 } 1781 }
… …
1825 PART_END, 1792 PART_END,
1826 RC_COUNT 1793 RC_COUNT
1827}; 1794};
1828 1795
1829void 1796void
1830rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1797rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1831{ 1798{
1832 int i; 1799 int i;
1833 row_col_t rc[RC_COUNT]; 1800 row_col_t rc[RC_COUNT];
1834 1801
1835 if (drawn_text == NULL) /* sanity check */ 1802 if (!drawn) /* sanity check */
1836 return; 1803 return;
1837 1804
1838#ifndef NO_SLOW_LINK_SUPPORT 1805#ifndef NO_SLOW_LINK_SUPPORT
1839 if (refresh_type == FAST_REFRESH && !display->is_local) 1806 if (refresh_type == FAST_REFRESH && !display->is_local)
1840 { 1807 {
1841 y = 0; 1808 y = 0;
1842 height = TermWin.height; 1809 eheight = height;
1843 } 1810 }
1844#endif 1811#endif
1845 1812
1846#ifdef DEBUG_STRICT 1813#ifdef DEBUG_STRICT
1847 x = max (x, 0); 1814 x = max (x, 0);
1848 x = min (x, (int)TermWin.width); 1815 x = min (x, (int)width);
1849 y = max (y, 0); 1816 y = max (y, 0);
1850 y = min (y, (int)TermWin.height); 1817 y = min (y, (int)height);
1851#endif 1818#endif
1852 1819
1853 /* round down */ 1820 /* round down */
1854 rc[PART_BEG].col = Pixel2Col (x); 1821 rc[PART_BEG].col = Pixel2Col (x);
1855 rc[PART_BEG].row = Pixel2Row (y); 1822 rc[PART_BEG].row = Pixel2Row (y);
1856 /* round up */ 1823 /* round up */
1857 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1824 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1858 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1825 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1859 1826
1860 /* sanity checks */ 1827 /* sanity checks */
1861 for (i = PART_BEG; i < RC_COUNT; i++) 1828 for (i = PART_BEG; i < RC_COUNT; i++)
1862 { 1829 {
1863 MIN_IT (rc[i].col, TermWin.ncol - 1); 1830 MIN_IT (rc[i].col, ncol - 1);
1864 MIN_IT (rc[i].row, TermWin.nrow - 1); 1831 MIN_IT (rc[i].row, nrow - 1);
1865 } 1832 }
1866 1833
1867 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1834 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1868 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1835 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1869 1836
1870 if (refresh) 1837 if (refresh)
1871 scr_refresh (SLOW_REFRESH); 1838 scr_refresh (SLOW_REFRESH);
1872} 1839}
1873 1840
… …
1876 * Refresh the entire screen 1843 * Refresh the entire screen
1877 */ 1844 */
1878void 1845void
1879rxvt_term::scr_touch (bool refresh) 1846rxvt_term::scr_touch (bool refresh)
1880{ 1847{
1881 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1848 scr_expose (0, 0, width, height, refresh);
1882} 1849}
1883 1850
1884/* ------------------------------------------------------------------------- */ 1851/* ------------------------------------------------------------------------- */
1885/* 1852/*
1886 * Move the display so that the line represented by scrollbar value Y is at 1853 * Move the display so that the line represented by scrollbar value Y is at
… …
1890rxvt_term::scr_move_to (int y, int len) 1857rxvt_term::scr_move_to (int y, int len)
1891{ 1858{
1892 long p = 0; 1859 long p = 0;
1893 unsigned int oldviewstart; 1860 unsigned int oldviewstart;
1894 1861
1895 oldviewstart = TermWin.view_start; 1862 oldviewstart = view_start;
1896 1863
1897 if (y < len) 1864 if (y < len)
1898 { 1865 {
1899 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1866 p = (nrow + nsaved) * (len - y) / len;
1900 p -= (long) (TermWin.nrow - 1); 1867 p -= (long) (nrow - 1);
1901 p = max (p, 0); 1868 p = max (p, 0);
1902 } 1869 }
1903 1870
1904 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1871 view_start = (unsigned int)min (p, nsaved);
1905 1872
1906 return scr_changeview (oldviewstart); 1873 return scr_changeview (oldviewstart);
1907} 1874}
1908 1875
1909/* ------------------------------------------------------------------------- */ 1876/* ------------------------------------------------------------------------- */
… …
1915rxvt_term::scr_page (enum page_dirn direction, int nlines) 1882rxvt_term::scr_page (enum page_dirn direction, int nlines)
1916{ 1883{
1917 int n; 1884 int n;
1918 unsigned int oldviewstart; 1885 unsigned int oldviewstart;
1919 1886
1920 oldviewstart = TermWin.view_start; 1887 oldviewstart = view_start;
1921 1888
1922 if (direction == UP) 1889 if (direction == UP)
1923 { 1890 {
1924 n = TermWin.view_start + nlines; 1891 n = view_start + nlines;
1925 TermWin.view_start = min (n, TermWin.nscrolled); 1892 view_start = min (n, nsaved);
1926 } 1893 }
1927 else 1894 else
1928 { 1895 {
1929 n = TermWin.view_start - nlines; 1896 n = view_start - nlines;
1930 TermWin.view_start = max (n, 0); 1897 view_start = max (n, 0);
1931 } 1898 }
1932 1899
1933 return scr_changeview (oldviewstart); 1900 return scr_changeview (oldviewstart);
1934} 1901}
1935 1902
1936int 1903int
1937rxvt_term::scr_changeview (unsigned int oldviewstart) 1904rxvt_term::scr_changeview (unsigned int oldviewstart)
1938{ 1905{
1939 if (TermWin.view_start != oldviewstart) 1906 if (view_start != oldviewstart)
1940 { 1907 {
1941 want_refresh = 1; 1908 want_refresh = 1;
1942 num_scr -= (TermWin.view_start - oldviewstart); 1909 num_scr -= (view_start - oldviewstart);
1943 } 1910 }
1944 1911
1945 return (int) (TermWin.view_start - oldviewstart); 1912 return (int) (view_start - oldviewstart);
1946} 1913}
1947 1914
1948/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1949void 1916void
1950rxvt_term::scr_bell () 1917rxvt_term::scr_bell ()
… …
1953 1920
1954# ifndef NO_MAPALERT 1921# ifndef NO_MAPALERT
1955# ifdef MAPALERT_OPTION 1922# ifdef MAPALERT_OPTION
1956 if (options & Opt_mapAlert) 1923 if (options & Opt_mapAlert)
1957# endif 1924# endif
1958 XMapWindow (display->display, TermWin.parent[0]); 1925 XMapWindow (display->display, parent[0]);
1959# endif 1926# endif
1960 1927
1961 if (options & Opt_visualBell) 1928 if (options & Opt_visualBell)
1962 { 1929 {
1963 scr_rvideo_mode (!rvideo); /* refresh also done */ 1930 scr_rvideo_mode (!rvideo); /* refresh also done */
… …
1980 FILE *fd; 1947 FILE *fd;
1981 1948
1982 if ((fd = popen_printer ()) == NULL) 1949 if ((fd = popen_printer ()) == NULL)
1983 return; 1950 return;
1984 1951
1985 nrows = TermWin.nrow; 1952 nrows = nrow;
1986 row_offset = TermWin.saveLines; 1953 row_offset = saveLines;
1987 1954
1988 if (!fullhist) 1955 if (!fullhist)
1989 row_offset -= TermWin.view_start; 1956 row_offset -= view_start;
1990 else 1957 else
1991 { 1958 {
1992 nrows += TermWin.nscrolled; 1959 nrows += nsaved;
1993 row_offset -= TermWin.nscrolled; 1960 row_offset -= nsaved;
1994 } 1961 }
1995 1962
1996 wctomb (0, 0); 1963 wctomb (0, 0);
1997 1964
1998 for (r1 = 0; r1 < nrows; r1++) 1965 for (r1 = 0; r1 < nrows; r1++)
1999 { 1966 {
2000 text_t *tp = screen.text[r1 + row_offset]; 1967 text_t *tp = save[r1 + row_offset].t;
2001 int len = screen.tlen[r1 + row_offset]; 1968 int len = save[r1 + row_offset].l;
2002 1969
2003 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1970 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
2004 { 1971 {
2005 char mb[MB_LEN_MAX]; 1972 char mb[MB_LEN_MAX];
2006 text_t t = *tp++; 1973 text_t t = *tp++;
2007 if (t == NOCHAR) 1974 if (t == NOCHAR)
2008 continue; 1975 continue;
… …
2045#endif 2012#endif
2046 rend_t *crp; // cursor rendition pointer 2013 rend_t *crp; // cursor rendition pointer
2047 2014
2048 want_refresh = 0; /* screen is current */ 2015 want_refresh = 0; /* screen is current */
2049 2016
2050 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2017 if (refresh_type == NO_REFRESH || !mapped)
2051 return; 2018 return;
2052 2019
2053 /* 2020 /*
2054 * A: set up vars 2021 * A: set up vars
2055 */ 2022 */
2056 must_clear = 0; 2023 must_clear = 0;
2057 refresh_count = 0; 2024 refresh_count = 0;
2058 2025
2059 row_offset = TermWin.saveLines - TermWin.view_start; 2026 row_offset = term_start - view_start;
2060 2027
2061#if XPM_BACKGROUND 2028#if XPM_BACKGROUND
2062 must_clear |= bgPixmap.pixmap != None; 2029 must_clear |= bgPixmap.pixmap != None;
2063#endif 2030#endif
2064#if TRANSPARENT 2031#if TRANSPARENT
… …
2087 2054
2088 if (showcursor) 2055 if (showcursor)
2089 { 2056 {
2090 int col = screen.cur.col; 2057 int col = screen.cur.col;
2091 2058
2092 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2059 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2093 col--; 2060 col--;
2094 2061
2095 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2062 crp = &ROW(screen.cur.row).r[col];
2096 2063
2097 if (showcursor && TermWin.focus) 2064 if (showcursor && focus)
2098 { 2065 {
2099 if (options & Opt_cursorUnderline) 2066 if (options & Opt_cursorUnderline)
2100 *crp ^= RS_Uline; 2067 *crp ^= RS_Uline;
2101 else 2068 else
2102 { 2069 {
… …
2129 2096
2130 /* make sure no outline cursor is left around */ 2097 /* make sure no outline cursor is left around */
2131 setoldcursor = 0; 2098 setoldcursor = 0;
2132 if (ocrow != -1) 2099 if (ocrow != -1)
2133 { 2100 {
2134 if (screen.cur.row + TermWin.view_start != ocrow 2101 if (screen.cur.row + view_start != ocrow
2135 || screen.cur.col != oldcursor.col) 2102 || screen.cur.col != oldcursor.col)
2136 { 2103 {
2137 if (ocrow < TermWin.nrow 2104 if (ocrow < nrow
2138 && oldcursor.col < TermWin.ncol) 2105 && oldcursor.col < ncol)
2139 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2106 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2140 2107
2141 if (TermWin.focus || !showcursor) 2108 if (focus || !showcursor)
2142 oldcursor.row = -1; 2109 oldcursor.row = -1;
2143 else 2110 else
2144 setoldcursor = 1; 2111 setoldcursor = 1;
2145 } 2112 }
2146 } 2113 }
2147 else if (!TermWin.focus) 2114 else if (!focus)
2148 setoldcursor = 1; 2115 setoldcursor = 1;
2149 2116
2150 if (setoldcursor) 2117 if (setoldcursor)
2151 { 2118 {
2152 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2119 if (screen.cur.row + view_start >= nrow)
2153 oldcursor.row = -1; 2120 oldcursor.row = -1;
2154 else 2121 else
2155 { 2122 {
2156 oldcursor.row = screen.cur.row + TermWin.view_start; 2123 oldcursor.row = screen.cur.row + view_start;
2157 oldcursor.col = screen.cur.col; 2124 oldcursor.col = screen.cur.col;
2158 } 2125 }
2159 } 2126 }
2160 } 2127 }
2161 2128
2162#if ENABLE_OVERLAY 2129#if ENABLE_OVERLAY
2163 scr_swap_overlay (); 2130 scr_swap_overlay ();
2164#endif 2131#endif
2165
2166 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2167 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2168 2132
2169#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2170 /* 2134 /*
2171 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2172 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2173 */ 2137 */
2174 i = num_scr; 2138 i = num_scr;
2175 if (!display->is_local 2139 if (!display->is_local
2176 && refresh_type == FAST_REFRESH && num_scr_allow && i 2140 && refresh_type == FAST_REFRESH && num_scr_allow && i
2177 && abs (i) < TermWin.nrow && !must_clear) 2141 && abs (i) < nrow && !must_clear)
2178 { 2142 {
2179 int16_t nits; 2143 int16_t nits;
2180 int j; 2144 int j;
2181 int len, wlen; 2145 int len, wlen;
2182 2146
2183 j = TermWin.nrow; 2147 j = nrow;
2184 wlen = len = -1; 2148 wlen = len = -1;
2185 row = i > 0 ? 0 : j - 1; 2149 row = i > 0 ? 0 : j - 1;
2186 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2150 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2187 { 2151 {
2188 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2152 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2189 { 2153 {
2190 text_t *stp = screen.text[row + row_offset]; 2154 line_t s = save[(row + row_offset) % nlines];
2191 rend_t *srp = screen.rend[row + row_offset];
2192 text_t *dtp = drawn_text[row]; 2155 line_t d = drawn[row];
2193 text_t *dtp2 = drawn_text[row + i]; 2156 line_t d2 = drawn[row + i];
2194 rend_t *drp = drawn_rend[row];
2195 rend_t *drp2 = drawn_rend[row + i];
2196 2157
2197 for (nits = 0, col = TermWin.ncol; col--; ) 2158 for (nits = 0, col = ncol; col--; )
2198 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2159 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2199 nits--; 2160 nits--;
2200 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2161 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2201 nits++; 2162 nits++;
2202 2163
2203 if (nits > 8) /* XXX: arbitrary choice */ 2164 if (nits > 8) /* XXX: arbitrary choice */
2204 { 2165 {
2205 for (col = TermWin.ncol; col--; ) 2166 for (col = ncol; col--; )
2206 { 2167 {
2207 *dtp++ = *dtp2++; 2168 *d.t++ = *d2.t++;
2208 *drp++ = *drp2++; 2169 *d.r++ = *d2.r++;
2209 } 2170 }
2210 2171
2211 if (len == -1) 2172 if (len == -1)
2212 len = row; 2173 len = row;
2213 2174
… …
2220 { 2181 {
2221 /* also comes here at end if needed because of >= above */ 2182 /* also comes here at end if needed because of >= above */
2222 if (wlen < len) 2183 if (wlen < len)
2223 SWAP_IT (wlen, len, int); 2184 SWAP_IT (wlen, len, int);
2224 2185
2225 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2186 XCopyArea (display->display, vt, vt,
2226 TermWin.gc, 0, Row2Pixel (len + i), 2187 gc, 0, Row2Pixel (len + i),
2227 (unsigned int)TermWin_TotalWidth (), 2188 (unsigned int)TermWin_TotalWidth (),
2228 (unsigned int)Height2Pixel (wlen - len + 1), 2189 (unsigned int)Height2Pixel (wlen - len + 1),
2229 0, Row2Pixel (len)); 2190 0, Row2Pixel (len));
2230 len = -1; 2191 len = -1;
2231 } 2192 }
… …
2234#endif 2195#endif
2235 2196
2236 /* 2197 /*
2237 * E: main pass across every character 2198 * E: main pass across every character
2238 */ 2199 */
2239 for (row = 0; row < TermWin.nrow; row++) 2200 for (row = 0; row < nrow; row++)
2240 { 2201 {
2241 text_t *stp = screen.text[row + row_offset]; 2202 text_t *stp = save[(row + row_offset) % total_rows].t;
2242 rend_t *srp = screen.rend[row + row_offset]; 2203 rend_t *srp = save[(row + row_offset) % total_rows].r;
2243 text_t *dtp = drawn_text[row]; 2204 text_t *dtp = drawn[row].t;
2244 rend_t *drp = drawn_rend[row]; 2205 rend_t *drp = drawn[row].r;
2245 2206
2246 /* 2207 /*
2247 * E2: OK, now the real pass 2208 * E2: OK, now the real pass
2248 */ 2209 */
2249 int ypixel = (int)Row2Pixel (row); 2210 int ypixel = (int)Row2Pixel (row);
2250 2211
2251 for (col = 0; col < TermWin.ncol; col++) 2212 for (col = 0; col < ncol; col++)
2252 { 2213 {
2253 /* compare new text with old - if exactly the same then continue */ 2214 /* compare new text with old - if exactly the same then continue */
2254 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2215 if (stp[col] == dtp[col] /* Must match characters to skip. */
2255 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2216 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2256 || (stp[col] == ' ' /* space w/ no background change */ 2217 || (stp[col] == ' ' /* space w/ no background change */
… …
2270 dtp[col] = stp[col]; 2231 dtp[col] = stp[col];
2271 drp[col] = rend; 2232 drp[col] = rend;
2272 2233
2273 int xpixel = Col2Pixel (col); 2234 int xpixel = Col2Pixel (col);
2274 2235
2275 for (i = 0; ++col < TermWin.ncol; ) 2236 for (i = 0; ++col < ncol; )
2276 { 2237 {
2277 if (stp[col] == NOCHAR) 2238 if (stp[col] == NOCHAR)
2278 { 2239 {
2279 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2280 drp[col] = rend; 2241 drp[col] = rend;
… …
2319 // only do special processing if any attributes are set, which is rare 2280 // only do special processing if any attributes are set, which is rare
2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2281 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2321 { 2282 {
2322#if ENABLE_STYLES 2283#if ENABLE_STYLES
2323 // force redraw after "careful" characters to avoid pixel droppings 2284 // force redraw after "careful" characters to avoid pixel droppings
2324 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) 2285 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2325 drp[col + 1] = ~srp[col + 1]; 2286 drp[col + 1] = ~srp[col + 1];
2326 2287
2327 // include previous careful character(s) if possible, looks nicer (best effort...) 2288 // include previous careful character(s) if possible, looks nicer (best effort...)
2328 while (text > stp 2289 while (text > stp
2329 && srp[text - stp - 1] & RS_Careful 2290 && srp[text - stp - 1] & RS_Careful
2330 && RS_SAME (rend, srp[text - stp - 1])) 2291 && RS_SAME (rend, srp[text - stp - 1]))
2331 text--, count++, xpixel -= TermWin.fwidth; 2292 text--, count++, xpixel -= fwidth;
2332#endif 2293#endif
2333 2294
2334 bool invert = rend & RS_RVid; 2295 bool invert = rend & RS_RVid;
2335 2296
2336#ifndef NO_BOLD_UNDERLINE_REVERSE 2297#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2391 } 2352 }
2392 2353
2393 /* 2354 /*
2394 * Actually do the drawing of the string here 2355 * Actually do the drawing of the string here
2395 */ 2356 */
2396 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2357 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2397 2358
2398 if (back == fore) 2359 if (back == fore)
2399 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2360 font->clear_rect (*drawable, xpixel, ypixel,
2400 TermWin.fwidth * count, TermWin.fheight, 2361 fwidth * count, fheight,
2401 back); 2362 back);
2402 else if (back == Color_bg) 2363 else if (back == Color_bg)
2403 { 2364 {
2404 if (must_clear) 2365 if (must_clear)
2405 { 2366 {
2406 CLEAR_CHARS (xpixel, ypixel, count); 2367 CLEAR_CHARS (xpixel, ypixel, count);
2407 2368
2408 for (i = 0; i < count; i++) /* don't draw empty strings */ 2369 for (i = 0; i < count; i++) /* don't draw empty strings */
2409 if (text[i] != ' ') 2370 if (text[i] != ' ')
2410 { 2371 {
2411 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2412 break; 2373 break;
2413 } 2374 }
2414 } 2375 }
2415 else 2376 else
2416 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2377 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2417 } 2378 }
2418 else 2379 else
2419 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2420 2381
2421 if (rend & RS_Uline && font->descent > 1 && fore != back) 2382 if (rend & RS_Uline && font->descent > 1 && fore != back)
2422 { 2383 {
2423#if ENABLE_FRILLS 2384#if ENABLE_FRILLS
2424 if (ISSET_PIXCOLOR (Color_underline)) 2385 if (ISSET_PIXCOLOR (Color_underline))
2425 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2386 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2426 else 2387 else
2427#endif 2388#endif
2428 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2389 XSetForeground (display->display, gc, pix_colors[fore]);
2429 2390
2430 XDrawLine (display->display, drawBuffer, TermWin.gc, 2391 XDrawLine (display->display, drawBuffer, gc,
2431 xpixel, ypixel + font->ascent + 1, 2392 xpixel, ypixel + font->ascent + 1,
2432 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2433 } 2394 }
2434 } /* for (col....) */ 2395 } /* for (col....) */
2435 } /* for (row....) */ 2396 } /* for (row....) */
… …
2441 /* 2402 /*
2442 * G: cleanup cursor and display outline cursor if necessary 2403 * G: cleanup cursor and display outline cursor if necessary
2443 */ 2404 */
2444 if (showcursor) 2405 if (showcursor)
2445 { 2406 {
2446 if (TermWin.focus) 2407 if (focus)
2447 { 2408 {
2448 if (options & Opt_cursorUnderline) 2409 if (options & Opt_cursorUnderline)
2449 *crp ^= RS_Uline; 2410 *crp ^= RS_Uline;
2450 else 2411 else
2451 { 2412 {
… …
2458 else if (oldcursor.row >= 0) 2419 else if (oldcursor.row >= 0)
2459 { 2420 {
2460 int cursorwidth = 1; 2421 int cursorwidth = 1;
2461 int col = oldcursor.col; 2422 int col = oldcursor.col;
2462 2423
2463 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2424 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2464 col--; 2425 col--;
2465 2426
2466 while (col + cursorwidth < TermWin.ncol 2427 while (col + cursorwidth < ncol
2467 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) 2428 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2468 cursorwidth++; 2429 cursorwidth++;
2469 2430
2470#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2471 if (ISSET_PIXCOLOR (Color_cursor)) 2432 if (ISSET_PIXCOLOR (Color_cursor))
2472 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2433 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2473#endif 2434#endif
2474 2435
2475 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2436 XDrawRectangle (display->display, drawBuffer, gc,
2476 Col2Pixel (col), 2437 Col2Pixel (col),
2477 Row2Pixel (oldcursor.row), 2438 Row2Pixel (oldcursor.row),
2478 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2439 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2479 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2440 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2480 } 2441 }
2481 } 2442 }
2482 2443
2483 /* 2444 /*
2484 * H: cleanup selection 2445 * H: cleanup selection
… …
2491 num_scr = 0; 2452 num_scr = 0;
2492 num_scr_allow = 1; 2453 num_scr_allow = 1;
2493} 2454}
2494 2455
2495void 2456void
2496rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2457rxvt_term::scr_remap_chars (const line_t &l)
2497{ 2458{
2498 if (!rp || !tp) 2459 if (!l.t)
2499 return; 2460 return;
2500 2461
2501 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2462 for (int i = ncol; i--; )
2502 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2463 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2503} 2464}
2504 2465
2505void 2466void
2506rxvt_term::scr_remap_chars () 2467rxvt_term::scr_remap_chars ()
2507{ 2468{
2508 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2469 for (int i = total_rows; i--; )
2509 scr_remap_chars (screen.text[i], screen.rend[i]); 2470 scr_remap_chars (save[i]);
2510 2471
2511 for (int i = TermWin.nrow; i--; ) 2472 for (int i = nrow; i--; )
2512 { 2473 {
2513 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2474 scr_remap_chars (drawn[i]);
2514 scr_remap_chars (swap.text[i], swap.rend[i]); 2475 scr_remap_chars (swap_save[i]);
2515 } 2476 }
2516} 2477}
2517 2478
2518void 2479void
2519rxvt_term::scr_recolour () 2480rxvt_term::scr_recolour ()
… …
2525#if XPM_BACKGROUND 2486#if XPM_BACKGROUND
2526 && !bgPixmap.pixmap 2487 && !bgPixmap.pixmap
2527#endif 2488#endif
2528 ) 2489 )
2529 { 2490 {
2530 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2491 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2531 XClearWindow (display->display, TermWin.parent[0]); 2492 XClearWindow (display->display, parent[0]);
2532 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2493 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2533#if HAVE_SCROLLBARS 2494#if HAVE_SCROLLBARS
2534 if (scrollBar.win) 2495 if (scrollBar.win)
2535 { 2496 {
2536 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2497 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2537 scrollBar.setIdle (); 2498 scrollBar.setIdle ();
… …
2547 2508
2548/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2549void 2510void
2550rxvt_term::scr_clear (bool really) 2511rxvt_term::scr_clear (bool really)
2551{ 2512{
2552 if (!TermWin.mapped) 2513 if (!mapped)
2553 return; 2514 return;
2554 2515
2555 num_scr_allow = 0; 2516 num_scr_allow = 0;
2556 want_refresh = 1; 2517 want_refresh = 1;
2557 2518
2558#if TRANSPARENT
2559 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2560 {
2561 int i;
2562
2563 if (!(options & Opt_transparent_all))
2564 i = 0;
2565 else
2566 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2567
2568 while (i--)
2569 if (TermWin.parent[i] != None)
2570 XClearWindow (display->display, TermWin.parent[i]);
2571 }
2572#endif
2573
2574 if (really) 2519 if (really)
2575 XClearWindow (display->display, TermWin.vt); 2520 XClearWindow (display->display, vt);
2576} 2521}
2577 2522
2578/* ------------------------------------------------------------------------- */ 2523/* ------------------------------------------------------------------------- */
2579void 2524void
2580rxvt_term::scr_reverse_selection () 2525rxvt_term::scr_reverse_selection ()
2581{ 2526{
2527 if (selection.op
2582 if (selection.op && current_screen == selection.screen) 2528 && current_screen == selection.screen
2529 && selection.end.row >= -view_start)
2583 { 2530 {
2584 int end_row = TermWin.saveLines - TermWin.view_start; 2531 int view_end = -view_start + nrow;
2585 int i = selection.beg.row + TermWin.saveLines; 2532 int row, col;
2586 int col, row = selection.end.row + TermWin.saveLines;
2587 rend_t *srp;
2588 2533
2589#if ENABLE_FRILLS 2534#if ENABLE_FRILLS
2590 if (selection.rect) 2535 if (selection.rect)
2591 { 2536 {
2592 end_row += TermWin.nrow; 2537 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2593
2594 for (; i <= row && i <= end_row; i++)
2595 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2538 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2596 srp[col] ^= RS_RVid; 2539 srp[col] ^= RS_RVid;
2597 } 2540 }
2598 else 2541 else
2599#endif 2542#endif
2600 { 2543 {
2601 if (i >= end_row) 2544 if (selection.beg.row >= -view_start)
2545 {
2602 col = selection.beg.col; 2546 col = selection.beg.col;
2547 row = selection.beg.row;
2548 }
2603 else 2549 else
2604 { 2550 {
2605 col = 0; 2551 col = 0;
2606 i = end_row; 2552 row = view_start;
2607 } 2553 }
2608 2554
2609 end_row += TermWin.nrow; 2555 for (; row < min (selection.end.row, view_end); row++, col = 0)
2610 2556 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2611 for (; i < row && i < end_row; i++, col = 0)
2612 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2613 srp[col] ^= RS_RVid; 2557 srp[col] ^= RS_RVid;
2614 2558
2615 if (i == row && i < end_row) 2559 if (row == selection.end.row)
2616 for (srp = screen.rend[i]; col < selection.end.col; col++) 2560 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2617 srp[col] ^= RS_RVid; 2561 srp[col] ^= RS_RVid;
2618 } 2562 }
2619 } 2563 }
2620} 2564}
2621 2565
… …
2630{ 2574{
2631 int row, wrote; 2575 int row, wrote;
2632 unsigned int width, towrite; 2576 unsigned int width, towrite;
2633 char r1[] = "\n"; 2577 char r1[] = "\n";
2634 2578
2635 for (row = TermWin.saveLines - TermWin.nscrolled; 2579 for (row = saveLines - nsaved;
2636 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2580 row < saveLines + nrow - 1; row++)
2637 { 2581 {
2638 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2582 width = save[row].l >= 0 ? save[row].l
2639 : TermWin.ncol; 2583 : ncol;
2640 for (towrite = width; towrite; towrite -= wrote) 2584 for (towrite = width; towrite; towrite -= wrote)
2641 { 2585 {
2642 wrote = write (fd, & (screen.text[row][width - towrite]), 2586 wrote = write (fd, & (save[row].t[width - towrite]),
2643 towrite); 2587 towrite);
2644 if (wrote < 0) 2588 if (wrote < 0)
2645 return; /* XXX: death, no report */ 2589 return; /* XXX: death, no report */
2646 } 2590 }
2647 if (screen.tlen[row] >= 0) 2591 if (save[row].l >= 0)
2648 if (write (fd, r1, 1) <= 0) 2592 if (write (fd, r1, 1) <= 0)
2649 return; /* XXX: death, no report */ 2593 return; /* XXX: death, no report */
2650 } 2594 }
2651} 2595}
2652#endif 2596#endif
2653 2597
2654/* ------------------------------------------------------------------------- * 2598/* ------------------------------------------------------------------------- *
2655 * CHARACTER SELECTION * 2599 * CHARACTER SELECTION *
2656 * ------------------------------------------------------------------------- */ 2600 * ------------------------------------------------------------------------- */
2657
2658/*
2659 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2660 */
2661void 2601void
2662rxvt_term::selection_check (int check_more) 2602rxvt_term::selection_check (int check_more)
2663{ 2603{
2664 row_col_t pos; 2604 row_col_t pos;
2665 2605
2666 if (!selection.op) 2606 if (!selection.op)
2667 return; 2607 return;
2668 2608
2669 pos.row = pos.col = 0; 2609 pos.row = pos.col = 0;
2670 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2610 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2671 || (selection.beg.row >= TermWin.nrow) 2611 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2672 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2612 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2673 || (selection.mark.row >= TermWin.nrow)
2674 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2675 || (selection.end.row >= TermWin.nrow)
2676 || (check_more == 1 2613 || (check_more == 1
2677 && current_screen == selection.screen 2614 && current_screen == selection.screen
2678 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2615 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2679 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2616 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2680 || (check_more == 2 2617 || (check_more == 2
… …
2682 && ROWCOL_IS_AFTER (selection.end, pos)) 2619 && ROWCOL_IS_AFTER (selection.end, pos))
2683 || (check_more == 3 2620 || (check_more == 3
2684 && ROWCOL_IS_AFTER (selection.end, pos)) 2621 && ROWCOL_IS_AFTER (selection.end, pos))
2685 || (check_more == 4 /* screen width change */ 2622 || (check_more == 4 /* screen width change */
2686 && (selection.beg.row != selection.end.row 2623 && (selection.beg.row != selection.end.row
2687 || selection.end.col > TermWin.ncol))) 2624 || selection.end.col > ncol)))
2688 CLEAR_SELECTION (); 2625 CLEAR_SELECTION ();
2689} 2626}
2690 2627
2691/* ------------------------------------------------------------------------- */ 2628/* ------------------------------------------------------------------------- */
2692/* 2629/*
… …
2901 * EXT: button 2 release 2838 * EXT: button 2 release
2902 */ 2839 */
2903void 2840void
2904rxvt_term::selection_request (Time tm, int x, int y) 2841rxvt_term::selection_request (Time tm, int x, int y)
2905{ 2842{
2906 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2843 if (x < 0 || x >= width || y < 0 || y >= height)
2907 return; /* outside window */ 2844 return; /* outside window */
2908 2845
2909 if (selection.text) 2846 if (selection.text)
2910 { /* internal selection */ 2847 { /* internal selection */
2911 char *str = rxvt_wcstombs (selection.text, selection.len); 2848 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2953 sel = xa[XA_CLIPBOARD]; 2890 sel = xa[XA_CLIPBOARD];
2954 2891
2955 if (XGetSelectionOwner (display->display, sel) != None) 2892 if (XGetSelectionOwner (display->display, sel) != None)
2956 { 2893 {
2957 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2894 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2958 TermWin.vt, selection_request_time); 2895 vt, selection_request_time);
2959 return 1; 2896 return 1;
2960 } 2897 }
2961 2898
2962 return 0; 2899 return 0;
2963} 2900}
… …
2986 * EXT: button 1 or 3 release 2923 * EXT: button 1 or 3 release
2987 */ 2924 */
2988void 2925void
2989rxvt_term::selection_make (Time tm) 2926rxvt_term::selection_make (Time tm)
2990{ 2927{
2991 int i, col, end_col, row, end_row; 2928 int i;
2992 wchar_t *new_selection_text; 2929 wchar_t *new_selection_text;
2993 text_t *t; 2930 text_t *t;
2994 2931
2995 switch (selection.op) 2932 switch (selection.op)
2996 { 2933 {
… …
3009 selection.op = SELECTION_DONE; 2946 selection.op = SELECTION_DONE;
3010 2947
3011 if (selection.clicks == 4) 2948 if (selection.clicks == 4)
3012 return; /* nothing selected, go away */ 2949 return; /* nothing selected, go away */
3013 2950
3014 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2951 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3015 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2952 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
3016 2953
3017 col = selection.beg.col;
3018 row = selection.beg.row + TermWin.saveLines;
3019 end_row = selection.end.row + TermWin.saveLines;
3020 int ofs = 0; 2954 int ofs = 0;
3021 int extra = 0; 2955 int extra = 0;
3022 2956
2957 int col = selection.beg.col;
2958 int row = selection.beg.row;
2959
2960 int end_col;
2961
3023 for (; row <= end_row; row++, col = 0) 2962 for (; row <= selection.end.row; row++, col = 0)
3024 { 2963 {
3025 end_col = screen.tlen[row];
3026
3027#if ENABLE_FRILLS 2964#if ENABLE_FRILLS
3028 if (selection.rect) 2965 if (selection.rect)
3029 { 2966 {
3030 col = selection.beg.col; 2967 col = selection.beg.col;
3031 end_col = TermWin.ncol + 1; 2968 end_col = ncol + 1;
3032 } 2969 }
2970 else
3033#endif 2971#endif
2972 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
3034 2973
3035 MAX_IT (col, 0); 2974 col = max (col, 0);
3036 2975
3037 if (end_col == -1)
3038 end_col = TermWin.ncol;
3039
3040 if (row == end_row || selection.rect) 2976 if (row == selection.end.row || selection.rect)
3041 MIN_IT (end_col, selection.end.col); 2977 end_col = min (end_col, selection.end.col);
3042 2978
3043 t = &screen.text[row][col]; 2979 t = ROW(row).t + col;
3044 for (; col < end_col; col++) 2980 for (; col < end_col; col++)
3045 { 2981 {
3046 if (*t == NOCHAR) 2982 if (*t == NOCHAR)
3047 t++; 2983 t++;
3048#if ENABLE_COMBINING 2984#if ENABLE_COMBINING
… …
3064#endif 3000#endif
3065 else 3001 else
3066 new_selection_text[ofs++] = *t++; 3002 new_selection_text[ofs++] = *t++;
3067 } 3003 }
3068 3004
3069 if (screen.tlen[row] != -1 && row != end_row) 3005 if (!ROW(row).is_longer () && row != selection.end.row)
3070 new_selection_text[ofs++] = C0_LF; 3006 new_selection_text[ofs++] = C0_LF;
3071 } 3007 }
3072 3008
3073 if (end_col != selection.end.col) 3009 if (end_col != selection.end.col)
3074 new_selection_text[ofs++] = C0_LF; 3010 new_selection_text[ofs++] = C0_LF;
… …
3085 3021
3086 // we usually allocate much more than necessary, so realloc it smaller again 3022 // we usually allocate much more than necessary, so realloc it smaller again
3087 selection.len = ofs; 3023 selection.len = ofs;
3088 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3024 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3089 3025
3090 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3026 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3091 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3027 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3092 display->set_selection_owner (this); 3028 display->set_selection_owner (this);
3093 else 3029 else
3094 rxvt_warn ("can't get primary selection, ignoring.\n"); 3030 rxvt_warn ("can't get primary selection, ignoring.\n");
3095 3031
3096#if 0 3032#if 0
… …
3119 3055
3120 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3056 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3121 3057
3122 if (clicks == 2 || clicks == 3) 3058 if (clicks == 2 || clicks == 3)
3123 selection_extend_colrow (selection.mark.col, 3059 selection_extend_colrow (selection.mark.col,
3124 selection.mark.row + TermWin.view_start, 3060 selection.mark.row + view_start,
3125 0, /* button 3 */ 3061 0, /* button 3 */
3126 1, /* button press */ 3062 1, /* button press */
3127 0); /* click change */ 3063 0); /* click change */
3128} 3064}
3129 3065
… …
3133 */ 3069 */
3134void 3070void
3135rxvt_term::selection_start_colrow (int col, int row) 3071rxvt_term::selection_start_colrow (int col, int row)
3136{ 3072{
3137 want_refresh = 1; 3073 want_refresh = 1;
3074
3075 selection.mark.row = row - view_start;
3138 selection.mark.col = col; 3076 selection.mark.col = col;
3139 selection.mark.row = row - TermWin.view_start;
3140 3077
3141 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3078 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);
3142 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3079 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);
3143 MAX_IT (selection.mark.col, 0);
3144 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3145 3080
3146 while (selection.mark.col > 0 3081 while (selection.mark.col > 0
3147 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3082 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3148 --selection.mark.col; 3083 --selection.mark.col;
3149 3084
3150 if (selection.op) 3085 if (selection.op)
3151 { /* clear the old selection */ 3086 { /* clear the old selection */
3152 selection.beg.row = selection.end.row = selection.mark.row; 3087 selection.beg.row = selection.end.row = selection.mark.row;
… …
3176 text_t *stp; 3111 text_t *stp;
3177 rend_t *srp; 3112 rend_t *srp;
3178 3113
3179 if (dirn == UP) 3114 if (dirn == UP)
3180 { 3115 {
3181 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3116 bound.row = - nsaved - 1;
3182 bound.col = 0; 3117 bound.col = 0;
3183 dirnadd = -1; 3118 dirnadd = -1;
3184 } 3119 }
3185 else 3120 else
3186 { 3121 {
3187 bound.row = TermWin.saveLines + TermWin.nrow; 3122 bound.row = nrow;
3188 bound.col = TermWin.ncol - 1; 3123 bound.col = ncol - 1;
3189 dirnadd = 1; 3124 dirnadd = 1;
3190 } 3125 }
3191 3126
3192 row = mark->row + TermWin.saveLines; 3127 row = mark->row;
3193 col = mark->col; 3128 col = max (mark->col, 0);
3194 MAX_IT (col, 0); 3129
3195 /* find the edge of a word */ 3130 /* find the edge of a word */
3196 stp = &screen.text[row][col]; 3131 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3197 w1 = DELIMIT_TEXT (*stp); 3132 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3198
3199 srp = &screen.rend[row][col];
3200 w2 = DELIMIT_REND (*srp);
3201 3133
3202 for (;;) 3134 for (;;)
3203 { 3135 {
3204 for (; col != bound.col; col += dirnadd) 3136 for (; col != bound.col; col += dirnadd)
3205 { 3137 {
… …
3215 break; 3147 break;
3216 } 3148 }
3217 3149
3218 if ((col == bound.col) && (row != bound.row)) 3150 if ((col == bound.col) && (row != bound.row))
3219 { 3151 {
3220 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3152 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3221 { 3153 {
3222 trow = row + dirnadd; 3154 trow = row + dirnadd;
3223 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3155 tcol = dirn == UP ? ncol - 1 : 0;
3224 3156
3225 if (screen.text[trow] == NULL) 3157 if (!ROW(trow).t)
3226 break; 3158 break;
3227 3159
3228 stp = & (screen.text[trow][tcol]); 3160 stp = ROW(trow).t + tcol;
3229 srp = & (screen.rend[trow][tcol]); 3161 srp = ROW(trow).r + tcol;
3230 3162
3231 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3163 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3232 break; 3164 break;
3233 3165
3234 row = trow; 3166 row = trow;
… …
3242Old_Word_Selection_You_Die: 3174Old_Word_Selection_You_Die:
3243 if (dirn == DN) 3175 if (dirn == DN)
3244 col++; /* put us on one past the end */ 3176 col++; /* put us on one past the end */
3245 3177
3246 /* Poke the values back in */ 3178 /* Poke the values back in */
3247 ret->row = row - TermWin.saveLines; 3179 ret->row = row;
3248 ret->col = col; 3180 ret->col = col;
3249} 3181}
3250 3182
3251/* ------------------------------------------------------------------------- */ 3183/* ------------------------------------------------------------------------- */
3252/* 3184/*
… …
3257 * flag == 2 ==> button 3 motion 3189 * flag == 2 ==> button 3 motion
3258 */ 3190 */
3259void 3191void
3260rxvt_term::selection_extend (int x, int y, int flag) 3192rxvt_term::selection_extend (int x, int y, int flag)
3261{ 3193{
3262 int col, row; 3194 int col = min (max (Pixel2Col (x), 0), nrow - 1);
3263 3195 int row = min (max (Pixel2Row (y), 0), ncol);
3264 col = Pixel2Col (x);
3265 row = Pixel2Row (y);
3266 MAX_IT (row, 0);
3267 MIN_IT (row, (int)TermWin.nrow - 1);
3268 MAX_IT (col, 0);
3269 MIN_IT (col, (int)TermWin.ncol);
3270 3196
3271 /* 3197 /*
3272 * If we're selecting characters (single click) then we must check first 3198 * If we're selecting characters (single click) then we must check first
3273 * if we are at the same place as the original mark. If we are then 3199 * if we are at the same place as the original mark. If we are then
3274 * select nothing. Otherwise, if we're to the right of the mark, you have to 3200 * select nothing. Otherwise, if we're to the right of the mark, you have to
3275 * be _past_ a character for it to be selected. 3201 * be _past_ a character for it to be selected.
3276 */ 3202 */
3277 if (((selection.clicks % 3) == 1) && !flag 3203 if (((selection.clicks % 3) == 1) && !flag
3278 && (col == selection.mark.col 3204 && (col == selection.mark.col
3279 && (row == selection.mark.row + TermWin.view_start))) 3205 && (row == selection.mark.row + view_start)))
3280 { 3206 {
3281 /* select nothing */ 3207 /* select nothing */
3282 selection.beg.row = selection.end.row = 0; 3208 selection.beg.row = selection.end.row = 0;
3283 selection.beg.col = selection.end.col = 0; 3209 selection.beg.col = selection.end.col = 0;
3284 selection.clicks = 4; 3210 selection.clicks = 4;
… …
3299 * Extend the selection to the specified col/row 3225 * Extend the selection to the specified col/row
3300 */ 3226 */
3301void 3227void
3302rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3228rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3303{ 3229{
3304 int16_t ncol = TermWin.ncol;
3305 int end_col;
3306 row_col_t pos; 3230 row_col_t pos;
3307 enum { 3231 enum {
3308 LEFT, RIGHT 3232 LEFT, RIGHT
3309 } closeto = RIGHT; 3233 } closeto = RIGHT;
3310 3234
… …
3341 selection.beg.col = selection.end.col = selection.mark.col; 3265 selection.beg.col = selection.end.col = selection.mark.col;
3342 selection.beg.row = selection.end.row = selection.mark.row; 3266 selection.beg.row = selection.end.row = selection.mark.row;
3343 } 3267 }
3344 3268
3345 pos.col = col; 3269 pos.col = col;
3346 pos.row = row; 3270 pos.row = row - view_start;
3347
3348 pos.row -= TermWin.view_start; /* adjust for scroll */
3349 3271
3350 /* 3272 /*
3351 * This is mainly xterm style selection with a couple of differences, mainly 3273 * This is mainly xterm style selection with a couple of differences, mainly
3352 * in the way button3 drag extension works. 3274 * in the way button3 drag extension works.
3353 * We're either doing: button1 drag; button3 press; or button3 drag 3275 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3412 } 3334 }
3413 } 3335 }
3414 3336
3415 if (selection.clicks == 1) 3337 if (selection.clicks == 1)
3416 { 3338 {
3417 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3339 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3418 3340 && !ROW(selection.beg.row).is_longer ()
3419 if (selection.beg.col > end_col
3420 && end_col != -1
3421#if ENABLE_FRILLS 3341#if ENABLE_FRILLS
3422 && !selection.rect 3342 && !selection.rect
3423#endif 3343#endif
3424 ) 3344 )
3425 selection.beg.col = ncol; 3345 selection.beg.col = ncol;
3426 3346
3427 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3428
3429 if ( 3347 if (
3430 selection.end.col > end_col 3348 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3431 && end_col != -1 3349 && !ROW(selection.end.row).is_longer ()
3432#if ENABLE_FRILLS 3350#if ENABLE_FRILLS
3433 && !selection.rect 3351 && !selection.rect
3434#endif 3352#endif
3435 ) 3353 )
3436 selection.end.col = ncol; 3354 selection.end.col = ncol;
… …
3446 else if (selection.clicks == 3) 3364 else if (selection.clicks == 3)
3447 { 3365 {
3448#if ENABLE_FRILLS 3366#if ENABLE_FRILLS
3449 if (options & Opt_tripleclickwords) 3367 if (options & Opt_tripleclickwords)
3450 { 3368 {
3451 int end_row;
3452
3453 selection_delimit_word (UP, &selection.beg, &selection.beg); 3369 selection_delimit_word (UP, &selection.beg, &selection.beg);
3454 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3455 3370
3456 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3371 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3457 { 3372 {
3458 end_col = screen.tlen[end_row + TermWin.saveLines]; 3373 if (!ROW(end_row).is_longer ())
3459
3460 if (end_col != -1)
3461 { 3374 {
3462 selection.end.row = end_row; 3375 selection.end.row = end_row;
3463 selection.end.col = end_col; 3376 selection.end.col = save[end_row + saveLines].l;
3464 selection_remove_trailing_spaces (); 3377 selection_remove_trailing_spaces ();
3465 break; 3378 break;
3466 } 3379 }
3467 } 3380 }
3468 } 3381 }
… …
3474 3387
3475 selection.beg.col = 0; 3388 selection.beg.col = 0;
3476 selection.end.col = ncol; 3389 selection.end.col = ncol;
3477 3390
3478 // select a complete logical line 3391 // select a complete logical line
3479 while (selection.beg.row > -TermWin.saveLines 3392 while (selection.beg.row > -saveLines
3480 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3393 && ROW(selection.beg.row - 1).is_longer ())
3481 selection.beg.row--; 3394 selection.beg.row--;
3482 3395
3483 while (selection.end.row < TermWin.nrow 3396 while (selection.end.row < nrow
3484 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3397 && ROW(selection.end.row).is_longer ())
3485 selection.end.row++; 3398 selection.end.row++;
3486 } 3399 }
3487 } 3400 }
3488 3401
3489 if (button3 && buttonpress) 3402 if (button3 && buttonpress)
… …
3514 text_t *stp; 3427 text_t *stp;
3515 3428
3516 end_col = selection.end.col; 3429 end_col = selection.end.col;
3517 end_row = selection.end.row; 3430 end_row = selection.end.row;
3518 3431
3519 for ( ; end_row >= selection.beg.row; ) 3432 for (; end_row >= selection.beg.row; )
3520 { 3433 {
3521 stp = screen.text[end_row + TermWin.saveLines]; 3434 stp = ROW(end_row).t;
3522 3435
3523 while (--end_col >= 0) 3436 while (--end_col >= 0)
3524 { 3437 {
3525 if (stp[end_col] != ' ' 3438 if (stp[end_col] != ' '
3526 && stp[end_col] != '\t' 3439 && stp[end_col] != '\t'
3527 && stp[end_col] != NOCHAR) 3440 && stp[end_col] != NOCHAR)
3528 break; 3441 break;
3529 } 3442 }
3530 3443
3531 if (end_col >= 0 3444 if (end_col >= 0
3532 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3445 || !ROW(end_row - 1).is_longer ())
3533 { 3446 {
3534 selection.end.col = end_col + 1; 3447 selection.end.col = end_col + 1;
3535 selection.end.row = end_row; 3448 selection.end.row = end_row;
3536 break; 3449 break;
3537 } 3450 }
3538 3451
3539 end_row--; 3452 end_row--;
3540 end_col = TermWin.ncol; 3453 end_col = ncol;
3541 } 3454 }
3542 3455
3543 if (selection.mark.row > selection.end.row) 3456 if (selection.mark.row > selection.end.row)
3544 { 3457 {
3545 selection.mark.row = selection.end.row; 3458 selection.mark.row = selection.end.row;
… …
3708 */ 3621 */
3709void 3622void
3710rxvt_term::pixel_position (int *x, int *y) 3623rxvt_term::pixel_position (int *x, int *y)
3711{ 3624{
3712 *x = Pixel2Col (*x); 3625 *x = Pixel2Col (*x);
3713 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3626 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3714 *y = Pixel2Row (*y); 3627 *y = Pixel2Row (*y);
3715 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3628 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3716} 3629}
3717 3630
3718/* ------------------------------------------------------------------------- */ 3631/* ------------------------------------------------------------------------- */
3719#ifdef USE_XIM 3632#ifdef USE_XIM
3720void 3633void
3721rxvt_term::im_set_position (XPoint &pos) 3634rxvt_term::im_set_position (XPoint &pos)
3722{ 3635{
3723 XWindowAttributes xwa; 3636 XWindowAttributes xwa;
3724 3637
3725 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3638 XGetWindowAttributes (display->display, vt, &xwa);
3726 3639
3727 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3640 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3728 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3641 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3729} 3642}
3730#endif 3643#endif
3731 3644
3732#if ENABLE_OVERLAY 3645#if ENABLE_OVERLAY
3733void 3646void
3734rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3647rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3735{ 3648{
3736 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3649 if (nrow < 3 || ncol < 3)
3737 return; 3650 return;
3738 3651
3739 want_refresh = 1; 3652 want_refresh = 1;
3740 3653
3741 scr_overlay_off (); 3654 scr_overlay_off ();
3742 3655
3743 if (x < 0) x = TermWin.ncol - w; 3656 if (x < 0) x = ncol - w;
3744 if (y < 0) y = TermWin.nrow - h; 3657 if (y < 0) y = nrow - h;
3745 3658
3746 // make space for border 3659 // make space for border
3747 w += 2; MIN_IT (w, TermWin.ncol); 3660 w += 2; MIN_IT (w, ncol);
3748 h += 2; MIN_IT (h, TermWin.nrow); 3661 h += 2; MIN_IT (h, nrow);
3749 3662
3750 x -= 1; MAX_IT (x, 0); 3663 x -= 1; MAX_IT (x, 0);
3751 y -= 1; MAX_IT (y, 0); 3664 y -= 1; MAX_IT (y, 0);
3752 3665
3753 MIN_IT (x, TermWin.ncol - w); 3666 MIN_IT (x, ncol - w);
3754 MIN_IT (y, TermWin.nrow - h); 3667 MIN_IT (y, nrow - h);
3755 3668
3756 ov_x = x; ov_y = y; 3669 ov_x = x; ov_y = y;
3757 ov_w = w; ov_h = h; 3670 ov_w = w; ov_h = h;
3758 3671
3759 ov_text = new text_t *[h]; 3672 ov_text = new text_t *[h];
… …
3845rxvt_term::scr_swap_overlay () 3758rxvt_term::scr_swap_overlay ()
3846{ 3759{
3847 if (!ov_text) 3760 if (!ov_text)
3848 return; 3761 return;
3849 3762
3850 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3851
3852 // swap screen mem with overlay 3763 // swap screen mem with overlay
3853 for (int y = ov_h; y--; ) 3764 for (int y = ov_h; y--; )
3854 { 3765 {
3855 text_t *t1 = ov_text[y]; 3766 text_t *t1 = ov_text[y];
3856 rend_t *r1 = ov_rend[y]; 3767 rend_t *r1 = ov_rend[y];
3857 3768
3858 text_t *t2 = screen.text[y + row_offset] + ov_x; 3769 text_t *t2 = ROW(y - view_start).t + ov_x;
3859 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3770 rend_t *r2 = ROW(y - view_start).r + ov_x;
3860 3771
3861 for (int x = ov_w; x--; ) 3772 for (int x = ov_w; x--; )
3862 { 3773 {
3863 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3774 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3864 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3775 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3866 } 3777 }
3867} 3778}
3868 3779
3869#endif 3780#endif
3870/* ------------------------------------------------------------------------- */ 3781/* ------------------------------------------------------------------------- */
3782

Diff Legend

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