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.170 by root, Mon Nov 28 19:35:04 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
447 total_rows = TermWin.nrow + TermWin.saveLines;
448
449 delete talloc; talloc = 0; 455 delete talloc; talloc = 0;
450 delete ralloc; ralloc = 0; 456 delete ralloc; ralloc = 0;
451 457
452 free (screen.text); 458 free (save);
453 free (screen.tlen); 459 free (swap_save);
454 free (screen.rend);
455 free (drawn_text); 460 free (drawn);
456 free (drawn_rend);
457 free (swap.text);
458 free (swap.tlen);
459 free (swap.rend);
460 free (buf_text); 461 free (buf);
461 free (buf_rend);
462 free (tabs); 462 free (tabs);
463
464 /* NULL these so if anything tries to use them, we'll know about it */
465 screen.text = drawn_text = swap.text = NULL;
466 screen.rend = drawn_rend = swap.rend = NULL;
467 screen.tlen = swap.tlen = NULL;
468 buf_text = NULL;
469 buf_rend = NULL;
470 tabs = NULL;
471} 463}
472 464
473/* ------------------------------------------------------------------------- */ 465/* ------------------------------------------------------------------------- */
474/* 466/*
475 * Hard reset 467 * Hard reset
… …
526 set_font_style (); 518 set_font_style ();
527 break; 519 break;
528 } 520 }
529 521
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 522 /* boundary check in case screen size changed between SAVE and RESTORE */
531 MIN_IT (s->cur.row, TermWin.nrow - 1); 523 MIN_IT (s->cur.row, nrow - 1);
532 MIN_IT (s->cur.col, TermWin.ncol - 1); 524 MIN_IT (s->cur.col, ncol - 1);
533#ifdef DEBUG_STRICT 525#ifdef DEBUG_STRICT
534 assert (s->cur.row >= 0); 526 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 527 assert (s->cur.col >= 0);
536#else /* drive with your eyes closed */ 528#else /* drive with your eyes closed */
537 MAX_IT (s->cur.row, 0); 529 MAX_IT (s->cur.row, 0);
… …
553 int offset; 545 int offset;
554#endif 546#endif
555 547
556 want_refresh = 1; 548 want_refresh = 1;
557 549
558 TermWin.view_start = 0; 550 view_start = 0;
559 551
560 if (current_screen == scrn) 552 if (current_screen == scrn)
561 return scrn; 553 return scrn;
562 554
563 selection_check (2); /* check for boundary cross */ 555 selection_check (2); /* check for boundary cross */
… …
573 565
574#if NSCREENS 566#if NSCREENS
575 if (options & Opt_secondaryScreen) 567 if (options & Opt_secondaryScreen)
576 { 568 {
577 num_scr = 0; 569 num_scr = 0;
578 offset = TermWin.saveLines; 570 offset = saveLines;
579 571
580 for (i = prev_nrow; i--;) 572 for (i = prev_nrow; i--;)
581 { 573 SWAP_IT (ROW(i), swap_save[i], line_t);
582 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
583 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
584 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
585 }
586 574
587 SWAP_IT (screen.charset, swap.charset, int16_t); 575 SWAP_IT (screen.charset, swap.charset, int16_t);
588 SWAP_IT (screen.flags, swap.flags, int); 576 SWAP_IT (screen.flags, swap.flags, int);
589 screen.flags |= Screen_VisibleCursor; 577 screen.flags |= Screen_VisibleCursor;
590 swap.flags |= Screen_VisibleCursor; 578 swap.flags |= Screen_VisibleCursor;
… …
608 596
609 screen.cur.col = 0; 597 screen.cur.col = 0;
610 598
611 if (screen.cur.row == screen.bscroll) 599 if (screen.cur.row == screen.bscroll)
612 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 600 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
613 else if (screen.cur.row < TermWin.nrow - 1) 601 else if (screen.cur.row < nrow - 1)
614 screen.cur.row++; 602 screen.cur.row++;
615} 603}
616 604
617/* ------------------------------------------------------------------------- */ 605/* ------------------------------------------------------------------------- */
618/* 606/*
… …
654 */ 642 */
655int 643int
656rxvt_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)
657{ 645{
658 int i, j; 646 int i, j;
659 long nscrolled;
660 647
661 if (count == 0 || (row1 > row2)) 648 if (count == 0 || (row1 > row2))
662 return 0; 649 return 0;
663 650
664 want_refresh = 1; 651 want_refresh = 1;
665 652
666 if (row1 == 0 && count > 0 653 if (row1 == 0 && count > 0
667 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 654 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
668 { 655 {
669 nscrolled = (long)TermWin.nscrolled + (long)count; 656 nsaved = min (nsaved + count, saveLines);
657 term_start = (term_start + count) % total_rows;
670 658
671 if (nscrolled > (long)TermWin.saveLines)
672 TermWin.nscrolled = TermWin.saveLines;
673 else
674 TermWin.nscrolled = (unsigned int)nscrolled;
675
676 if ((options & Opt_scrollWithBuffer)
677 && TermWin.view_start != 0
678 && TermWin.view_start != TermWin.saveLines)
679 scr_page (UP, count);
680 }
681 else if (!spec)
682 row1 += TermWin.saveLines;
683
684 row2 += TermWin.saveLines;
685
686 if (selection.op && current_screen == selection.screen) 659 if (selection.op && current_screen == selection.screen)
687 {
688 i = selection.beg.row + TermWin.saveLines;
689 j = selection.end.row + TermWin.saveLines;
690 if ((i < row1 && j > row1)
691 || (i < row2 && j > row2)
692 || (i - count < row1 && i >= row1)
693 || (i - count > row2 && i <= row2)
694 || (j - count < row1 && j >= row1)
695 || (j - count > row2 && j <= row2))
696 {
697 CLEAR_ALL_SELECTION ();
698 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
699 } 660 {
700 else if (j >= row1 && j <= row2)
701 {
702 /* move selected region too */
703 selection.beg.row -= count; 661 selection.beg.row -= count;
704 selection.end.row -= count; 662 selection.end.row -= count;
705 selection.mark.row -= count; 663 selection.mark.row -= count;
706 } 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
707 } 675 {
676 if (!spec)
677 row1 += saveLines;
708 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
709 selection_check (0); /* _after_ TermWin.nscrolled update */ 705 selection_check (0); /* _after_ nsaved update */
710 706
711 num_scr += count; 707 num_scr += count;
712 j = count; 708 j = count;
713 709
714 if (count < 0) 710 if (count < 0)
715 count = -count; 711 count = -count;
716 712
717 i = row2 - row1 + 1; 713 i = row2 - row1 + 1;
718 MIN_IT (count, i); 714 MIN_IT (count, i);
719 715
720 if (j > 0) 716 if (j > 0)
721 { 717 {
722 /* scroll up */ 718 /* scroll up */
723 719
724 /* Copy lines that will get clobbered by the rotation */ 720 /* Copy lines that will get clobbered by the rotation */
725 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 721 memcpy (buf, save + row1, count * sizeof (line_t));
726 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
727 722
728 /* Rotate lines */ 723 /* Rotate lines */
729 i = row2 - row1 - count + 1; 724 i = row2 - row1 - count + 1;
730 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 725 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
731 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
732 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
733 726
734 j = row2 - count + 1, i = count; 727 j = row2 - count + 1, i = count;
735 } 728 }
736 else /* if (j < 0) */ 729 else /* if (j < 0) */
737 { 730 {
738 /* scroll down */ 731 /* scroll down */
739 732
740 /* Copy lines that will get clobbered by the rotation */ 733 /* Copy lines that will get clobbered by the rotation */
741 for (i = 0, j = row2; i < count; i++, j--) 734 for (i = 0, j = row2; i < count; i++, j--)
742 { 735 buf[i] = save[j];
743 buf_text[i] = screen.text[j];
744 buf_rend[i] = screen.rend[j];
745 }
746 736
747 /* Rotate lines */ 737 /* Rotate lines */
748 for (j = row2, i = j - count; i >= row1; i--, j--) 738 for (j = row2, i = j - count; i >= row1; i--, j--)
749 { 739 save[j] = save[i];
750 screen.tlen[j] = screen.tlen[i];
751 screen.text[j] = screen.text[i];
752 screen.rend[j] = screen.rend[i];
753 }
754 740
755 j = row1, i = count; 741 j = row1, i = count;
756 count = -count; 742 count = -count;
757 } 743 }
758 744
759 /* Resurrect lines */ 745 /* Resurrect lines */
760 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 746 memcpy (save + j, buf, i * sizeof (line_t));
761 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 747
762 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
763 if (!spec) /* line length may not equal TermWin.ncol */ 748 if (!spec) /* line length may not equal ncol */
764 for (; i--; j++) 749 for (; i--; j++)
765 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); 750 scr_blank_screen_mem (save[j], rstyle);
751 }
766 752
767 return count; 753 return count;
768} 754}
769 755
770/* ------------------------------------------------------------------------- */ 756/* ------------------------------------------------------------------------- */
… …
778 return; 764 return;
779 765
780 unsigned char checksel; 766 unsigned char checksel;
781 unicode_t c; 767 unicode_t c;
782 int row, last_col; 768 int row, last_col;
783 text_t *stp;
784 rend_t *srp;
785 const unicode_t *strend = str + len; 769 const unicode_t *strend = str + len;
786 770
787 want_refresh = 1; 771 want_refresh = 1;
788 ZERO_SCROLLBACK (); 772 ZERO_SCROLLBACK ();
789 last_col = TermWin.ncol; 773 last_col = ncol;
790 774
791 if (nlines > 0) 775 if (nlines > 0)
792 { 776 {
793 nlines += screen.cur.row - screen.bscroll; 777 nlines += screen.cur.row - screen.bscroll;
794 if ((nlines > 0) 778 if ((nlines > 0)
795 && (screen.tscroll == 0) 779 && (screen.tscroll == 0)
796 && (screen.bscroll == (TermWin.nrow - 1))) 780 && (screen.bscroll == (nrow - 1)))
797 { 781 {
798 /* _at least_ this many lines need to be scrolled */ 782 /* _at least_ this many lines need to be scrolled */
799 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 783 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
800 screen.cur.row -= nlines; 784 screen.cur.row -= nlines;
801 } 785 }
802 } 786 }
803 787
804#ifdef DEBUG_STRICT 788#ifdef DEBUG_STRICT
805 assert (screen.cur.col < last_col); 789 assert (screen.cur.col < last_col);
806 assert ((screen.cur.row < TermWin.nrow) 790 assert ((screen.cur.row < nrow)
807 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 791 && (screen.cur.row >= - (int32_t)nsaved));
808#else /* drive with your eyes closed */ 792#else /* drive with your eyes closed */
809 MIN_IT (screen.cur.col, last_col - 1); 793 MIN_IT (screen.cur.col, last_col - 1);
810 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 794 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
811 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 795 MAX_IT (screen.cur.row, - (int32_t)nsaved);
812#endif 796#endif
813 row = screen.cur.row + TermWin.saveLines; 797 row = screen.cur.row;
814 798
815 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 799 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816 800
817 stp = screen.text[row]; 801 line_t *line = &ROW(row);
818 srp = screen.rend[row];
819 802
820 while (str < strend) 803 while (str < strend)
821 { 804 {
822 c = *str++; 805 c = *str++;
823 806
824 if (c < 0x20) 807 if (c < 0x20)
825 if (c == C0_LF) 808 if (c == C0_LF)
826 { 809 {
827 if (screen.tlen[row] != -1) /* XXX: think about this */ 810 if (!line->is_longer ()) /* XXX: think about this */
828 MAX_IT (screen.tlen[row], screen.cur.col); 811 MAX_IT (line->l, screen.cur.col);
829 812
830 screen.flags &= ~Screen_WrapNext; 813 screen.flags &= ~Screen_WrapNext;
831 814
832 if (screen.cur.row == screen.bscroll) 815 if (screen.cur.row == screen.bscroll)
833 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 816 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
834 else if (screen.cur.row < (TermWin.nrow - 1)) 817 else if (screen.cur.row < (nrow - 1))
835 row = (++screen.cur.row) + TermWin.saveLines; 818 row = ++screen.cur.row;
836 819
837 stp = screen.text[row]; /* _must_ refresh */ 820 line = &ROW(row); /* _must_ refresh */
838 srp = screen.rend[row]; /* _must_ refresh */
839 continue; 821 continue;
840 } 822 }
841 else if (c == C0_CR) 823 else if (c == C0_CR)
842 { 824 {
843 if (screen.tlen[row] != -1) /* XXX: think about this */ 825 if (!line->is_longer ()) /* XXX: think about this */
844 MAX_IT (screen.tlen[row], screen.cur.col); 826 MAX_IT (line->l, screen.cur.col);
845 827
846 screen.flags &= ~Screen_WrapNext; 828 screen.flags &= ~Screen_WrapNext;
847 screen.cur.col = 0; 829 screen.cur.col = 0;
848 continue; 830 continue;
849 } 831 }
… …
866 CLEAR_SELECTION (); 848 CLEAR_SELECTION ();
867 } 849 }
868 850
869 if (screen.flags & Screen_WrapNext) 851 if (screen.flags & Screen_WrapNext)
870 { 852 {
871 screen.tlen[row] = -1; 853 line->set_is_longer ();
872 854
873 scr_do_wrap (); 855 scr_do_wrap ();
874 856
875 row = screen.cur.row + TermWin.saveLines; 857 row = screen.cur.row;
876 stp = screen.text[row]; /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
877 srp = screen.rend[row]; /* _must_ refresh */
878 } 859 }
879 860
880 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
881 if (IN_RANGE (c, 0xd800, 0xdfff)) 862 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
882 c = 0xfffd; 863 c = 0xfffd;
883 864
884 // 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
885 // do wcwidth before further replacements, as wcwidth might return -1 866 // do wcwidth before further replacements, as wcwidth might return -1
886 // 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
… …
924 c = 0xfffd; 905 c = 0xfffd;
925# endif 906# endif
926#endif 907#endif
927 908
928 // nuke the character at this position, if required 909 // nuke the character at this position, if required
929 if (stp[screen.cur.col] == NOCHAR 910 if (line->t[screen.cur.col] == NOCHAR
930 || (screen.cur.col < TermWin.ncol - 1 911 || (screen.cur.col < ncol - 1
931 && stp[screen.cur.col + 1] == NOCHAR)) 912 && line->t[screen.cur.col + 1] == NOCHAR))
932 { 913 {
933 int col = screen.cur.col; 914 int col = screen.cur.col;
934 915
935 // find begin 916 // find begin
936 while (col > 0 && stp[col] == NOCHAR) 917 while (col > 0 && line->t[col] == NOCHAR)
937 col--; 918 col--;
938 919
939 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 (' '));
940 921
941 // found begin, nuke 922 // found begin, nuke
942 do { 923 do {
943 stp[col] = ' '; 924 line->t[col] = ' ';
944 srp[col] = rend; 925 line->r[col] = rend;
945 col++; 926 col++;
946 } while (col < TermWin.ncol && stp[col] == NOCHAR); 927 } while (col < ncol && line->t[col] == NOCHAR);
947 } 928 }
948 929
949 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 930 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
950 931
951 // if the character doesn't fit into the remaining columns... 932 // if the character doesn't fit into the remaining columns...
… …
957 --str; 938 --str;
958 } 939 }
959 940
960 do 941 do
961 { 942 {
962 stp[screen.cur.col] = c; 943 line->t[screen.cur.col] = c;
963 srp[screen.cur.col] = rend; 944 line->r[screen.cur.col] = rend;
964 945
965 if (screen.cur.col < last_col - 1) 946 if (screen.cur.col < last_col - 1)
966 screen.cur.col++; 947 screen.cur.col++;
967 else 948 else
968 { 949 {
969 screen.tlen[row] = last_col; 950 line->l = last_col;
970 if (screen.flags & Screen_Autowrap) 951 if (screen.flags & Screen_Autowrap)
971 screen.flags |= Screen_WrapNext; 952 screen.flags |= Screen_WrapNext;
972 break; 953 break;
973 } 954 }
974 955
… …
976 } 957 }
977 while (--width > 0); 958 while (--width > 0);
978 959
979 // pad with spaces when overwriting wide character with smaller one 960 // pad with spaces when overwriting wide character with smaller one
980 if (!width) 961 if (!width)
981 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++)
982 { 963 {
983 stp[c] = ' '; 964 line->t[c] = ' ';
984 srp[c] = rend; 965 line->r[c] = rend;
985 } 966 }
986 } 967 }
987 else // width == 0 968 else // width == 0
988 { 969 {
989#if ENABLE_COMBINING 970#if ENABLE_COMBINING
… …
994 text_t *tp; 975 text_t *tp;
995 rend_t *rp; 976 rend_t *rp;
996 977
997 if (screen.cur.col > 0) 978 if (screen.cur.col > 0)
998 { 979 {
999 tp = stp + screen.cur.col - 1; 980 tp = line->t + screen.cur.col - 1;
1000 rp = srp + screen.cur.col - 1; 981 rp = line->r + screen.cur.col - 1;
1001 982
1002 while (*tp == NOCHAR && tp > stp) 983 while (*tp == NOCHAR && tp > line->t)
1003 tp--, rp--; 984 tp--, rp--;
1004 } 985 }
1005 else if (screen.cur.row > 0 986 else if (screen.cur.row > 0
1006 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 987 && ROW(screen.cur.row - 1).is_longer ())
1007 { 988 {
1008 int line = screen.cur.row - 1 + TermWin.saveLines; 989 line_t *line = &ROW(screen.cur.row - 1);
1009 990
1010 tp = screen.text[line] + last_col - 1; 991 tp = line->t + last_col - 1;
1011 rp = screen.rend[line] + last_col - 1; 992 rp = line->r + last_col - 1;
1012 993
1013 while (*tp == NOCHAR && tp > screen.text[line]) 994 while (*tp == NOCHAR && tp > line->t)
1014 tp--, rp--; 995 tp--, rp--;
1015 } 996 }
1016 else 997 else
1017 continue; 998 continue;
1018 999
… …
1025 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 1006 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1026#endif 1007#endif
1027 } 1008 }
1028 } 1009 }
1029 1010
1030 if (screen.tlen[row] != -1) /* XXX: think about this */ 1011 if (!line->is_longer ()) /* XXX: think about this */
1031 MAX_IT (screen.tlen[row], screen.cur.col); 1012 MAX_IT (line->l, screen.cur.col);
1032 1013
1033#ifdef DEBUG_STRICT 1014#ifdef DEBUG_STRICT
1034 assert (screen.cur.row >= 0); 1015 assert (screen.cur.row >= 0);
1035#else /* drive with your eyes closed */ 1016#else /* drive with your eyes closed */
1036 MAX_IT (screen.cur.row, 0); 1017 MAX_IT (screen.cur.row, 0);
… …
1050 if (screen.cur.col == 0) 1031 if (screen.cur.col == 0)
1051 { 1032 {
1052 if (screen.cur.row > 0) 1033 if (screen.cur.row > 0)
1053 { 1034 {
1054#ifdef TERMCAP_HAS_BW 1035#ifdef TERMCAP_HAS_BW
1055 screen.cur.col = TermWin.ncol - 1; 1036 screen.cur.col = ncol - 1;
1056 screen.cur.row--; 1037 screen.cur.row--;
1057 return; 1038 return;
1058#endif 1039#endif
1059 } 1040 }
1060 } 1041 }
… …
1080 1061
1081 if (count == 0) 1062 if (count == 0)
1082 return; 1063 return;
1083 else if (count > 0) 1064 else if (count > 0)
1084 { 1065 {
1085 int row = TermWin.saveLines + screen.cur.row; 1066 int row = screen.cur.row;
1086 text_t *tp = screen.text[row]; 1067
1087 rend_t *rp = screen.rend[row]; 1068 line_t &l = ROW(row);
1088 rend_t base_rend = rp[i]; 1069 rend_t base_rend = l.r[i];
1089 ht &= tp[i] == ' '; 1070 ht &= l.t[i] == ' ';
1090 1071
1091 for (; ++i < TermWin.ncol; ) 1072 for (; ++i < ncol; )
1092 if (tabs[i]) 1073 if (tabs[i])
1093 { 1074 {
1094 x = i; 1075 x = i;
1095 if (!--count) 1076 if (!--count)
1096 break; 1077 break;
1097 } 1078 }
1098 else 1079 else
1099 ht &= tp[i] == ' ' 1080 ht &= l.t[i] == ' '
1100 && RS_SAME (rp[i], base_rend); 1081 && RS_SAME (l.r[i], base_rend);
1101 1082
1102 if (count) 1083 if (count)
1103 x = TermWin.ncol - 1; 1084 x = ncol - 1;
1104 1085
1105 // store horizontal tab commands as characters inside the text 1086 // store horizontal tab commands as characters inside the text
1106 // buffer so they can be selected and pasted. 1087 // buffer so they can be selected and pasted.
1107 if (ht && options & Opt_pastableTabs) 1088 if (ht && options & Opt_pastableTabs)
1108 { 1089 {
1109 base_rend = SET_FONT (base_rend, 0); 1090 base_rend = SET_FONT (base_rend, 0);
1110 1091
1111 if (screen.tlen[row] != -1) /* XXX: think about this */ 1092 if (!l.is_longer ()) /* XXX: think about this */
1112 MAX_IT (screen.tlen[row], x); 1093 MAX_IT (l.l, x);
1113 1094
1114 i = screen.cur.col; 1095 i = screen.cur.col;
1115 1096
1116 tp[i] = '\t'; 1097 l.t[i] = '\t';
1117 rp[i] = base_rend; 1098 l.r[i] = base_rend;
1118 1099
1119 while (++i < x) 1100 while (++i < x)
1120 { 1101 {
1121 tp[i] = NOCHAR; 1102 l.t[i] = NOCHAR;
1122 rp[i] = base_rend; 1103 l.r[i] = base_rend;
1123 } 1104 }
1124 } 1105 }
1125 } 1106 }
1126 else /* if (count < 0) */ 1107 else /* if (count < 0) */
1127 { 1108 {
… …
1153rxvt_term::scr_backindex () 1134rxvt_term::scr_backindex ()
1154{ 1135{
1155 if (screen.cur.col > 0) 1136 if (screen.cur.col > 0)
1156 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1157 else 1138 else
1158 {
1159 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1160 return; /* um, yeah? */
1161
1162 scr_insdel_chars (1, INSERT); 1139 scr_insdel_chars (1, INSERT);
1163 }
1164} 1140}
1165#endif 1141#endif
1166/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1167/* 1143/*
1168 * Process DEC Forward Index 1144 * Process DEC Forward Index
… …
1174void 1150void
1175rxvt_term::scr_forwardindex () 1151rxvt_term::scr_forwardindex ()
1176{ 1152{
1177 int row; 1153 int row;
1178 1154
1179 if (screen.cur.col < TermWin.ncol - 1) 1155 if (screen.cur.col < ncol - 1)
1180 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1156 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1181 else 1157 else
1182 { 1158 {
1183 row = screen.cur.row + TermWin.saveLines; 1159 row = screen.cur.row;
1184 1160
1185 if (screen.tlen[row] == 0) 1161 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1186 return; /* um, yeah? */ 1162 ROW(row).l = ncol;
1187 else if (screen.tlen[row] == -1)
1188 screen.tlen[row] = TermWin.ncol;
1189 1163
1190 scr_gotorc (0, 0, R_RELATIVE); 1164 scr_gotorc (0, 0, R_RELATIVE);
1191 scr_insdel_chars (1, DELETE); 1165 scr_insdel_chars (1, DELETE);
1192 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1166 scr_gotorc (0, ncol - 1, R_RELATIVE);
1193 } 1167 }
1194} 1168}
1195#endif 1169#endif
1196 1170
1197/* ------------------------------------------------------------------------- */ 1171/* ------------------------------------------------------------------------- */
… …
1204 want_refresh = 1; 1178 want_refresh = 1;
1205 ZERO_SCROLLBACK (); 1179 ZERO_SCROLLBACK ();
1206 1180
1207 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1181 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1208 MAX_IT (screen.cur.col, 0); 1182 MAX_IT (screen.cur.col, 0);
1209 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1183 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1210 1184
1211 screen.flags &= ~Screen_WrapNext; 1185 screen.flags &= ~Screen_WrapNext;
1212 1186
1213 if (relative & R_RELATIVE) 1187 if (relative & R_RELATIVE)
1214 { 1188 {
… …
1239 else 1213 else
1240 screen.cur.row = row; 1214 screen.cur.row = row;
1241 } 1215 }
1242 1216
1243 MAX_IT (screen.cur.row, 0); 1217 MAX_IT (screen.cur.row, 0);
1244 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1218 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1245} 1219}
1246 1220
1247/* ------------------------------------------------------------------------- */ 1221/* ------------------------------------------------------------------------- */
1248/* 1222/*
1249 * direction should be UP or DN 1223 * direction should be UP or DN
… …
1265 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1239 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1266 else 1240 else
1267 screen.cur.row += dirn; 1241 screen.cur.row += dirn;
1268 1242
1269 MAX_IT (screen.cur.row, 0); 1243 MAX_IT (screen.cur.row, 0);
1270 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1244 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1271 selection_check (0); 1245 selection_check (0);
1272} 1246}
1273 1247
1274/* ------------------------------------------------------------------------- */ 1248/* ------------------------------------------------------------------------- */
1275/* 1249/*
… …
1286 want_refresh = 1; 1260 want_refresh = 1;
1287 ZERO_SCROLLBACK (); 1261 ZERO_SCROLLBACK ();
1288 1262
1289 selection_check (1); 1263 selection_check (1);
1290 1264
1291 row = TermWin.saveLines + screen.cur.row; 1265 row = screen.cur.row;
1266
1292 switch (mode) 1267 switch (mode)
1293 { 1268 {
1294 case 0: /* erase to end of line */ 1269 case 0: /* erase to end of line */
1295 col = screen.cur.col; 1270 col = screen.cur.col;
1296 num = TermWin.ncol - col; 1271 num = ncol - col;
1297 MIN_IT (screen.tlen[row], (int16_t)col); 1272 MIN_IT (ROW(row).l, (int16_t)col);
1298 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1273 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1299 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1274 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1300 CLEAR_SELECTION (); 1275 CLEAR_SELECTION ();
1301 break; 1276 break;
1302 case 1: /* erase to beginning of line */ 1277 case 1: /* erase to beginning of line */
… …
1306 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1281 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1307 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1308 break; 1283 break;
1309 case 2: /* erase whole line */ 1284 case 2: /* erase whole line */
1310 col = 0; 1285 col = 0;
1311 num = TermWin.ncol; 1286 num = ncol;
1312 screen.tlen[row] = 0; 1287 ROW(row).l = 0;
1313 if (selection.beg.row <= screen.cur.row 1288 if (selection.beg.row <= screen.cur.row
1314 && selection.end.row >= screen.cur.row) 1289 && selection.end.row >= screen.cur.row)
1315 CLEAR_SELECTION (); 1290 CLEAR_SELECTION ();
1316 break; 1291 break;
1317 default: 1292 default:
1318 return; 1293 return;
1319 } 1294 }
1320 1295
1321 if (screen.text[row]) 1296 scr_blank_line (ROW(row), col, num, rstyle);
1322 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1323 else
1324 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1325} 1297}
1326 1298
1327/* ------------------------------------------------------------------------- */ 1299/* ------------------------------------------------------------------------- */
1328/* 1300/*
1329 * Erase part of whole of the screen 1301 * Erase part of whole of the screen
… …
1340 XGCValues gcvalue; 1312 XGCValues gcvalue;
1341 1313
1342 want_refresh = 1; 1314 want_refresh = 1;
1343 ZERO_SCROLLBACK (); 1315 ZERO_SCROLLBACK ();
1344 1316
1345 row_offset = (int32_t)TermWin.saveLines; 1317 row_offset = (int32_t)saveLines;
1346 1318
1347 switch (mode) 1319 switch (mode)
1348 { 1320 {
1349 case 0: /* erase to end of screen */ 1321 case 0: /* erase to end of screen */
1350 selection_check (1); 1322 selection_check (1);
1351 scr_erase_line (0); 1323 scr_erase_line (0);
1352 row = screen.cur.row + 1; /* possible OOB */ 1324 row = screen.cur.row + 1; /* possible OOB */
1353 num = TermWin.nrow - row; 1325 num = nrow - row;
1354 break; 1326 break;
1355 case 1: /* erase to beginning of screen */ 1327 case 1: /* erase to beginning of screen */
1356 selection_check (3); 1328 selection_check (3);
1357 scr_erase_line (1); 1329 scr_erase_line (1);
1358 row = 0; 1330 row = 0;
1359 num = screen.cur.row; 1331 num = screen.cur.row;
1360 break; 1332 break;
1361 case 2: /* erase whole screen */ 1333 case 2: /* erase whole screen */
1362 selection_check (3); 1334 selection_check (3);
1363 row = 0; 1335 row = 0;
1364 num = TermWin.nrow; 1336 num = nrow;
1365 break; 1337 break;
1366 default: 1338 default:
1367 return; 1339 return;
1368 } 1340 }
1369 1341
… …
1371 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1343 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1372 || (selection.end.row >= row 1344 || (selection.end.row >= row
1373 && selection.end.row <= row + num))) 1345 && selection.end.row <= row + num)))
1374 CLEAR_SELECTION (); 1346 CLEAR_SELECTION ();
1375 1347
1376 if (row >= TermWin.nrow) /* Out Of Bounds */ 1348 if (row >= nrow) /* Out Of Bounds */
1377 return; 1349 return;
1378 1350
1379 MIN_IT (num, (TermWin.nrow - row)); 1351 MIN_IT (num, (nrow - row));
1380 1352
1381 if (rstyle & (RS_RVid | RS_Uline)) 1353 if (rstyle & (RS_RVid | RS_Uline))
1382 ren = (rend_t) ~RS_None; 1354 ren = (rend_t) ~RS_None;
1383 else if (GET_BASEBG (rstyle) == Color_bg) 1355 else if (GET_BASEBG (rstyle) == Color_bg)
1384 { 1356 {
… …
1387 } 1359 }
1388 else 1360 else
1389 { 1361 {
1390 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1391 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1363 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1392 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1364 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1393 ERASE_ROWS (row, num); 1365 ERASE_ROWS (row, num);
1394 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1395 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1367 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1396 } 1368 }
1397 1369
1398 for (; num--; row++) 1370 for (; num--; row++)
1399 { 1371 {
1400 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1372 scr_blank_screen_mem (save[row + row_offset], rstyle);
1401 screen.tlen[row + row_offset] = 0; 1373 save[row + row_offset].l = 0;
1402 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1374 scr_blank_line (drawn[row], 0, ncol, ren);
1403 } 1375 }
1404} 1376}
1405 1377
1406#if ENABLE_FRILLS 1378#if ENABLE_FRILLS
1407void 1379void
1408rxvt_term::scr_erase_savelines () 1380rxvt_term::scr_erase_savelines ()
1409{ 1381{
1410 want_refresh = 1; 1382 want_refresh = 1;
1411 ZERO_SCROLLBACK (); 1383 ZERO_SCROLLBACK ();
1412 1384
1413 TermWin.nscrolled = 0; 1385 nsaved = 0;
1414} 1386}
1415#endif 1387#endif
1416 1388
1417/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1418/* 1390/*
… …
1430 1402
1431 num_scr_allow = 0; 1403 num_scr_allow = 0;
1432 selection_check (3); 1404 selection_check (3);
1433 1405
1434 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1406 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1435 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1407 for (k = saveLines, i = nrow; i--; k++)
1436 { 1408 {
1437 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1409 line_t &line = save[k];
1410
1438 fill_text (screen.text[k], 'E', TermWin.ncol); 1411 fill_text (line.t, 'E', ncol);
1412
1439 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1413 for (r1 = line.r, j = ncol; j--; )
1440 *r1++ = fs; 1414 *r1++ = fs;
1415
1416 line.l = ncol; /* make the `E's selectable */
1441 } 1417 }
1442} 1418}
1443 1419
1444/* ------------------------------------------------------------------------- */ 1420/* ------------------------------------------------------------------------- */
1445/* 1421/*
… …
1478void 1454void
1479rxvt_term::scr_insdel_chars (int count, int insdel) 1455rxvt_term::scr_insdel_chars (int count, int insdel)
1480{ 1456{
1481 int col, row; 1457 int col, row;
1482 rend_t tr; 1458 rend_t tr;
1483 text_t *stp;
1484 rend_t *srp;
1485 int16_t *slp;
1486 1459
1487 want_refresh = 1; 1460 want_refresh = 1;
1488 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1489 1462
1490 if (count <= 0) 1463 if (count <= 0)
1491 return; 1464 return;
1492 1465
1493 scr_do_wrap (); 1466 scr_do_wrap ();
1494 1467
1495 selection_check (1); 1468 selection_check (1);
1496 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1469 MIN_IT (count, (ncol - screen.cur.col));
1497 1470
1498 row = screen.cur.row + TermWin.saveLines; 1471 row = screen.cur.row + saveLines;
1499 1472
1500 stp = screen.text[row]; 1473 line_t *line = save + row;
1501 srp = screen.rend[row];
1502 slp = &screen.tlen[row];
1503 1474
1504 switch (insdel) 1475 switch (insdel)
1505 { 1476 {
1506 case INSERT: 1477 case INSERT:
1507 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1478 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1508 { 1479 {
1509 stp[col] = stp[col - count]; 1480 line->t[col] = line->t[col - count];
1510 srp[col] = srp[col - count]; 1481 line->r[col] = line->r[col - count];
1511 } 1482 }
1512 1483
1513 if (*slp != -1) 1484 if (!line->is_longer ())
1514 { 1485 {
1515 *slp += count; 1486 line->l += count;
1516 MIN_IT (*slp, TermWin.ncol); 1487 MIN_IT (line->l, ncol);
1517 } 1488 }
1518 1489
1519 if (selection.op && current_screen == selection.screen 1490 if (selection.op && current_screen == selection.screen
1520 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1491 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1521 { 1492 {
1522 if (selection.end.row != screen.cur.row 1493 if (selection.end.row != screen.cur.row
1523 || (selection.end.col + count >= TermWin.ncol)) 1494 || (selection.end.col + count >= ncol))
1524 CLEAR_SELECTION (); 1495 CLEAR_SELECTION ();
1525 else 1496 else
1526 { /* shift selection */ 1497 { /* shift selection */
1527 selection.beg.col += count; 1498 selection.beg.col += count;
1528 selection.mark.col += count; /* XXX: yes? */ 1499 selection.mark.col += count; /* XXX: yes? */
1529 selection.end.col += count; 1500 selection.end.col += count;
1530 } 1501 }
1531 } 1502 }
1532 1503
1533 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1504 scr_blank_line (save[row], screen.cur.col, count, rstyle);
1534 (unsigned int)count, rstyle);
1535 break; 1505 break;
1536 1506
1537 case ERASE: 1507 case ERASE:
1538 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1508 screen.cur.col += count; /* don't worry if > ncol */
1539 selection_check (1); 1509 selection_check (1);
1540 screen.cur.col -= count; 1510 screen.cur.col -= count;
1541 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1511 scr_blank_line (save[row], screen.cur.col, count, rstyle);
1542 (unsigned int)count, rstyle);
1543 break; 1512 break;
1544 1513
1545 case DELETE: 1514 case DELETE:
1546 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1515 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1547 1516
1548 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1517 for (col = screen.cur.col; (col + count) < ncol; col++)
1549 { 1518 {
1550 stp[col] = stp[col + count]; 1519 line->t[col] = line->t[col + count];
1551 srp[col] = srp[col + count]; 1520 line->r[col] = line->r[col + count];
1552 } 1521 }
1553 1522
1554 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1523 scr_blank_line (*line, ncol - count, count, tr);
1555 (unsigned int)count, tr);
1556 1524
1557 if (*slp == -1) /* break line continuation */ 1525 if (line->is_longer ()) /* break line continuation */
1558 *slp = TermWin.ncol; 1526 line->l = ncol;
1559 1527
1560 *slp -= count; 1528 line->l -= count;
1561 MAX_IT (*slp, 0); 1529 MAX_IT (line->l, 0);
1562 1530
1563 if (selection.op && current_screen == selection.screen 1531 if (selection.op && current_screen == selection.screen
1564 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1532 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1565 { 1533 {
1566 if (selection.end.row != screen.cur.row 1534 if (selection.end.row != screen.cur.row
1567 || (screen.cur.col >= selection.beg.col - count) 1535 || (screen.cur.col >= selection.beg.col - count)
1568 || selection.end.col >= TermWin.ncol) 1536 || selection.end.col >= ncol)
1569 CLEAR_SELECTION (); 1537 CLEAR_SELECTION ();
1570 else 1538 else
1571 { 1539 {
1572 /* shift selection */ 1540 /* shift selection */
1573 selection.beg.col -= count; 1541 selection.beg.col -= count;
… …
1587 */ 1555 */
1588void 1556void
1589rxvt_term::scr_scroll_region (int top, int bot) 1557rxvt_term::scr_scroll_region (int top, int bot)
1590{ 1558{
1591 MAX_IT (top, 0); 1559 MAX_IT (top, 0);
1592 MIN_IT (bot, (int)TermWin.nrow - 1); 1560 MIN_IT (bot, (int)nrow - 1);
1593 1561
1594 if (top > bot) 1562 if (top > bot)
1595 return; 1563 return;
1596 1564
1597 screen.tscroll = top; 1565 screen.tscroll = top;
… …
1676 */ 1644 */
1677void 1645void
1678rxvt_term::scr_set_tab (int mode) 1646rxvt_term::scr_set_tab (int mode)
1679{ 1647{
1680 if (mode < 0) 1648 if (mode < 0)
1681 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1649 memset (tabs, 0, ncol * sizeof (char));
1682 else if (screen.cur.col < TermWin.ncol) 1650 else if (screen.cur.col < ncol)
1683 tabs[screen.cur.col] = (mode ? 1 : 0); 1651 tabs[screen.cur.col] = (mode ? 1 : 0);
1684} 1652}
1685 1653
1686/* ------------------------------------------------------------------------- */ 1654/* ------------------------------------------------------------------------- */
1687/* 1655/*
… …
1702 if (bgPixmap.pixmap == None) 1670 if (bgPixmap.pixmap == None)
1703#endif 1671#endif
1704#if TRANSPARENT 1672#if TRANSPARENT
1705 if (! (options & Opt_transparent) || am_transparent == 0) 1673 if (! (options & Opt_transparent) || am_transparent == 0)
1706#endif 1674#endif
1707 XSetWindowBackground (display->display, TermWin.vt, 1675 XSetWindowBackground (display->display, vt,
1708 pix_colors[Color_bg]); 1676 pix_colors[Color_bg]);
1709 1677
1710 gcvalue.foreground = pix_colors[Color_fg]; 1678 gcvalue.foreground = pix_colors[Color_fg];
1711 gcvalue.background = pix_colors[Color_bg]; 1679 gcvalue.background = pix_colors[Color_bg];
1712 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1680 XChangeGC (display->display, gc, GCBackground | GCForeground,
1713 &gcvalue); 1681 &gcvalue);
1714 scr_clear (); 1682 scr_clear ();
1715 scr_touch (true); 1683 scr_touch (true);
1716 } 1684 }
1717} 1685}
… …
1798bool 1766bool
1799rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1767rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1800{ 1768{
1801 bool found = false; 1769 bool found = false;
1802 1770
1803 for (int i = 0; i < TermWin.nrow; i++) 1771 for (int i = 0; i < nrow; i++)
1804 { 1772 {
1805 int col = 0; 1773 int col = 0;
1806 rend_t *drp = drawn_rend [i]; 1774 rend_t *drp = drawn[i].r;
1807 1775
1808 for (; col < TermWin.ncol; col++, drp++) 1776 for (; col < ncol; col++, drp++)
1809 if ((*drp & mask) == value) 1777 if ((*drp & mask) == value)
1810 { 1778 {
1811 found = true; 1779 found = true;
1812 *drp = ~value; 1780 *drp = ~value;
1813 } 1781 }
… …
1824 PART_END, 1792 PART_END,
1825 RC_COUNT 1793 RC_COUNT
1826}; 1794};
1827 1795
1828void 1796void
1829rxvt_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)
1830{ 1798{
1831 int i; 1799 int i;
1832 row_col_t rc[RC_COUNT]; 1800 row_col_t rc[RC_COUNT];
1833 1801
1834 if (drawn_text == NULL) /* sanity check */ 1802 if (!drawn) /* sanity check */
1835 return; 1803 return;
1836 1804
1837#ifndef NO_SLOW_LINK_SUPPORT 1805#ifndef NO_SLOW_LINK_SUPPORT
1838 if (refresh_type == FAST_REFRESH && !display->is_local) 1806 if (refresh_type == FAST_REFRESH && !display->is_local)
1839 { 1807 {
1840 y = 0; 1808 y = 0;
1841 height = TermWin.height; 1809 eheight = height;
1842 } 1810 }
1843#endif 1811#endif
1844 1812
1845#ifdef DEBUG_STRICT 1813#ifdef DEBUG_STRICT
1846 x = max (x, 0); 1814 x = max (x, 0);
1847 x = min (x, (int)TermWin.width); 1815 x = min (x, (int)width);
1848 y = max (y, 0); 1816 y = max (y, 0);
1849 y = min (y, (int)TermWin.height); 1817 y = min (y, (int)height);
1850#endif 1818#endif
1851 1819
1852 /* round down */ 1820 /* round down */
1853 rc[PART_BEG].col = Pixel2Col (x); 1821 rc[PART_BEG].col = Pixel2Col (x);
1854 rc[PART_BEG].row = Pixel2Row (y); 1822 rc[PART_BEG].row = Pixel2Row (y);
1855 /* round up */ 1823 /* round up */
1856 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1824 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1857 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1825 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1858 1826
1859 /* sanity checks */ 1827 /* sanity checks */
1860 for (i = PART_BEG; i < RC_COUNT; i++) 1828 for (i = PART_BEG; i < RC_COUNT; i++)
1861 { 1829 {
1862 MIN_IT (rc[i].col, TermWin.ncol - 1); 1830 MIN_IT (rc[i].col, ncol - 1);
1863 MIN_IT (rc[i].row, TermWin.nrow - 1); 1831 MIN_IT (rc[i].row, nrow - 1);
1864 } 1832 }
1865 1833
1866 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++)
1867 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);
1868 1836
1869 if (refresh) 1837 if (refresh)
1870 scr_refresh (SLOW_REFRESH); 1838 scr_refresh (SLOW_REFRESH);
1871} 1839}
1872 1840
… …
1875 * Refresh the entire screen 1843 * Refresh the entire screen
1876 */ 1844 */
1877void 1845void
1878rxvt_term::scr_touch (bool refresh) 1846rxvt_term::scr_touch (bool refresh)
1879{ 1847{
1880 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1848 scr_expose (0, 0, width, height, refresh);
1881} 1849}
1882 1850
1883/* ------------------------------------------------------------------------- */ 1851/* ------------------------------------------------------------------------- */
1884/* 1852/*
1885 * 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
… …
1889rxvt_term::scr_move_to (int y, int len) 1857rxvt_term::scr_move_to (int y, int len)
1890{ 1858{
1891 long p = 0; 1859 long p = 0;
1892 unsigned int oldviewstart; 1860 unsigned int oldviewstart;
1893 1861
1894 oldviewstart = TermWin.view_start; 1862 oldviewstart = view_start;
1895 1863
1896 if (y < len) 1864 if (y < len)
1897 { 1865 {
1898 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1866 p = (nrow + nsaved) * (len - y) / len;
1899 p -= (long) (TermWin.nrow - 1); 1867 p -= (long) (nrow - 1);
1900 p = max (p, 0); 1868 p = max (p, 0);
1901 } 1869 }
1902 1870
1903 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1871 view_start = (unsigned int)min (p, nsaved);
1904 1872
1905 return scr_changeview (oldviewstart); 1873 return scr_changeview (oldviewstart);
1906} 1874}
1907 1875
1908/* ------------------------------------------------------------------------- */ 1876/* ------------------------------------------------------------------------- */
… …
1914rxvt_term::scr_page (enum page_dirn direction, int nlines) 1882rxvt_term::scr_page (enum page_dirn direction, int nlines)
1915{ 1883{
1916 int n; 1884 int n;
1917 unsigned int oldviewstart; 1885 unsigned int oldviewstart;
1918 1886
1919 oldviewstart = TermWin.view_start; 1887 oldviewstart = view_start;
1920 1888
1921 if (direction == UP) 1889 if (direction == UP)
1922 { 1890 {
1923 n = TermWin.view_start + nlines; 1891 n = view_start + nlines;
1924 TermWin.view_start = min (n, TermWin.nscrolled); 1892 view_start = min (n, nsaved);
1925 } 1893 }
1926 else 1894 else
1927 { 1895 {
1928 n = TermWin.view_start - nlines; 1896 n = view_start - nlines;
1929 TermWin.view_start = max (n, 0); 1897 view_start = max (n, 0);
1930 } 1898 }
1931 1899
1932 return scr_changeview (oldviewstart); 1900 return scr_changeview (oldviewstart);
1933} 1901}
1934 1902
1935int 1903int
1936rxvt_term::scr_changeview (unsigned int oldviewstart) 1904rxvt_term::scr_changeview (unsigned int oldviewstart)
1937{ 1905{
1938 if (TermWin.view_start != oldviewstart) 1906 if (view_start != oldviewstart)
1939 { 1907 {
1940 want_refresh = 1; 1908 want_refresh = 1;
1941 num_scr -= (TermWin.view_start - oldviewstart); 1909 num_scr -= (view_start - oldviewstart);
1942 } 1910 }
1943 1911
1944 return (int) (TermWin.view_start - oldviewstart); 1912 return (int) (view_start - oldviewstart);
1945} 1913}
1946 1914
1947/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1948void 1916void
1949rxvt_term::scr_bell () 1917rxvt_term::scr_bell ()
… …
1952 1920
1953# ifndef NO_MAPALERT 1921# ifndef NO_MAPALERT
1954# ifdef MAPALERT_OPTION 1922# ifdef MAPALERT_OPTION
1955 if (options & Opt_mapAlert) 1923 if (options & Opt_mapAlert)
1956# endif 1924# endif
1957 XMapWindow (display->display, TermWin.parent[0]); 1925 XMapWindow (display->display, parent[0]);
1958# endif 1926# endif
1959 1927
1960 if (options & Opt_visualBell) 1928 if (options & Opt_visualBell)
1961 { 1929 {
1962 scr_rvideo_mode (!rvideo); /* refresh also done */ 1930 scr_rvideo_mode (!rvideo); /* refresh also done */
… …
1979 FILE *fd; 1947 FILE *fd;
1980 1948
1981 if ((fd = popen_printer ()) == NULL) 1949 if ((fd = popen_printer ()) == NULL)
1982 return; 1950 return;
1983 1951
1984 nrows = TermWin.nrow; 1952 nrows = nrow;
1985 row_offset = TermWin.saveLines; 1953 row_offset = saveLines;
1986 1954
1987 if (!fullhist) 1955 if (!fullhist)
1988 row_offset -= TermWin.view_start; 1956 row_offset -= view_start;
1989 else 1957 else
1990 { 1958 {
1991 nrows += TermWin.nscrolled; 1959 nrows += nsaved;
1992 row_offset -= TermWin.nscrolled; 1960 row_offset -= nsaved;
1993 } 1961 }
1994 1962
1995 wctomb (0, 0); 1963 wctomb (0, 0);
1996 1964
1997 for (r1 = 0; r1 < nrows; r1++) 1965 for (r1 = 0; r1 < nrows; r1++)
1998 { 1966 {
1999 text_t *tp = screen.text[r1 + row_offset]; 1967 text_t *tp = save[r1 + row_offset].t;
2000 int len = screen.tlen[r1 + row_offset]; 1968 int len = save[r1 + row_offset].l;
2001 1969
2002 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1970 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
2003 { 1971 {
2004 char mb[MB_LEN_MAX]; 1972 char mb[MB_LEN_MAX];
2005 text_t t = *tp++; 1973 text_t t = *tp++;
2006 if (t == NOCHAR) 1974 if (t == NOCHAR)
2007 continue; 1975 continue;
… …
2044#endif 2012#endif
2045 rend_t *crp; // cursor rendition pointer 2013 rend_t *crp; // cursor rendition pointer
2046 2014
2047 want_refresh = 0; /* screen is current */ 2015 want_refresh = 0; /* screen is current */
2048 2016
2049 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2017 if (refresh_type == NO_REFRESH || !mapped)
2050 return; 2018 return;
2051 2019
2052 /* 2020 /*
2053 * A: set up vars 2021 * A: set up vars
2054 */ 2022 */
2055 must_clear = 0; 2023 must_clear = 0;
2056 refresh_count = 0; 2024 refresh_count = 0;
2057 2025
2058 row_offset = TermWin.saveLines - TermWin.view_start; 2026 row_offset = term_start - view_start;
2059 2027
2060#if XPM_BACKGROUND 2028#if XPM_BACKGROUND
2061 must_clear |= bgPixmap.pixmap != None; 2029 must_clear |= bgPixmap.pixmap != None;
2062#endif 2030#endif
2063#if TRANSPARENT 2031#if TRANSPARENT
… …
2086 2054
2087 if (showcursor) 2055 if (showcursor)
2088 { 2056 {
2089 int col = screen.cur.col; 2057 int col = screen.cur.col;
2090 2058
2091 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2059 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2092 col--; 2060 col--;
2093 2061
2094 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2062 crp = &ROW(screen.cur.row).r[col];
2095 2063
2096 if (showcursor && TermWin.focus) 2064 if (showcursor && focus)
2097 { 2065 {
2098 if (options & Opt_cursorUnderline) 2066 if (options & Opt_cursorUnderline)
2099 *crp ^= RS_Uline; 2067 *crp ^= RS_Uline;
2100 else 2068 else
2101 { 2069 {
… …
2128 2096
2129 /* make sure no outline cursor is left around */ 2097 /* make sure no outline cursor is left around */
2130 setoldcursor = 0; 2098 setoldcursor = 0;
2131 if (ocrow != -1) 2099 if (ocrow != -1)
2132 { 2100 {
2133 if (screen.cur.row + TermWin.view_start != ocrow 2101 if (screen.cur.row + view_start != ocrow
2134 || screen.cur.col != oldcursor.col) 2102 || screen.cur.col != oldcursor.col)
2135 { 2103 {
2136 if (ocrow < TermWin.nrow 2104 if (ocrow < nrow
2137 && oldcursor.col < TermWin.ncol) 2105 && oldcursor.col < ncol)
2138 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2106 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2139 2107
2140 if (TermWin.focus || !showcursor) 2108 if (focus || !showcursor)
2141 oldcursor.row = -1; 2109 oldcursor.row = -1;
2142 else 2110 else
2143 setoldcursor = 1; 2111 setoldcursor = 1;
2144 } 2112 }
2145 } 2113 }
2146 else if (!TermWin.focus) 2114 else if (!focus)
2147 setoldcursor = 1; 2115 setoldcursor = 1;
2148 2116
2149 if (setoldcursor) 2117 if (setoldcursor)
2150 { 2118 {
2151 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2119 if (screen.cur.row + view_start >= nrow)
2152 oldcursor.row = -1; 2120 oldcursor.row = -1;
2153 else 2121 else
2154 { 2122 {
2155 oldcursor.row = screen.cur.row + TermWin.view_start; 2123 oldcursor.row = screen.cur.row + view_start;
2156 oldcursor.col = screen.cur.col; 2124 oldcursor.col = screen.cur.col;
2157 } 2125 }
2158 } 2126 }
2159 } 2127 }
2160 2128
… …
2168 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2169 */ 2137 */
2170 i = num_scr; 2138 i = num_scr;
2171 if (!display->is_local 2139 if (!display->is_local
2172 && refresh_type == FAST_REFRESH && num_scr_allow && i 2140 && refresh_type == FAST_REFRESH && num_scr_allow && i
2173 && abs (i) < TermWin.nrow && !must_clear) 2141 && abs (i) < nrow && !must_clear)
2174 { 2142 {
2175 int16_t nits; 2143 int16_t nits;
2176 int j; 2144 int j;
2177 int len, wlen; 2145 int len, wlen;
2178 2146
2179 j = TermWin.nrow; 2147 j = nrow;
2180 wlen = len = -1; 2148 wlen = len = -1;
2181 row = i > 0 ? 0 : j - 1; 2149 row = i > 0 ? 0 : j - 1;
2182 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2150 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2183 { 2151 {
2184 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2152 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2185 { 2153 {
2186 text_t *stp = screen.text[row + row_offset]; 2154 line_t s = save[(row + row_offset) % nlines];
2187 rend_t *srp = screen.rend[row + row_offset];
2188 text_t *dtp = drawn_text[row]; 2155 line_t d = drawn[row];
2189 text_t *dtp2 = drawn_text[row + i]; 2156 line_t d2 = drawn[row + i];
2190 rend_t *drp = drawn_rend[row];
2191 rend_t *drp2 = drawn_rend[row + i];
2192 2157
2193 for (nits = 0, col = TermWin.ncol; col--; ) 2158 for (nits = 0, col = ncol; col--; )
2194 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2159 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2195 nits--; 2160 nits--;
2196 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])
2197 nits++; 2162 nits++;
2198 2163
2199 if (nits > 8) /* XXX: arbitrary choice */ 2164 if (nits > 8) /* XXX: arbitrary choice */
2200 { 2165 {
2201 for (col = TermWin.ncol; col--; ) 2166 for (col = ncol; col--; )
2202 { 2167 {
2203 *dtp++ = *dtp2++; 2168 *d.t++ = *d2.t++;
2204 *drp++ = *drp2++; 2169 *d.r++ = *d2.r++;
2205 } 2170 }
2206 2171
2207 if (len == -1) 2172 if (len == -1)
2208 len = row; 2173 len = row;
2209 2174
… …
2216 { 2181 {
2217 /* also comes here at end if needed because of >= above */ 2182 /* also comes here at end if needed because of >= above */
2218 if (wlen < len) 2183 if (wlen < len)
2219 SWAP_IT (wlen, len, int); 2184 SWAP_IT (wlen, len, int);
2220 2185
2221 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2186 XCopyArea (display->display, vt, vt,
2222 TermWin.gc, 0, Row2Pixel (len + i), 2187 gc, 0, Row2Pixel (len + i),
2223 (unsigned int)TermWin_TotalWidth (), 2188 (unsigned int)TermWin_TotalWidth (),
2224 (unsigned int)Height2Pixel (wlen - len + 1), 2189 (unsigned int)Height2Pixel (wlen - len + 1),
2225 0, Row2Pixel (len)); 2190 0, Row2Pixel (len));
2226 len = -1; 2191 len = -1;
2227 } 2192 }
… …
2230#endif 2195#endif
2231 2196
2232 /* 2197 /*
2233 * E: main pass across every character 2198 * E: main pass across every character
2234 */ 2199 */
2235 for (row = 0; row < TermWin.nrow; row++) 2200 for (row = 0; row < nrow; row++)
2236 { 2201 {
2237 text_t *stp = screen.text[row + row_offset]; 2202 text_t *stp = save[(row + row_offset) % total_rows].t;
2238 rend_t *srp = screen.rend[row + row_offset]; 2203 rend_t *srp = save[(row + row_offset) % total_rows].r;
2239 text_t *dtp = drawn_text[row]; 2204 text_t *dtp = drawn[row].t;
2240 rend_t *drp = drawn_rend[row]; 2205 rend_t *drp = drawn[row].r;
2241 2206
2242 /* 2207 /*
2243 * E2: OK, now the real pass 2208 * E2: OK, now the real pass
2244 */ 2209 */
2245 int ypixel = (int)Row2Pixel (row); 2210 int ypixel = (int)Row2Pixel (row);
2246 2211
2247 for (col = 0; col < TermWin.ncol; col++) 2212 for (col = 0; col < ncol; col++)
2248 { 2213 {
2249 /* compare new text with old - if exactly the same then continue */ 2214 /* compare new text with old - if exactly the same then continue */
2250 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2215 if (stp[col] == dtp[col] /* Must match characters to skip. */
2251 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2216 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2252 || (stp[col] == ' ' /* space w/ no background change */ 2217 || (stp[col] == ' ' /* space w/ no background change */
… …
2266 dtp[col] = stp[col]; 2231 dtp[col] = stp[col];
2267 drp[col] = rend; 2232 drp[col] = rend;
2268 2233
2269 int xpixel = Col2Pixel (col); 2234 int xpixel = Col2Pixel (col);
2270 2235
2271 for (i = 0; ++col < TermWin.ncol; ) 2236 for (i = 0; ++col < ncol; )
2272 { 2237 {
2273 if (stp[col] == NOCHAR) 2238 if (stp[col] == NOCHAR)
2274 { 2239 {
2275 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2276 drp[col] = rend; 2241 drp[col] = rend;
… …
2315 // 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
2316 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))
2317 { 2282 {
2318#if ENABLE_STYLES 2283#if ENABLE_STYLES
2319 // force redraw after "careful" characters to avoid pixel droppings 2284 // force redraw after "careful" characters to avoid pixel droppings
2320 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) 2285 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2321 drp[col + 1] = ~srp[col + 1]; 2286 drp[col + 1] = ~srp[col + 1];
2322 2287
2323 // include previous careful character(s) if possible, looks nicer (best effort...) 2288 // include previous careful character(s) if possible, looks nicer (best effort...)
2324 while (text > stp 2289 while (text > stp
2325 && srp[text - stp - 1] & RS_Careful 2290 && srp[text - stp - 1] & RS_Careful
2326 && RS_SAME (rend, srp[text - stp - 1])) 2291 && RS_SAME (rend, srp[text - stp - 1]))
2327 text--, count++, xpixel -= TermWin.fwidth; 2292 text--, count++, xpixel -= fwidth;
2328#endif 2293#endif
2329 2294
2330 bool invert = rend & RS_RVid; 2295 bool invert = rend & RS_RVid;
2331 2296
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2297#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2387 } 2352 }
2388 2353
2389 /* 2354 /*
2390 * Actually do the drawing of the string here 2355 * Actually do the drawing of the string here
2391 */ 2356 */
2392 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2357 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2393 2358
2394 if (back == fore) 2359 if (back == fore)
2395 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2360 font->clear_rect (*drawable, xpixel, ypixel,
2396 TermWin.fwidth * count, TermWin.fheight, 2361 fwidth * count, fheight,
2397 back); 2362 back);
2398 else if (back == Color_bg) 2363 else if (back == Color_bg)
2399 { 2364 {
2400 if (must_clear) 2365 if (must_clear)
2401 { 2366 {
2402 CLEAR_CHARS (xpixel, ypixel, count); 2367 CLEAR_CHARS (xpixel, ypixel, count);
2403 2368
2404 for (i = 0; i < count; i++) /* don't draw empty strings */ 2369 for (i = 0; i < count; i++) /* don't draw empty strings */
2405 if (text[i] != ' ') 2370 if (text[i] != ' ')
2406 { 2371 {
2407 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2408 break; 2373 break;
2409 } 2374 }
2410 } 2375 }
2411 else 2376 else
2412 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2377 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2413 } 2378 }
2414 else 2379 else
2415 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2416 2381
2417 if (rend & RS_Uline && font->descent > 1 && fore != back) 2382 if (rend & RS_Uline && font->descent > 1 && fore != back)
2418 { 2383 {
2419#if ENABLE_FRILLS 2384#if ENABLE_FRILLS
2420 if (ISSET_PIXCOLOR (Color_underline)) 2385 if (ISSET_PIXCOLOR (Color_underline))
2421 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2386 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2422 else 2387 else
2423#endif 2388#endif
2424 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2389 XSetForeground (display->display, gc, pix_colors[fore]);
2425 2390
2426 XDrawLine (display->display, drawBuffer, TermWin.gc, 2391 XDrawLine (display->display, drawBuffer, gc,
2427 xpixel, ypixel + font->ascent + 1, 2392 xpixel, ypixel + font->ascent + 1,
2428 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2429 } 2394 }
2430 } /* for (col....) */ 2395 } /* for (col....) */
2431 } /* for (row....) */ 2396 } /* for (row....) */
… …
2437 /* 2402 /*
2438 * G: cleanup cursor and display outline cursor if necessary 2403 * G: cleanup cursor and display outline cursor if necessary
2439 */ 2404 */
2440 if (showcursor) 2405 if (showcursor)
2441 { 2406 {
2442 if (TermWin.focus) 2407 if (focus)
2443 { 2408 {
2444 if (options & Opt_cursorUnderline) 2409 if (options & Opt_cursorUnderline)
2445 *crp ^= RS_Uline; 2410 *crp ^= RS_Uline;
2446 else 2411 else
2447 { 2412 {
… …
2454 else if (oldcursor.row >= 0) 2419 else if (oldcursor.row >= 0)
2455 { 2420 {
2456 int cursorwidth = 1; 2421 int cursorwidth = 1;
2457 int col = oldcursor.col; 2422 int col = oldcursor.col;
2458 2423
2459 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2424 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2460 col--; 2425 col--;
2461 2426
2462 while (col + cursorwidth < TermWin.ncol 2427 while (col + cursorwidth < ncol
2463 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) 2428 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2464 cursorwidth++; 2429 cursorwidth++;
2465 2430
2466#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2467 if (ISSET_PIXCOLOR (Color_cursor)) 2432 if (ISSET_PIXCOLOR (Color_cursor))
2468 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2433 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2469#endif 2434#endif
2470 2435
2471 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2436 XDrawRectangle (display->display, drawBuffer, gc,
2472 Col2Pixel (col), 2437 Col2Pixel (col),
2473 Row2Pixel (oldcursor.row), 2438 Row2Pixel (oldcursor.row),
2474 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2439 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2475 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2440 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2476 } 2441 }
2477 } 2442 }
2478 2443
2479 /* 2444 /*
2480 * H: cleanup selection 2445 * H: cleanup selection
… …
2487 num_scr = 0; 2452 num_scr = 0;
2488 num_scr_allow = 1; 2453 num_scr_allow = 1;
2489} 2454}
2490 2455
2491void 2456void
2492rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2457rxvt_term::scr_remap_chars (const line_t &l)
2493{ 2458{
2494 if (!rp || !tp) 2459 if (!l.t)
2495 return; 2460 return;
2496 2461
2497 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2462 for (int i = ncol; i--; )
2498 *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]));
2499} 2464}
2500 2465
2501void 2466void
2502rxvt_term::scr_remap_chars () 2467rxvt_term::scr_remap_chars ()
2503{ 2468{
2504 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2469 for (int i = total_rows; i--; )
2505 scr_remap_chars (screen.text[i], screen.rend[i]); 2470 scr_remap_chars (save[i]);
2506 2471
2507 for (int i = TermWin.nrow; i--; ) 2472 for (int i = nrow; i--; )
2508 { 2473 {
2509 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2474 scr_remap_chars (drawn[i]);
2510 scr_remap_chars (swap.text[i], swap.rend[i]); 2475 scr_remap_chars (swap_save[i]);
2511 } 2476 }
2512} 2477}
2513 2478
2514void 2479void
2515rxvt_term::scr_recolour () 2480rxvt_term::scr_recolour ()
… …
2521#if XPM_BACKGROUND 2486#if XPM_BACKGROUND
2522 && !bgPixmap.pixmap 2487 && !bgPixmap.pixmap
2523#endif 2488#endif
2524 ) 2489 )
2525 { 2490 {
2526 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2491 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2527 XClearWindow (display->display, TermWin.parent[0]); 2492 XClearWindow (display->display, parent[0]);
2528 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2493 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2529#if HAVE_SCROLLBARS 2494#if HAVE_SCROLLBARS
2530 if (scrollBar.win) 2495 if (scrollBar.win)
2531 { 2496 {
2532 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2497 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2533 scrollBar.setIdle (); 2498 scrollBar.setIdle ();
… …
2543 2508
2544/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2545void 2510void
2546rxvt_term::scr_clear (bool really) 2511rxvt_term::scr_clear (bool really)
2547{ 2512{
2548 if (!TermWin.mapped) 2513 if (!mapped)
2549 return; 2514 return;
2550 2515
2551 num_scr_allow = 0; 2516 num_scr_allow = 0;
2552 want_refresh = 1; 2517 want_refresh = 1;
2553 2518
2554 if (really) 2519 if (really)
2555 XClearWindow (display->display, TermWin.vt); 2520 XClearWindow (display->display, vt);
2556} 2521}
2557 2522
2558/* ------------------------------------------------------------------------- */ 2523/* ------------------------------------------------------------------------- */
2559void 2524void
2560rxvt_term::scr_reverse_selection () 2525rxvt_term::scr_reverse_selection ()
2561{ 2526{
2527 if (selection.op
2562 if (selection.op && current_screen == selection.screen) 2528 && current_screen == selection.screen
2529 && selection.end.row >= -view_start)
2563 { 2530 {
2564 int end_row = TermWin.saveLines - TermWin.view_start; 2531 int view_end = -view_start + nrow;
2565 int i = selection.beg.row + TermWin.saveLines; 2532 int row, col;
2566 int col, row = selection.end.row + TermWin.saveLines;
2567 rend_t *srp;
2568 2533
2569#if ENABLE_FRILLS 2534#if ENABLE_FRILLS
2570 if (selection.rect) 2535 if (selection.rect)
2571 { 2536 {
2572 end_row += TermWin.nrow; 2537 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2573
2574 for (; i <= row && i <= end_row; i++)
2575 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++)
2576 srp[col] ^= RS_RVid; 2539 srp[col] ^= RS_RVid;
2577 } 2540 }
2578 else 2541 else
2579#endif 2542#endif
2580 { 2543 {
2581 if (i >= end_row) 2544 if (selection.beg.row >= -view_start)
2545 {
2582 col = selection.beg.col; 2546 col = selection.beg.col;
2547 row = selection.beg.row;
2548 }
2583 else 2549 else
2584 { 2550 {
2585 col = 0; 2551 col = 0;
2586 i = end_row; 2552 row = view_start;
2587 } 2553 }
2588 2554
2589 end_row += TermWin.nrow; 2555 for (; row < min (selection.end.row, view_end); row++, col = 0)
2590 2556 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2591 for (; i < row && i < end_row; i++, col = 0)
2592 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2593 srp[col] ^= RS_RVid; 2557 srp[col] ^= RS_RVid;
2594 2558
2595 if (i == row && i < end_row) 2559 if (row == selection.end.row)
2596 for (srp = screen.rend[i]; col < selection.end.col; col++) 2560 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2597 srp[col] ^= RS_RVid; 2561 srp[col] ^= RS_RVid;
2598 } 2562 }
2599 } 2563 }
2600} 2564}
2601 2565
… …
2610{ 2574{
2611 int row, wrote; 2575 int row, wrote;
2612 unsigned int width, towrite; 2576 unsigned int width, towrite;
2613 char r1[] = "\n"; 2577 char r1[] = "\n";
2614 2578
2615 for (row = TermWin.saveLines - TermWin.nscrolled; 2579 for (row = saveLines - nsaved;
2616 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2580 row < saveLines + nrow - 1; row++)
2617 { 2581 {
2618 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2582 width = save[row].l >= 0 ? save[row].l
2619 : TermWin.ncol; 2583 : ncol;
2620 for (towrite = width; towrite; towrite -= wrote) 2584 for (towrite = width; towrite; towrite -= wrote)
2621 { 2585 {
2622 wrote = write (fd, & (screen.text[row][width - towrite]), 2586 wrote = write (fd, & (save[row].t[width - towrite]),
2623 towrite); 2587 towrite);
2624 if (wrote < 0) 2588 if (wrote < 0)
2625 return; /* XXX: death, no report */ 2589 return; /* XXX: death, no report */
2626 } 2590 }
2627 if (screen.tlen[row] >= 0) 2591 if (save[row].l >= 0)
2628 if (write (fd, r1, 1) <= 0) 2592 if (write (fd, r1, 1) <= 0)
2629 return; /* XXX: death, no report */ 2593 return; /* XXX: death, no report */
2630 } 2594 }
2631} 2595}
2632#endif 2596#endif
2633 2597
2634/* ------------------------------------------------------------------------- * 2598/* ------------------------------------------------------------------------- *
2635 * CHARACTER SELECTION * 2599 * CHARACTER SELECTION *
2636 * ------------------------------------------------------------------------- */ 2600 * ------------------------------------------------------------------------- */
2637
2638/*
2639 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2640 */
2641void 2601void
2642rxvt_term::selection_check (int check_more) 2602rxvt_term::selection_check (int check_more)
2643{ 2603{
2644 row_col_t pos; 2604 row_col_t pos;
2645 2605
2646 if (!selection.op) 2606 if (!selection.op)
2647 return; 2607 return;
2648 2608
2649 pos.row = pos.col = 0; 2609 pos.row = pos.col = 0;
2650 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2610 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2651 || (selection.beg.row >= TermWin.nrow) 2611 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2652 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2612 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2653 || (selection.mark.row >= TermWin.nrow)
2654 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2655 || (selection.end.row >= TermWin.nrow)
2656 || (check_more == 1 2613 || (check_more == 1
2657 && current_screen == selection.screen 2614 && current_screen == selection.screen
2658 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2615 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2659 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2616 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2660 || (check_more == 2 2617 || (check_more == 2
… …
2662 && ROWCOL_IS_AFTER (selection.end, pos)) 2619 && ROWCOL_IS_AFTER (selection.end, pos))
2663 || (check_more == 3 2620 || (check_more == 3
2664 && ROWCOL_IS_AFTER (selection.end, pos)) 2621 && ROWCOL_IS_AFTER (selection.end, pos))
2665 || (check_more == 4 /* screen width change */ 2622 || (check_more == 4 /* screen width change */
2666 && (selection.beg.row != selection.end.row 2623 && (selection.beg.row != selection.end.row
2667 || selection.end.col > TermWin.ncol))) 2624 || selection.end.col > ncol)))
2668 CLEAR_SELECTION (); 2625 CLEAR_SELECTION ();
2669} 2626}
2670 2627
2671/* ------------------------------------------------------------------------- */ 2628/* ------------------------------------------------------------------------- */
2672/* 2629/*
… …
2881 * EXT: button 2 release 2838 * EXT: button 2 release
2882 */ 2839 */
2883void 2840void
2884rxvt_term::selection_request (Time tm, int x, int y) 2841rxvt_term::selection_request (Time tm, int x, int y)
2885{ 2842{
2886 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2843 if (x < 0 || x >= width || y < 0 || y >= height)
2887 return; /* outside window */ 2844 return; /* outside window */
2888 2845
2889 if (selection.text) 2846 if (selection.text)
2890 { /* internal selection */ 2847 { /* internal selection */
2891 char *str = rxvt_wcstombs (selection.text, selection.len); 2848 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2933 sel = xa[XA_CLIPBOARD]; 2890 sel = xa[XA_CLIPBOARD];
2934 2891
2935 if (XGetSelectionOwner (display->display, sel) != None) 2892 if (XGetSelectionOwner (display->display, sel) != None)
2936 { 2893 {
2937 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2894 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2938 TermWin.vt, selection_request_time); 2895 vt, selection_request_time);
2939 return 1; 2896 return 1;
2940 } 2897 }
2941 2898
2942 return 0; 2899 return 0;
2943} 2900}
… …
2966 * EXT: button 1 or 3 release 2923 * EXT: button 1 or 3 release
2967 */ 2924 */
2968void 2925void
2969rxvt_term::selection_make (Time tm) 2926rxvt_term::selection_make (Time tm)
2970{ 2927{
2971 int i, col, end_col, row, end_row; 2928 int i;
2972 wchar_t *new_selection_text; 2929 wchar_t *new_selection_text;
2973 text_t *t; 2930 text_t *t;
2974 2931
2975 switch (selection.op) 2932 switch (selection.op)
2976 { 2933 {
… …
2989 selection.op = SELECTION_DONE; 2946 selection.op = SELECTION_DONE;
2990 2947
2991 if (selection.clicks == 4) 2948 if (selection.clicks == 4)
2992 return; /* nothing selected, go away */ 2949 return; /* nothing selected, go away */
2993 2950
2994 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2951 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995 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));
2996 2953
2997 col = selection.beg.col;
2998 row = selection.beg.row + TermWin.saveLines;
2999 end_row = selection.end.row + TermWin.saveLines;
3000 int ofs = 0; 2954 int ofs = 0;
3001 int extra = 0; 2955 int extra = 0;
3002 2956
2957 int col = selection.beg.col;
2958 int row = selection.beg.row;
2959
2960 int end_col;
2961
3003 for (; row <= end_row; row++, col = 0) 2962 for (; row <= selection.end.row; row++, col = 0)
3004 { 2963 {
3005 end_col = screen.tlen[row];
3006
3007#if ENABLE_FRILLS 2964#if ENABLE_FRILLS
3008 if (selection.rect) 2965 if (selection.rect)
3009 { 2966 {
3010 col = selection.beg.col; 2967 col = selection.beg.col;
3011 end_col = TermWin.ncol + 1; 2968 end_col = ncol + 1;
3012 } 2969 }
2970 else
3013#endif 2971#endif
2972 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
3014 2973
3015 MAX_IT (col, 0); 2974 col = max (col, 0);
3016 2975
3017 if (end_col == -1)
3018 end_col = TermWin.ncol;
3019
3020 if (row == end_row || selection.rect) 2976 if (row == selection.end.row || selection.rect)
3021 MIN_IT (end_col, selection.end.col); 2977 end_col = min (end_col, selection.end.col);
3022 2978
3023 t = &screen.text[row][col]; 2979 t = ROW(row).t + col;
3024 for (; col < end_col; col++) 2980 for (; col < end_col; col++)
3025 { 2981 {
3026 if (*t == NOCHAR) 2982 if (*t == NOCHAR)
3027 t++; 2983 t++;
3028#if ENABLE_COMBINING 2984#if ENABLE_COMBINING
… …
3044#endif 3000#endif
3045 else 3001 else
3046 new_selection_text[ofs++] = *t++; 3002 new_selection_text[ofs++] = *t++;
3047 } 3003 }
3048 3004
3049 if (screen.tlen[row] != -1 && row != end_row) 3005 if (!ROW(row).is_longer () && row != selection.end.row)
3050 new_selection_text[ofs++] = C0_LF; 3006 new_selection_text[ofs++] = C0_LF;
3051 } 3007 }
3052 3008
3053 if (end_col != selection.end.col) 3009 if (end_col != selection.end.col)
3054 new_selection_text[ofs++] = C0_LF; 3010 new_selection_text[ofs++] = C0_LF;
… …
3065 3021
3066 // 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
3067 selection.len = ofs; 3023 selection.len = ofs;
3068 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));
3069 3025
3070 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3026 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3071 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3027 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3072 display->set_selection_owner (this); 3028 display->set_selection_owner (this);
3073 else 3029 else
3074 rxvt_warn ("can't get primary selection, ignoring.\n"); 3030 rxvt_warn ("can't get primary selection, ignoring.\n");
3075 3031
3076#if 0 3032#if 0
… …
3099 3055
3100 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3056 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3101 3057
3102 if (clicks == 2 || clicks == 3) 3058 if (clicks == 2 || clicks == 3)
3103 selection_extend_colrow (selection.mark.col, 3059 selection_extend_colrow (selection.mark.col,
3104 selection.mark.row + TermWin.view_start, 3060 selection.mark.row + view_start,
3105 0, /* button 3 */ 3061 0, /* button 3 */
3106 1, /* button press */ 3062 1, /* button press */
3107 0); /* click change */ 3063 0); /* click change */
3108} 3064}
3109 3065
… …
3113 */ 3069 */
3114void 3070void
3115rxvt_term::selection_start_colrow (int col, int row) 3071rxvt_term::selection_start_colrow (int col, int row)
3116{ 3072{
3117 want_refresh = 1; 3073 want_refresh = 1;
3074
3075 selection.mark.row = row - view_start;
3118 selection.mark.col = col; 3076 selection.mark.col = col;
3119 selection.mark.row = row - TermWin.view_start;
3120 3077
3121 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3078 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);
3122 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3079 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);
3123 MAX_IT (selection.mark.col, 0);
3124 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3125 3080
3126 while (selection.mark.col > 0 3081 while (selection.mark.col > 0
3127 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3082 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3128 --selection.mark.col; 3083 --selection.mark.col;
3129 3084
3130 if (selection.op) 3085 if (selection.op)
3131 { /* clear the old selection */ 3086 { /* clear the old selection */
3132 selection.beg.row = selection.end.row = selection.mark.row; 3087 selection.beg.row = selection.end.row = selection.mark.row;
… …
3156 text_t *stp; 3111 text_t *stp;
3157 rend_t *srp; 3112 rend_t *srp;
3158 3113
3159 if (dirn == UP) 3114 if (dirn == UP)
3160 { 3115 {
3161 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3116 bound.row = - nsaved - 1;
3162 bound.col = 0; 3117 bound.col = 0;
3163 dirnadd = -1; 3118 dirnadd = -1;
3164 } 3119 }
3165 else 3120 else
3166 { 3121 {
3167 bound.row = TermWin.saveLines + TermWin.nrow; 3122 bound.row = nrow;
3168 bound.col = TermWin.ncol - 1; 3123 bound.col = ncol - 1;
3169 dirnadd = 1; 3124 dirnadd = 1;
3170 } 3125 }
3171 3126
3172 row = mark->row + TermWin.saveLines; 3127 row = mark->row;
3173 col = mark->col; 3128 col = max (mark->col, 0);
3174 MAX_IT (col, 0); 3129
3175 /* find the edge of a word */ 3130 /* find the edge of a word */
3176 stp = &screen.text[row][col]; 3131 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3177 w1 = DELIMIT_TEXT (*stp); 3132 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3178
3179 srp = &screen.rend[row][col];
3180 w2 = DELIMIT_REND (*srp);
3181 3133
3182 for (;;) 3134 for (;;)
3183 { 3135 {
3184 for (; col != bound.col; col += dirnadd) 3136 for (; col != bound.col; col += dirnadd)
3185 { 3137 {
… …
3195 break; 3147 break;
3196 } 3148 }
3197 3149
3198 if ((col == bound.col) && (row != bound.row)) 3150 if ((col == bound.col) && (row != bound.row))
3199 { 3151 {
3200 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3152 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3201 { 3153 {
3202 trow = row + dirnadd; 3154 trow = row + dirnadd;
3203 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3155 tcol = dirn == UP ? ncol - 1 : 0;
3204 3156
3205 if (screen.text[trow] == NULL) 3157 if (!ROW(trow).t)
3206 break; 3158 break;
3207 3159
3208 stp = & (screen.text[trow][tcol]); 3160 stp = ROW(trow).t + tcol;
3209 srp = & (screen.rend[trow][tcol]); 3161 srp = ROW(trow).r + tcol;
3210 3162
3211 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3163 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3212 break; 3164 break;
3213 3165
3214 row = trow; 3166 row = trow;
… …
3222Old_Word_Selection_You_Die: 3174Old_Word_Selection_You_Die:
3223 if (dirn == DN) 3175 if (dirn == DN)
3224 col++; /* put us on one past the end */ 3176 col++; /* put us on one past the end */
3225 3177
3226 /* Poke the values back in */ 3178 /* Poke the values back in */
3227 ret->row = row - TermWin.saveLines; 3179 ret->row = row;
3228 ret->col = col; 3180 ret->col = col;
3229} 3181}
3230 3182
3231/* ------------------------------------------------------------------------- */ 3183/* ------------------------------------------------------------------------- */
3232/* 3184/*
… …
3237 * flag == 2 ==> button 3 motion 3189 * flag == 2 ==> button 3 motion
3238 */ 3190 */
3239void 3191void
3240rxvt_term::selection_extend (int x, int y, int flag) 3192rxvt_term::selection_extend (int x, int y, int flag)
3241{ 3193{
3242 int col, row; 3194 int col = min (max (Pixel2Col (x), 0), nrow - 1);
3243 3195 int row = min (max (Pixel2Row (y), 0), ncol);
3244 col = Pixel2Col (x);
3245 row = Pixel2Row (y);
3246 MAX_IT (row, 0);
3247 MIN_IT (row, (int)TermWin.nrow - 1);
3248 MAX_IT (col, 0);
3249 MIN_IT (col, (int)TermWin.ncol);
3250 3196
3251 /* 3197 /*
3252 * 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
3253 * 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
3254 * 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
3255 * be _past_ a character for it to be selected. 3201 * be _past_ a character for it to be selected.
3256 */ 3202 */
3257 if (((selection.clicks % 3) == 1) && !flag 3203 if (((selection.clicks % 3) == 1) && !flag
3258 && (col == selection.mark.col 3204 && (col == selection.mark.col
3259 && (row == selection.mark.row + TermWin.view_start))) 3205 && (row == selection.mark.row + view_start)))
3260 { 3206 {
3261 /* select nothing */ 3207 /* select nothing */
3262 selection.beg.row = selection.end.row = 0; 3208 selection.beg.row = selection.end.row = 0;
3263 selection.beg.col = selection.end.col = 0; 3209 selection.beg.col = selection.end.col = 0;
3264 selection.clicks = 4; 3210 selection.clicks = 4;
… …
3279 * Extend the selection to the specified col/row 3225 * Extend the selection to the specified col/row
3280 */ 3226 */
3281void 3227void
3282rxvt_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)
3283{ 3229{
3284 int16_t ncol = TermWin.ncol;
3285 int end_col;
3286 row_col_t pos; 3230 row_col_t pos;
3287 enum { 3231 enum {
3288 LEFT, RIGHT 3232 LEFT, RIGHT
3289 } closeto = RIGHT; 3233 } closeto = RIGHT;
3290 3234
… …
3321 selection.beg.col = selection.end.col = selection.mark.col; 3265 selection.beg.col = selection.end.col = selection.mark.col;
3322 selection.beg.row = selection.end.row = selection.mark.row; 3266 selection.beg.row = selection.end.row = selection.mark.row;
3323 } 3267 }
3324 3268
3325 pos.col = col; 3269 pos.col = col;
3326 pos.row = row; 3270 pos.row = row - view_start;
3327
3328 pos.row -= TermWin.view_start; /* adjust for scroll */
3329 3271
3330 /* 3272 /*
3331 * 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
3332 * in the way button3 drag extension works. 3274 * in the way button3 drag extension works.
3333 * We're either doing: button1 drag; button3 press; or button3 drag 3275 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3392 } 3334 }
3393 } 3335 }
3394 3336
3395 if (selection.clicks == 1) 3337 if (selection.clicks == 1)
3396 { 3338 {
3397 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3339 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3398 3340 && !ROW(selection.beg.row).is_longer ()
3399 if (selection.beg.col > end_col
3400 && end_col != -1
3401#if ENABLE_FRILLS 3341#if ENABLE_FRILLS
3402 && !selection.rect 3342 && !selection.rect
3403#endif 3343#endif
3404 ) 3344 )
3405 selection.beg.col = ncol; 3345 selection.beg.col = ncol;
3406 3346
3407 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3408
3409 if ( 3347 if (
3410 selection.end.col > end_col 3348 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3411 && end_col != -1 3349 && !ROW(selection.end.row).is_longer ()
3412#if ENABLE_FRILLS 3350#if ENABLE_FRILLS
3413 && !selection.rect 3351 && !selection.rect
3414#endif 3352#endif
3415 ) 3353 )
3416 selection.end.col = ncol; 3354 selection.end.col = ncol;
… …
3426 else if (selection.clicks == 3) 3364 else if (selection.clicks == 3)
3427 { 3365 {
3428#if ENABLE_FRILLS 3366#if ENABLE_FRILLS
3429 if (options & Opt_tripleclickwords) 3367 if (options & Opt_tripleclickwords)
3430 { 3368 {
3431 int end_row;
3432
3433 selection_delimit_word (UP, &selection.beg, &selection.beg); 3369 selection_delimit_word (UP, &selection.beg, &selection.beg);
3434 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3435 3370
3436 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++)
3437 { 3372 {
3438 end_col = screen.tlen[end_row + TermWin.saveLines]; 3373 if (!ROW(end_row).is_longer ())
3439
3440 if (end_col != -1)
3441 { 3374 {
3442 selection.end.row = end_row; 3375 selection.end.row = end_row;
3443 selection.end.col = end_col; 3376 selection.end.col = save[end_row + saveLines].l;
3444 selection_remove_trailing_spaces (); 3377 selection_remove_trailing_spaces ();
3445 break; 3378 break;
3446 } 3379 }
3447 } 3380 }
3448 } 3381 }
… …
3454 3387
3455 selection.beg.col = 0; 3388 selection.beg.col = 0;
3456 selection.end.col = ncol; 3389 selection.end.col = ncol;
3457 3390
3458 // select a complete logical line 3391 // select a complete logical line
3459 while (selection.beg.row > -TermWin.saveLines 3392 while (selection.beg.row > -saveLines
3460 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3393 && ROW(selection.beg.row - 1).is_longer ())
3461 selection.beg.row--; 3394 selection.beg.row--;
3462 3395
3463 while (selection.end.row < TermWin.nrow 3396 while (selection.end.row < nrow
3464 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3397 && ROW(selection.end.row).is_longer ())
3465 selection.end.row++; 3398 selection.end.row++;
3466 } 3399 }
3467 } 3400 }
3468 3401
3469 if (button3 && buttonpress) 3402 if (button3 && buttonpress)
… …
3494 text_t *stp; 3427 text_t *stp;
3495 3428
3496 end_col = selection.end.col; 3429 end_col = selection.end.col;
3497 end_row = selection.end.row; 3430 end_row = selection.end.row;
3498 3431
3499 for ( ; end_row >= selection.beg.row; ) 3432 for (; end_row >= selection.beg.row; )
3500 { 3433 {
3501 stp = screen.text[end_row + TermWin.saveLines]; 3434 stp = ROW(end_row).t;
3502 3435
3503 while (--end_col >= 0) 3436 while (--end_col >= 0)
3504 { 3437 {
3505 if (stp[end_col] != ' ' 3438 if (stp[end_col] != ' '
3506 && stp[end_col] != '\t' 3439 && stp[end_col] != '\t'
3507 && stp[end_col] != NOCHAR) 3440 && stp[end_col] != NOCHAR)
3508 break; 3441 break;
3509 } 3442 }
3510 3443
3511 if (end_col >= 0 3444 if (end_col >= 0
3512 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3445 || !ROW(end_row - 1).is_longer ())
3513 { 3446 {
3514 selection.end.col = end_col + 1; 3447 selection.end.col = end_col + 1;
3515 selection.end.row = end_row; 3448 selection.end.row = end_row;
3516 break; 3449 break;
3517 } 3450 }
3518 3451
3519 end_row--; 3452 end_row--;
3520 end_col = TermWin.ncol; 3453 end_col = ncol;
3521 } 3454 }
3522 3455
3523 if (selection.mark.row > selection.end.row) 3456 if (selection.mark.row > selection.end.row)
3524 { 3457 {
3525 selection.mark.row = selection.end.row; 3458 selection.mark.row = selection.end.row;
… …
3688 */ 3621 */
3689void 3622void
3690rxvt_term::pixel_position (int *x, int *y) 3623rxvt_term::pixel_position (int *x, int *y)
3691{ 3624{
3692 *x = Pixel2Col (*x); 3625 *x = Pixel2Col (*x);
3693 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3626 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3694 *y = Pixel2Row (*y); 3627 *y = Pixel2Row (*y);
3695 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3628 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3696} 3629}
3697 3630
3698/* ------------------------------------------------------------------------- */ 3631/* ------------------------------------------------------------------------- */
3699#ifdef USE_XIM 3632#ifdef USE_XIM
3700void 3633void
3701rxvt_term::im_set_position (XPoint &pos) 3634rxvt_term::im_set_position (XPoint &pos)
3702{ 3635{
3703 XWindowAttributes xwa; 3636 XWindowAttributes xwa;
3704 3637
3705 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3638 XGetWindowAttributes (display->display, vt, &xwa);
3706 3639
3707 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3640 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3708 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3641 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3709} 3642}
3710#endif 3643#endif
3711 3644
3712#if ENABLE_OVERLAY 3645#if ENABLE_OVERLAY
3713void 3646void
3714rxvt_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)
3715{ 3648{
3716 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3649 if (nrow < 3 || ncol < 3)
3717 return; 3650 return;
3718 3651
3719 want_refresh = 1; 3652 want_refresh = 1;
3720 3653
3721 scr_overlay_off (); 3654 scr_overlay_off ();
3722 3655
3723 if (x < 0) x = TermWin.ncol - w; 3656 if (x < 0) x = ncol - w;
3724 if (y < 0) y = TermWin.nrow - h; 3657 if (y < 0) y = nrow - h;
3725 3658
3726 // make space for border 3659 // make space for border
3727 w += 2; MIN_IT (w, TermWin.ncol); 3660 w += 2; MIN_IT (w, ncol);
3728 h += 2; MIN_IT (h, TermWin.nrow); 3661 h += 2; MIN_IT (h, nrow);
3729 3662
3730 x -= 1; MAX_IT (x, 0); 3663 x -= 1; MAX_IT (x, 0);
3731 y -= 1; MAX_IT (y, 0); 3664 y -= 1; MAX_IT (y, 0);
3732 3665
3733 MIN_IT (x, TermWin.ncol - w); 3666 MIN_IT (x, ncol - w);
3734 MIN_IT (y, TermWin.nrow - h); 3667 MIN_IT (y, nrow - h);
3735 3668
3736 ov_x = x; ov_y = y; 3669 ov_x = x; ov_y = y;
3737 ov_w = w; ov_h = h; 3670 ov_w = w; ov_h = h;
3738 3671
3739 ov_text = new text_t *[h]; 3672 ov_text = new text_t *[h];
… …
3825rxvt_term::scr_swap_overlay () 3758rxvt_term::scr_swap_overlay ()
3826{ 3759{
3827 if (!ov_text) 3760 if (!ov_text)
3828 return; 3761 return;
3829 3762
3830 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3831
3832 // swap screen mem with overlay 3763 // swap screen mem with overlay
3833 for (int y = ov_h; y--; ) 3764 for (int y = ov_h; y--; )
3834 { 3765 {
3835 text_t *t1 = ov_text[y]; 3766 text_t *t1 = ov_text[y];
3836 rend_t *r1 = ov_rend[y]; 3767 rend_t *r1 = ov_rend[y];
3837 3768
3838 text_t *t2 = screen.text[y + row_offset] + ov_x; 3769 text_t *t2 = ROW(y - view_start).t + ov_x;
3839 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3770 rend_t *r2 = ROW(y - view_start).r + ov_x;
3840 3771
3841 for (int x = ov_w; x--; ) 3772 for (int x = ov_w; x--; )
3842 { 3773 {
3843 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3774 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3844 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));
… …
3846 } 3777 }
3847} 3778}
3848 3779
3849#endif 3780#endif
3850/* ------------------------------------------------------------------------- */ 3781/* ------------------------------------------------------------------------- */
3782

Diff Legend

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