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.153 by root, Fri Jan 14 17:15:26 2005 UTC vs.
Revision 1.189 by root, Thu Dec 22 15:28:15 2005 UTC

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

Diff Legend

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