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.160 by root, Mon Feb 21 19:30:58 2005 UTC vs.
Revision 1.199 by root, Tue Dec 27 01:46:06 2005 UTC

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

Diff Legend

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