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.167 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.211 by root, Fri Jan 6 01:16:58 2006 UTC

… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 TermWin.view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
… …
88/* 89/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 93 */
93#define drawBuffer TermWin.vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 121{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
129 l.touch ();
130
121 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 133
134 text_t *et = l.t + col;
135 rend_t *er = l.r + col;
136
124 while (width--) 137 while (width--)
125 { 138 {
126 *et++ = ' '; 139 *et++ = ' ';
127 *er++ = efs; 140 *er++ = efs;
128 } 141 }
129} 142}
130 143
131/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
132/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
133void 146void
134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
135{ 148{
136#ifdef DEBUG_STRICT 149 scr_blank_line (l, 0, ncol, efs);
137 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
138#endif
139 if (tp[row] == NULL)
140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144
145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
146} 150}
147 151
148/* ------------------------------------------------------------------------- * 152/* ------------------------------------------------------------------------- *
149 * SCREEN INITIALISATION * 153 * SCREEN INITIALISATION *
150 * ------------------------------------------------------------------------- */ 154 * ------------------------------------------------------------------------- */
155
151void 156void
152rxvt_term::scr_reset () 157rxvt_term::scr_reset ()
153{ 158{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q;
156 int k;
157 rend_t setrstyle;
158
159#if ENABLE_OVERLAY 159#if ENABLE_OVERLAY
160 scr_overlay_off (); 160 scr_overlay_off ();
161#endif 161#endif
162 162
163 TermWin.view_start = 0; 163 view_start = 0;
164 num_scr = 0; 164 num_scr = 0;
165 165
166 if (TermWin.ncol == 0) 166 if (ncol == 0)
167 TermWin.ncol = 80; 167 ncol = 80;
168 168
169 if (TermWin.nrow == 0) 169 if (nrow == 0)
170 TermWin.nrow = 24; 170 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177 174
178 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 176 if (nrow + saveLines < 2)
180 { 177 {
178 //TODO//FIXME
181 TermWin.saveLines++; 179 saveLines++;
182 prev_nrow--; 180 prev_nrow--;
183 TermWin.nscrolled++; 181 nsaved++;
184 } 182 }
185 183
186 want_refresh = 1; 184 want_refresh = 1;
187 185
188 prev_total_rows = prev_nrow + TermWin.saveLines; 186 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 187 total_rows = nrow + saveLines;
190 188
191 screen.tscroll = 0; 189 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 190 screen.bscroll = nrow - 1;
193 191
194 if (!talloc) 192 if (!row_buf)
195 {
196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199
200 if (!screen.text)
201 { 193 {
202 /* 194 /*
203 * first time called so just malloc everything: don't rely on realloc 195 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 196 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 197 */
198 nsaved = 0; /* no saved lines */
199 term_start = 0;
200
201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 205 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
213 208
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 209 for (int row = nrow; row--; )
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219 for (p = 0; p < nrow; p++)
220 { 210 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
224 screen.tlen[q] = swap.tlen[p] = 0;
225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 213 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
226 } 214 }
227 215
228 memset (charsets, 'B', sizeof (charsets)); 216 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 217 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 218 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 219 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 220 screen.charset = 0;
234 current_screen = PRIMARY; 221 current_screen = PRIMARY;
… …
254 else 241 else
255 { 242 {
256 /* 243 /*
257 * add or delete rows as appropriate 244 * add or delete rows as appropriate
258 */ 245 */
259 setrstyle = DEFAULT_RSTYLE;
260 246
247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
248 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
249
250#if 0
261 if (nrow < prev_nrow) 251 if (nrow < prev_nrow)
262 { 252 {
263 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow);
265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
266
267 for (p = nrow; p < prev_nrow; p++) 253 for (int row = nrow; row < prev_nrow; row++)
268 { 254 {
269 q = p + TermWin.saveLines; 255 lfree (swap_buf [row]);
256 lfree (drawn_buf[row]);
257 }
258 }
259#endif
270 260
271 if (screen.text[q]) 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
262 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264
265 for (int row = min (nrow, prev_nrow); row--; )
266 {
267 lresize (drawn_buf[row]);
268 lresize (swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
278
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start - nsaved , prev_total_rows);
281 int q = total_rows; // rewrapped row
282
283 if (nsaved)
284 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm.
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
291 do
292 {
293 p = MOD (p - 1, prev_total_rows);
294#ifdef DEBUG_STRICT
295 assert (old_buf [MOD (p, prev_total_rows)].t);
296#endif
297 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l;
299
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
272 { 301 {
273#ifdef DEBUG_STRICT 302 p = MOD (p - 1, prev_total_rows);
274 assert (screen.rend[q]); 303
275#endif 304 plines++;
276 talloc->free (screen.text[q]); 305 llen += prev_ncol;
277 ralloc->free (screen.rend[q]);
278 } 306 }
279 307
280 if (swap.text[p]) 308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
316 int lofs = 0;
317 line_t *qline;
318
319 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++)
281 { 321 {
282#ifdef DEBUG_STRICT 322 qline = row_buf + qrow;
323 lalloc (*qline);
324 qline->l = ncol;
325 qline->is_longer (1);
326
327 int qcol = 0;
328
329 // fill a single destination line
330 while (lofs < llen && qcol < ncol)
331 {
332 int prow = lofs / prev_ncol;
333 int pcol = lofs % prev_ncol;
334
335 prow = MOD (p + prow, prev_total_rows);
336
337 // we only adjust the cursor _row_ and put it into
338 // the topmost line of "long line" it was in, as
339 // this seems to upset applications/shells/readline
340 // least.
341 if (prow == ocur.row)
342 screen.cur.row = q - (total_rows - nrow);
343
344 line_t &pline = old_buf [prow];
345
346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347
283 assert (swap.rend[p]); 348 assert (len);
284#endif 349 assert (pline.t);
285 talloc->free (swap.text[p]); 350
286 ralloc->free (swap.rend[p]); 351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
353
354 lofs += len;
355 qcol += len;
356 }
287 } 357 }
288 358
289#ifdef DEBUG_STRICT 359 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
290 assert (drawn_text[p] && drawn_rend[p]); 360 qline->is_longer (0);
291#endif 361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
292 talloc->free (drawn_text[p]);
293 ralloc->free (drawn_rend[p]);
294 } 362 }
363 while (p != pend && q > 0);
295 364
296 /* we have fewer rows so fix up cursor position */ 365 term_start = total_rows - nrow;
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 366 nsaved = term_start - q;
298 367
299 scr_reset_realloc (); /* realloc _last_ */ 368 // make sure all terminal lines exist
300 } 369 while (nsaved < 0)
301 else if (nrow > prev_nrow) 370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
302 { 371 }
303 /* add rows */ 372 else
304 scr_reset_realloc (); /* realloc _first_ */ 373 {
305 374 // if no scrollback exists (yet), wing, instead of wrap
306 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 375
307 376 for (int row = min (nrow, prev_nrow); row--; )
308 k = min (TermWin.nscrolled, nrow - prev_nrow);
309
310 for (p = prev_total_rows; p < total_rows; p++)
311 { 377 {
312 screen.tlen[p] = 0; 378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
313 screen.text[p] = NULL; 379 line_t &qline = row_buf [row];
314 screen.rend[p] = NULL; 380
381 qline = pline;
382 lresize (qline);
315 } 383 }
316 384
317 for (p = prev_total_rows; p < total_rows - k; p++)
318 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
319
320 for (p = prev_nrow; p < nrow; p++) 385 for (int row = prev_nrow; row < nrow; row++)
321 { 386 {
322 swap.tlen[p] = 0; 387 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
323 swap.text[p] = NULL;
324 swap.rend[p] = NULL;
325 drawn_text[p] = NULL;
326 drawn_rend[p] = NULL;
327 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
328 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
329 } 388 }
330 389
331 if (k > 0) 390 term_start = 0;
332 {
333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
334 screen.cur.row += k;
335 screen.s_cur.row += k;
336 TermWin.nscrolled -= k;
337 }
338
339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow);
341#else /* drive with your eyes closed */
342 MIN_IT (screen.cur.row, nrow - 1);
343#endif
344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
345 }
346
347 /* resize columns */
348 if (ncol != prev_ncol)
349 { 391 }
350 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
351 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
352 392
353 for (p = 0; p < total_rows; p++) 393#ifdef DEBUG_STRICT //TODO: remove
354 { 394 for (int i = -nsaved; i < nrow; i++)
355 if (screen.text[p]) 395 assert (ROW (i).t);
356 { 396#endif
357 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
358 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
359 397
360 MIN_IT (screen.tlen[p], (int16_t)ncol); 398 free (old_buf);
399 delete old_ta;
400 delete old_ra;
361 401
362 if (ncol > prev_ncol) 402 clamp_it (screen.cur.row, 0, nrow - 1);
363 scr_blank_line (&screen.text[p][prev_ncol], 403 clamp_it (screen.cur.col, 0, ncol - 1);
364 &screen.rend[p][prev_ncol],
365 ncol - prev_ncol, setrstyle);
366 }
367 }
368
369 for (p = 0; p < nrow; p++)
370 {
371 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
372 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
373
374 if (ncol > prev_ncol)
375 scr_blank_line (&drawn_text[p][prev_ncol],
376 &drawn_rend[p][prev_ncol],
377 ncol - prev_ncol, setrstyle);
378
379 if (swap.text[p])
380 {
381 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
382 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
383
384 MIN_IT (swap.tlen[p], (int16_t)ncol);
385
386 if (ncol > prev_ncol)
387 scr_blank_line (&swap.text[p][prev_ncol],
388 &swap.rend[p][prev_ncol],
389 ncol - prev_ncol, setrstyle);
390 }
391
392 }
393
394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
395
396 delete talloc; talloc = ta;
397 delete ralloc; ralloc = ra;
398 }
399 404
400 if (tabs) 405 if (tabs)
401 free (tabs); 406 free (tabs);
402 } 407 }
403 408
404 prev_nrow = nrow; 409 prev_nrow = nrow;
405 prev_ncol = ncol; 410 prev_ncol = ncol;
406 411
407 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
408 413
409 for (p = 0; p < ncol; p++) 414 for (int col = ncol; col--; )
410 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 415 tabs [col] = col % TABSIZE == 0;
411 416
412 tt_winch (); 417 tt_winch ();
413}
414 418
415void 419 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416rxvt_term::scr_reset_realloc ()
417{
418 unsigned int total_rows, nrow;
419
420 nrow = TermWin.nrow;
421 total_rows = nrow + TermWin.saveLines;
422 /* *INDENT-OFF* */
423 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
424 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
425 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
426 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
427
428 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
429 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
430
431 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
432 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
433 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
434 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
435 /* *INDENT-ON* */
436} 420}
437 421
438/* ------------------------------------------------------------------------- */ 422/* ------------------------------------------------------------------------- */
439/* 423/*
440 * Free everything. That way malloc debugging can find leakage. 424 * Free everything. That way malloc debugging can find leakage.
441 */ 425 */
442void 426void
443rxvt_term::scr_release () 427rxvt_term::scr_release ()
444{ 428{
445 unsigned int total_rows;
446 int i;
447
448 total_rows = TermWin.nrow + TermWin.saveLines;
449
450 delete talloc; talloc = 0; 429 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
452 431
453 free (screen.text); 432 free (row_buf);
454 free (screen.tlen); 433 free (swap_buf);
455 free (screen.rend);
456 free (drawn_text); 434 free (drawn_buf);
457 free (drawn_rend); 435 free (temp_buf);
458 free (swap.text);
459 free (swap.tlen);
460 free (swap.rend);
461 free (buf_text);
462 free (buf_rend);
463 free (tabs); 436 free (tabs);
464 437
465 /* NULL these so if anything tries to use them, we'll know about it */ 438 row_buf = 0; // signal that we freed all the arrays
466 screen.text = drawn_text = swap.text = NULL;
467 screen.rend = drawn_rend = swap.rend = NULL;
468 screen.tlen = swap.tlen = NULL;
469 buf_text = NULL;
470 buf_rend = NULL;
471 tabs = NULL;
472} 439}
473 440
474/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
475/* 442/*
476 * Hard reset 443 * Hard reset
… …
527 set_font_style (); 494 set_font_style ();
528 break; 495 break;
529 } 496 }
530 497
531 /* boundary check in case screen size changed between SAVE and RESTORE */ 498 /* boundary check in case screen size changed between SAVE and RESTORE */
532 MIN_IT (s->cur.row, TermWin.nrow - 1); 499 min_it (s->cur.row, nrow - 1);
533 MIN_IT (s->cur.col, TermWin.ncol - 1); 500 min_it (s->cur.col, ncol - 1);
534#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
535 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
536 assert (s->cur.col >= 0); 503 assert (s->cur.col >= 0);
537#else /* drive with your eyes closed */
538 MAX_IT (s->cur.row, 0);
539 MAX_IT (s->cur.col, 0);
540#endif 504#endif
541} 505}
542 506
543/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
544/* 508/*
… …
547 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
548 */ 512 */
549int 513int
550rxvt_term::scr_change_screen (int scrn) 514rxvt_term::scr_change_screen (int scrn)
551{ 515{
552 int i;
553#if NSCREENS
554 int offset;
555#endif
556
557 want_refresh = 1; 516 want_refresh = 1;
558
559 TermWin.view_start = 0; 517 view_start = 0;
560 518
561 if (current_screen == scrn) 519 if (current_screen == scrn)
562 return scrn; 520 return scrn;
563 521
564 selection_check (2); /* check for boundary cross */ 522 selection_check (2); /* check for boundary cross */
565 523
566 i = current_screen; current_screen = scrn; scrn = i; 524 int i = current_screen; current_screen = scrn; scrn = i;
567 525
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 526 ::swap (screen.cur.row, swap.cur.row);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 527 ::swap (screen.cur.col, swap.cur.col);
570 MAX_IT (screen.cur.row, 0); 528
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574 531
575#if NSCREENS 532#if NSCREENS
576 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
577 { 534 {
578 num_scr = 0; 535 num_scr = 0;
579 offset = TermWin.saveLines;
580 536
581 for (i = prev_nrow; i--;) 537 for (int i = prev_nrow; i--; )
582 { 538 ::swap (ROW(i), swap_buf [i]);
583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
586 }
587 539
588 SWAP_IT (screen.charset, swap.charset, int16_t); 540 ::swap (screen.charset, swap.charset);
589 SWAP_IT (screen.flags, swap.flags, int); 541 ::swap (screen.flags, swap.flags);
590 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
592 } 544 }
593 else 545 else
594#endif 546#endif
595 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
597 549
598 return scrn; 550 return scrn;
599} 551}
600 552
601// clear WrapNext indicator, solidifying position on next line 553// clear WrapNext indicator, solidifying position on next line
… …
608 screen.flags &= ~Screen_WrapNext; 560 screen.flags &= ~Screen_WrapNext;
609 561
610 screen.cur.col = 0; 562 screen.cur.col = 0;
611 563
612 if (screen.cur.row == screen.bscroll) 564 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 565 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
614 else if (screen.cur.row < TermWin.nrow - 1) 566 else if (screen.cur.row < nrow - 1)
615 screen.cur.row++; 567 screen.cur.row++;
616} 568}
617 569
618/* ------------------------------------------------------------------------- */ 570/* ------------------------------------------------------------------------- */
619/* 571/*
… …
649/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
650/* 602/*
651 * Scroll text between <row1> and <row2> inclusive, by <count> lines 603 * Scroll text between <row1> and <row2> inclusive, by <count> lines
652 * count positive ==> scroll up 604 * count positive ==> scroll up
653 * count negative ==> scroll down 605 * count negative ==> scroll down
654 * spec == 0 for normal routines
655 */ 606 */
656int 607int
657rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 608rxvt_term::scr_scroll_text (int row1, int row2, int count)
658{ 609{
659 int i, j;
660 long nscrolled;
661
662 if (count == 0 || (row1 > row2)) 610 if (count == 0 || (row1 > row2))
663 return 0; 611 return 0;
664 612
665 want_refresh = 1; 613 want_refresh = 1;
614 num_scr += count;
666 615
667 if (row1 == 0 && count > 0 616 if (count > 0
617 && row1 == 0
618 && row2 == nrow - 1
668 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
669 {
670 nscrolled = (long)TermWin.nscrolled + (long)count;
671
672 if (nscrolled > (long)TermWin.saveLines)
673 TermWin.nscrolled = TermWin.saveLines;
674 else
675 TermWin.nscrolled = (unsigned int)nscrolled;
676
677 if ((options & Opt_scrollWithBuffer)
678 && TermWin.view_start != 0
679 && TermWin.view_start != TermWin.saveLines)
680 scr_page (UP, count);
681 } 620 {
682 else if (!spec) 621 nsaved = min (nsaved + count, saveLines);
683 row1 += TermWin.saveLines;
684 622
685 row2 += TermWin.saveLines; 623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
624
625 term_start = (term_start + count) % total_rows;
686 626
687 if (selection.op && current_screen == selection.screen) 627 if (selection.op && current_screen == selection.screen)
688 {
689 i = selection.beg.row + TermWin.saveLines;
690 j = selection.end.row + TermWin.saveLines;
691 if ((i < row1 && j > row1)
692 || (i < row2 && j > row2)
693 || (i - count < row1 && i >= row1)
694 || (i - count > row2 && i <= row2)
695 || (j - count < row1 && j >= row1)
696 || (j - count > row2 && j <= row2))
697 {
698 CLEAR_ALL_SELECTION ();
699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
700 } 628 {
701 else if (j >= row1 && j <= row2)
702 {
703 /* move selected region too */
704 selection.beg.row -= count; 629 selection.beg.row -= count;
705 selection.end.row -= count; 630 selection.end.row -= count;
706 selection.mark.row -= count; 631 selection.mark.row -= count;
632
633 if (selection.beg.row < -nsaved
634 || selection.end.row < -nsaved
635 || selection.mark.row < -nsaved)
636 {
637 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR;
707 } 639 }
708 }
709
710 selection_check (0); /* _after_ TermWin.nscrolled update */
711
712 num_scr += count;
713 j = count;
714
715 if (count < 0)
716 count = -count;
717
718 i = row2 - row1 + 1;
719 MIN_IT (count, i);
720
721 if (j > 0)
722 {
723 /* scroll up */
724
725 /* Copy lines that will get clobbered by the rotation */
726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
734
735 j = row2 - count + 1, i = count;
736 }
737 else /* if (j < 0) */
738 {
739 /* scroll down */
740
741 /* Copy lines that will get clobbered by the rotation */
742 for (i = 0, j = row2; i < count; i++, j--)
743 { 640 }
744 buf_text[i] = screen.text[j]; 641
745 buf_rend[i] = screen.rend[j]; 642 for (int i = count; i--; )
746 } 643 {
747 644 ROW(row2 - i).l = 0;
748 /* Rotate lines */ 645 scr_blank_screen_mem (ROW(row2 - i), rstyle);
749 for (j = row2, i = j - count; i >= row1; i--, j--)
750 { 646 }
751 screen.tlen[j] = screen.tlen[i]; 647
752 screen.text[j] = screen.text[i]; 648 if (OPTION (Opt_scrollWithBuffer)
753 screen.rend[j] = screen.rend[i]; 649 && view_start != 0
650 && view_start != saveLines)
651 scr_page (UP, count);
652 }
653 else
654 {
655 if (selection.op && current_screen == selection.screen)
754 } 656 {
657 if ((selection.beg.row < row1 && selection.end.row > row1)
658 || (selection.beg.row < row2 && selection.end.row > row2)
659 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
660 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
661 || (selection.end.row - count < row1 && selection.end.row >= row1)
662 || (selection.end.row - count > row2 && selection.end.row <= row2))
663 {
664 CLEAR_ALL_SELECTION ();
665 selection.op = SELECTION_CLEAR;
666 }
667 else if (selection.end.row >= row1 && selection.end.row <= row2)
668 {
669 /* move selected region too */
670 selection.beg.row -= count;
671 selection.end.row -= count;
672 selection.mark.row -= count;
673
674 selection_check (0);
675 }
676 }
755 677
756 j = row1, i = count; 678 // use a simple and robust scrolling algorithm, this
757 count = -count; 679 // part of scr_scroll_text is not time-critical.
758 }
759 680
760 /* Resurrect lines */ 681 int rows = row2 - row1 + 1;
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 682
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 683 min_it (count, rows);
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 684
764 if (!spec) /* line length may not equal TermWin.ncol */ 685 for (int row = 0; row < rows; row++)
765 for (; i--; j++) 686 {
766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); 687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688
689 if (!IN_RANGE_EXC (row + count, 0, rows))
690 scr_blank_screen_mem (temp_buf [row], rstyle);
691 }
692
693 for (int row = 0; row < rows; row++)
694 ROW(row1 + row) = temp_buf [row];
695 }
767 696
768 return count; 697 return count;
769} 698}
770 699
771/* ------------------------------------------------------------------------- */ 700/* ------------------------------------------------------------------------- */
… …
778 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
779 return; 708 return;
780 709
781 unsigned char checksel; 710 unsigned char checksel;
782 unicode_t c; 711 unicode_t c;
783 int i, row, last_col; 712 int ncol = this->ncol;
784 text_t *stp;
785 rend_t *srp;
786 const unicode_t *strend = str + len; 713 const unicode_t *strend = str + len;
787 714
788 want_refresh = 1; 715 want_refresh = 1;
789 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
790 last_col = TermWin.ncol;
791 717
792 if (nlines > 0) 718 if (nlines > 0)
793 { 719 {
794 nlines += screen.cur.row - screen.bscroll; 720 nlines += screen.cur.row - screen.bscroll;
721
795 if ((nlines > 0) 722 if (nlines > 0
796 && (screen.tscroll == 0) 723 && screen.tscroll == 0
797 && (screen.bscroll == (TermWin.nrow - 1))) 724 && screen.bscroll == nrow - 1)
798 { 725 {
799 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
801 screen.cur.row -= nlines; 728 screen.cur.row -= nlines;
802 } 729 }
803 } 730 }
804 731
805#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
806 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
807 assert ((screen.cur.row < TermWin.nrow) 734 assert (screen.cur.row < nrow
808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 735 && 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 736#endif
814 row = screen.cur.row + TermWin.saveLines; 737 int row = screen.cur.row;
815 738
816 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 739 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
817 740
818 stp = screen.text[row]; 741 line_t *line = &ROW(row);
819 srp = screen.rend[row];
820 742
821 while (str < strend) 743 while (str < strend)
822 { 744 {
823 c = *str++; 745 c = *str++;
824 746
825 if (c < 0x20) 747 if (c < 0x20)
826 if (c == C0_LF) 748 if (c == C0_LF)
827 { 749 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */ 750 max_it (line->l, screen.cur.col);
829 MAX_IT (screen.tlen[row], screen.cur.col);
830 751
831 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
832 753
833 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
835 else if (screen.cur.row < (TermWin.nrow - 1)) 756 else if (screen.cur.row < (nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines; 757 row = ++screen.cur.row;
837 758
838 stp = screen.text[row]; /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue; 760 continue;
841 } 761 }
842 else if (c == C0_CR) 762 else if (c == C0_CR)
843 { 763 {
844 if (screen.tlen[row] != -1) /* XXX: think about this */ 764 max_it (line->l, screen.cur.col);
845 MAX_IT (screen.tlen[row], screen.cur.col);
846 765
847 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
848 screen.cur.col = 0; 767 screen.cur.col = 0;
849 continue; 768 continue;
850 } 769 }
… …
867 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
868 } 787 }
869 788
870 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
871 { 790 {
872 screen.tlen[row] = -1; 791 max_it (line->l, ncol);
792 line->is_longer (1);
873 793
874 scr_do_wrap (); 794 scr_do_wrap ();
875 795
876 row = screen.cur.row + TermWin.saveLines; 796 row = screen.cur.row;
877 stp = screen.text[row]; /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
878 srp = screen.rend[row]; /* _must_ refresh */
879 } 798 }
880 799
881 // some utf-8 decoders "decode" surrogate characters: let's fix this. 800 // some utf-8 decoders "decode" surrogate characters: let's fix this.
882 if (IN_RANGE (c, 0xd800, 0xdfff)) 801 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
883 c = 0xfffd; 802 c = 0xfffd;
884 803
885 // rely on wcwidth to tell us the character width, at least for non-latin1 804 // rely on wcwidth to tell us the character width, at least for non-latin1
886 // do wcwidth before further replacements, as wcwidth might return -1 805 // do wcwidth before further replacements, as wcwidth might return -1
887 // for the line drawing characters below as they might be invalid in the current 806 // for the line drawing characters below as they might be invalid in the current
888 // locale. 807 // locale.
889 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
890 809
891 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
892 { 811 {
893 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100 813 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
925 c = 0xfffd; 844 c = 0xfffd;
926# endif 845# endif
927#endif 846#endif
928 847
929 // nuke the character at this position, if required 848 // nuke the character at this position, if required
930 if (stp[screen.cur.col] == NOCHAR 849 if (line->t[screen.cur.col] == NOCHAR
931 || (screen.cur.col < TermWin.ncol - 1 850 || (screen.cur.col < ncol - 1
932 && stp[screen.cur.col + 1] == NOCHAR)) 851 && line->t[screen.cur.col + 1] == NOCHAR))
933 { 852 {
934 int col = screen.cur.col; 853 int col = screen.cur.col;
935 854
936 // find begin 855 // find begin
937 while (col > 0 && stp[col] == NOCHAR) 856 while (col > 0 && line->t[col] == NOCHAR)
938 col--; 857 col--;
939 858
940 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 859 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
941 860
942 // found begin, nuke 861 // found begin, nuke
943 do { 862 do {
944 stp[col] = ' '; 863 line->t[col] = ' ';
945 srp[col] = rend; 864 line->r[col] = rend;
946 col++; 865 col++;
947 } while (col < TermWin.ncol && stp[col] == NOCHAR); 866 } while (col < ncol && line->t[col] == NOCHAR);
948 } 867 }
949 868
950 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951 870
952 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
953 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
954 { 873 {
955 // ...output spaces 874 // ...output spaces
956 c = ' '; 875 c = ' ';
957 // and try the same character next loop iteration 876 // and try the same character next loop iteration
958 --str; 877 --str;
959 } 878 }
960 879
880 line->touch ();
881
961 do 882 do
962 { 883 {
963 stp[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
964 srp[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
965 886
966 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
967 screen.cur.col++; 888 screen.cur.col++;
968 else 889 else
969 { 890 {
970 screen.tlen[row] = last_col; 891 line->l = ncol;
971 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
972 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
973 break; 894 break;
974 } 895 }
975 896
… …
977 } 898 }
978 while (--width > 0); 899 while (--width > 0);
979 900
980 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
981 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
982 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 906 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
983 { 907 {
984 stp[c] = ' '; 908 line->t[c] = ' ';
985 srp[c] = rend; 909 line->r[c] = rend;
986 } 910 }
911 }
987 } 912 }
988 else // width == 0 913 else // width == 0
989 { 914 {
990#if ENABLE_COMBINING 915#if ENABLE_COMBINING
991 // handle combining characters 916 // handle combining characters
992 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
993 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
994 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
995 text_t *tp; 921 text_t *tp;
996 rend_t *rp; 922 rend_t *rp;
997 923
998 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
999 { 925 {
926 linep = line;
1000 tp = stp + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
1001 rp = srp + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
1002
1003 while (*tp == NOCHAR && tp > stp)
1004 tp--, rp--;
1005 } 929 }
1006 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
1007 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 931 && ROW(screen.cur.row - 1).is_longer ())
1008 { 932 {
1009 int line = screen.cur.row - 1 + TermWin.saveLines; 933 linep = &ROW(screen.cur.row - 1);
1010
1011 tp = screen.text[line] + last_col - 1; 934 tp = line->t + ncol - 1;
1012 rp = screen.rend[line] + last_col - 1; 935 rp = line->r + ncol - 1;
1013
1014 while (*tp == NOCHAR && tp > screen.text[line])
1015 tp--, rp--;
1016 } 936 }
1017 else 937 else
1018 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
1019 944
1020 // first try to find a precomposed character 945 // first try to find a precomposed character
1021 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
1022 if (n == NOCHAR) 947 if (n == NOCHAR)
1023 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
1026 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1027#endif 952#endif
1028 } 953 }
1029 } 954 }
1030 955
1031 if (screen.tlen[row] != -1) /* XXX: think about this */ 956 max_it (line->l, screen.cur.col);
1032 MAX_IT (screen.tlen[row], screen.cur.col);
1033 957
1034#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
1035 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
1036#else /* drive with your eyes closed */
1037 MAX_IT (screen.cur.row, 0);
1038#endif 960#endif
1039} 961}
1040 962
1041/* ------------------------------------------------------------------------- */ 963/* ------------------------------------------------------------------------- */
1042/* 964/*
… …
1051 if (screen.cur.col == 0) 973 if (screen.cur.col == 0)
1052 { 974 {
1053 if (screen.cur.row > 0) 975 if (screen.cur.row > 0)
1054 { 976 {
1055#ifdef TERMCAP_HAS_BW 977#ifdef TERMCAP_HAS_BW
1056 screen.cur.col = TermWin.ncol - 1; 978 screen.cur.col = ncol - 1;
1057 screen.cur.row--; 979 screen.cur.row--;
1058 return; 980 return;
1059#endif 981#endif
1060 } 982 }
1061 } 983 }
… …
1081 1003
1082 if (count == 0) 1004 if (count == 0)
1083 return; 1005 return;
1084 else if (count > 0) 1006 else if (count > 0)
1085 { 1007 {
1086 int row = TermWin.saveLines + screen.cur.row; 1008 line_t &l = ROW(screen.cur.row);
1087 text_t *tp = screen.text[row];
1088 rend_t *rp = screen.rend[row];
1089 rend_t base_rend = rp[i]; 1009 rend_t base_rend = l.r[i];
1090 ht &= tp[i] == ' '; 1010 ht &= l.t[i] == ' ';
1091 1011
1092 for (; ++i < TermWin.ncol; ) 1012 for (; ++i < ncol; )
1093 if (tabs[i]) 1013 if (tabs[i])
1094 { 1014 {
1095 x = i; 1015 x = i;
1016
1096 if (!--count) 1017 if (!--count)
1097 break; 1018 break;
1098 } 1019 }
1099 else 1020 else
1100 ht &= tp[i] == ' ' 1021 ht &= l.t[i] == ' '
1101 && RS_SAME (rp[i], base_rend); 1022 && RS_SAME (l.r[i], base_rend);
1102 1023
1103 if (count) 1024 if (count)
1104 x = TermWin.ncol - 1; 1025 x = ncol - 1;
1105 1026
1106 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1107 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1108 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1109 { 1030 {
1110 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1111 1032
1112 if (screen.tlen[row] != -1) /* XXX: think about this */ 1033 l.touch (x);
1113 MAX_IT (screen.tlen[row], x);
1114 1034
1115 i = screen.cur.col; 1035 i = screen.cur.col;
1116 1036
1117 tp[i] = '\t'; 1037 l.t[i] = '\t';
1118 rp[i] = base_rend; 1038 l.r[i] = base_rend;
1119 1039
1120 while (++i < x) 1040 while (++i < x)
1121 { 1041 {
1122 tp[i] = NOCHAR; 1042 l.t[i] = NOCHAR;
1123 rp[i] = base_rend; 1043 l.r[i] = base_rend;
1124 } 1044 }
1125 } 1045 }
1126 } 1046 }
1127 else /* if (count < 0) */ 1047 else /* if (count < 0) */
1128 { 1048 {
… …
1154rxvt_term::scr_backindex () 1074rxvt_term::scr_backindex ()
1155{ 1075{
1156 if (screen.cur.col > 0) 1076 if (screen.cur.col > 0)
1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1158 else 1078 else
1159 {
1160 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1161 return; /* um, yeah? */
1162
1163 scr_insdel_chars (1, INSERT); 1079 scr_insdel_chars (1, INSERT);
1164 }
1165} 1080}
1166#endif 1081#endif
1167/* ------------------------------------------------------------------------- */ 1082/* ------------------------------------------------------------------------- */
1168/* 1083/*
1169 * Process DEC Forward Index 1084 * Process DEC Forward Index
… …
1173 */ 1088 */
1174#if ENABLE_FRILLS 1089#if ENABLE_FRILLS
1175void 1090void
1176rxvt_term::scr_forwardindex () 1091rxvt_term::scr_forwardindex ()
1177{ 1092{
1178 int row;
1179
1180 if (screen.cur.col < TermWin.ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1182 else 1095 else
1183 { 1096 {
1184 row = screen.cur.row + TermWin.saveLines; 1097 line_t &l = ROW(screen.cur.row);
1185 1098
1186 if (screen.tlen[row] == 0) 1099 l.touch ();
1187 return; /* um, yeah? */ 1100 l.is_longer (0);
1188 else if (screen.tlen[row] == -1)
1189 screen.tlen[row] = TermWin.ncol;
1190 1101
1191 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1192 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1193 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1194 } 1105 }
1195} 1106}
1196#endif 1107#endif
1197 1108
1198/* ------------------------------------------------------------------------- */ 1109/* ------------------------------------------------------------------------- */
… …
1204{ 1115{
1205 want_refresh = 1; 1116 want_refresh = 1;
1206 ZERO_SCROLLBACK (); 1117 ZERO_SCROLLBACK ();
1207 1118
1208 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1209 MAX_IT (screen.cur.col, 0); 1120 clamp_it (screen.cur.col, 0, ncol - 1);
1210 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1211 1121
1212 screen.flags &= ~Screen_WrapNext; 1122 screen.flags &= ~Screen_WrapNext;
1213 1123
1214 if (relative & R_RELATIVE) 1124 if (relative & R_RELATIVE)
1215 { 1125 {
… …
1233 else 1143 else
1234 { 1144 {
1235 if (screen.flags & Screen_Relative) 1145 if (screen.flags & Screen_Relative)
1236 { /* relative origin mode */ 1146 { /* relative origin mode */
1237 screen.cur.row = row + screen.tscroll; 1147 screen.cur.row = row + screen.tscroll;
1238 MIN_IT (screen.cur.row, screen.bscroll); 1148 min_it (screen.cur.row, screen.bscroll);
1239 } 1149 }
1240 else 1150 else
1241 screen.cur.row = row; 1151 screen.cur.row = row;
1242 } 1152 }
1243 1153
1244 MAX_IT (screen.cur.row, 0); 1154 clamp_it (screen.cur.row, 0, nrow - 1);
1245 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1246} 1155}
1247 1156
1248/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1249/* 1158/*
1250 * direction should be UP or DN 1159 * direction should be UP or DN
… …
1261 1170
1262 screen.flags &= ~Screen_WrapNext; 1171 screen.flags &= ~Screen_WrapNext;
1263 1172
1264 if ((screen.cur.row == screen.bscroll && direction == UP) 1173 if ((screen.cur.row == screen.bscroll && direction == UP)
1265 || (screen.cur.row == screen.tscroll && direction == DN)) 1174 || (screen.cur.row == screen.tscroll && direction == DN))
1266 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1175 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1267 else 1176 else
1268 screen.cur.row += dirn; 1177 screen.cur.row += dirn;
1269 1178
1270 MAX_IT (screen.cur.row, 0); 1179 clamp_it (screen.cur.row, 0, nrow - 1);
1271 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1272 selection_check (0); 1180 selection_check (0);
1273} 1181}
1274 1182
1275/* ------------------------------------------------------------------------- */ 1183/* ------------------------------------------------------------------------- */
1276/* 1184/*
… …
1280 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1281 */ 1189 */
1282void 1190void
1283rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1284{ 1192{
1285 unsigned int row, col, num; 1193 unsigned int col, num;
1286 1194
1287 want_refresh = 1; 1195 want_refresh = 1;
1288 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1289 1197
1290 selection_check (1); 1198 selection_check (1);
1291 1199
1292 row = TermWin.saveLines + screen.cur.row; 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1204
1293 switch (mode) 1205 switch (mode)
1294 { 1206 {
1295 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1296 col = screen.cur.col; 1208 col = screen.cur.col;
1297 num = TermWin.ncol - col; 1209 num = ncol - col;
1298 MIN_IT (screen.tlen[row], (int16_t)col); 1210 min_it (line.l, col);
1299 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1211 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1300 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1212 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1301 CLEAR_SELECTION (); 1213 CLEAR_SELECTION ();
1302 break; 1214 break;
1303 case 1: /* erase to beginning of line */ 1215 case 1: /* erase to beginning of line */
… …
1307 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1219 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1308 CLEAR_SELECTION (); 1220 CLEAR_SELECTION ();
1309 break; 1221 break;
1310 case 2: /* erase whole line */ 1222 case 2: /* erase whole line */
1311 col = 0; 1223 col = 0;
1312 num = TermWin.ncol; 1224 num = ncol;
1313 screen.tlen[row] = 0; 1225 line.l = 0;
1314 if (selection.beg.row <= screen.cur.row 1226 if (selection.beg.row <= screen.cur.row
1315 && selection.end.row >= screen.cur.row) 1227 && selection.end.row >= screen.cur.row)
1316 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1317 break; 1229 break;
1318 default: 1230 default:
1319 return; 1231 return;
1320 } 1232 }
1321 1233
1322 if (screen.text[row]) 1234 scr_blank_line (line, col, num, rstyle);
1323 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1324 else
1325 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1326} 1235}
1327 1236
1328/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1329/* 1238/*
1330 * Erase part of whole of the screen 1239 * Erase part of whole of the screen
… …
1334 */ 1243 */
1335void 1244void
1336rxvt_term::scr_erase_screen (int mode) 1245rxvt_term::scr_erase_screen (int mode)
1337{ 1246{
1338 int num; 1247 int num;
1339 int32_t row, row_offset; 1248 int32_t row;
1340 rend_t ren; 1249 rend_t ren;
1341 XGCValues gcvalue; 1250 XGCValues gcvalue;
1342 1251
1343 want_refresh = 1; 1252 want_refresh = 1;
1344 ZERO_SCROLLBACK (); 1253 ZERO_SCROLLBACK ();
1345
1346 row_offset = (int32_t)TermWin.saveLines;
1347 1254
1348 switch (mode) 1255 switch (mode)
1349 { 1256 {
1350 case 0: /* erase to end of screen */ 1257 case 0: /* erase to end of screen */
1351 selection_check (1); 1258 selection_check (1);
1352 scr_erase_line (0); 1259 scr_erase_line (0);
1353 row = screen.cur.row + 1; /* possible OOB */ 1260 row = screen.cur.row + 1; /* possible OOB */
1354 num = TermWin.nrow - row; 1261 num = nrow - row;
1355 break; 1262 break;
1356 case 1: /* erase to beginning of screen */ 1263 case 1: /* erase to beginning of screen */
1357 selection_check (3); 1264 selection_check (3);
1358 scr_erase_line (1); 1265 scr_erase_line (1);
1359 row = 0; 1266 row = 0;
1360 num = screen.cur.row; 1267 num = screen.cur.row;
1361 break; 1268 break;
1362 case 2: /* erase whole screen */ 1269 case 2: /* erase whole screen */
1363 selection_check (3); 1270 selection_check (3);
1364 row = 0; 1271 row = 0;
1365 num = TermWin.nrow; 1272 num = nrow;
1366 break; 1273 break;
1367 default: 1274 default:
1368 return; 1275 return;
1369 } 1276 }
1370 1277
… …
1372 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1279 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1373 || (selection.end.row >= row 1280 || (selection.end.row >= row
1374 && selection.end.row <= row + num))) 1281 && selection.end.row <= row + num)))
1375 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1376 1283
1377 if (row >= TermWin.nrow) /* Out Of Bounds */ 1284 if (row >= nrow) /* Out Of Bounds */
1378 return; 1285 return;
1379 1286
1380 MIN_IT (num, (TermWin.nrow - row)); 1287 min_it (num, nrow - row);
1381 1288
1382 if (rstyle & (RS_RVid | RS_Uline)) 1289 if (rstyle & (RS_RVid | RS_Uline))
1383 ren = (rend_t) ~RS_None; 1290 ren = (rend_t) ~RS_None;
1384 else if (GET_BASEBG (rstyle) == Color_bg) 1291 else if (GET_BASEBG (rstyle) == Color_bg)
1385 { 1292 {
… …
1387 CLEAR_ROWS (row, num); 1294 CLEAR_ROWS (row, num);
1388 } 1295 }
1389 else 1296 else
1390 { 1297 {
1391 ren = rstyle & (RS_fgMask | RS_bgMask); 1298 ren = rstyle & (RS_fgMask | RS_bgMask);
1392 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1394 ERASE_ROWS (row, num); 1301 ERASE_ROWS (row, num);
1395 gcvalue.foreground = pix_colors[Color_fg]; 1302 gcvalue.foreground = pix_colors[Color_fg];
1396 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1397 } 1304 }
1398 1305
1399 for (; num--; row++) 1306 for (; num--; row++)
1400 { 1307 {
1401 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1308 line_t &l = ROW(row);
1402 screen.tlen[row + row_offset] = 0; 1309 l.l = 0;
1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1310 l.is_longer (0);
1311 scr_blank_screen_mem (l, rstyle);
1312 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1404 } 1313 }
1405} 1314}
1406 1315
1407#if ENABLE_FRILLS 1316#if ENABLE_FRILLS
1408void 1317void
1409rxvt_term::scr_erase_savelines () 1318rxvt_term::scr_erase_savelines ()
1410{ 1319{
1411 want_refresh = 1; 1320 want_refresh = 1;
1412 ZERO_SCROLLBACK (); 1321 ZERO_SCROLLBACK ();
1413 1322
1414 TermWin.nscrolled = 0; 1323 nsaved = 0;
1415} 1324}
1416#endif 1325#endif
1417 1326
1418/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1419/* 1328/*
… …
1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1330 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1422 */ 1331 */
1423void 1332void
1424rxvt_term::scr_E () 1333rxvt_term::scr_E ()
1425{ 1334{
1426 int i, j, k;
1427 rend_t *r1, fs; 1335 rend_t fs;
1428 1336
1429 want_refresh = 1; 1337 want_refresh = 1;
1430 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1431 1339
1432 num_scr_allow = 0; 1340 num_scr_allow = 0;
1433 selection_check (3); 1341 selection_check (3);
1434 1342
1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1343 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1436 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1344 for (int row = nrow; row--; )
1437 { 1345 {
1438 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1346 line_t &line = ROW(row);
1347
1439 fill_text (screen.text[k], 'E', TermWin.ncol); 1348 fill_text (line.t, 'E', ncol);
1440 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1349 rend_t *r1 = line.r;
1350
1351 for (int j = ncol; j--; )
1441 *r1++ = fs; 1352 *r1++ = fs;
1353
1354 line.is_longer (0);
1355 line.touch (ncol);
1442 } 1356 }
1443} 1357}
1444 1358
1445/* ------------------------------------------------------------------------- */ 1359/* ------------------------------------------------------------------------- */
1446/* 1360/*
… …
1467 count = end; 1381 count = end;
1468 } 1382 }
1469 1383
1470 scr_do_wrap (); 1384 scr_do_wrap ();
1471 1385
1472 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1386 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1473} 1387}
1474 1388
1475/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1476/* 1390/*
1477 * Insert/Delete <count> characters from the current position 1391 * Insert/Delete <count> characters from the current position
… …
1479void 1393void
1480rxvt_term::scr_insdel_chars (int count, int insdel) 1394rxvt_term::scr_insdel_chars (int count, int insdel)
1481{ 1395{
1482 int col, row; 1396 int col, row;
1483 rend_t tr; 1397 rend_t tr;
1484 text_t *stp;
1485 rend_t *srp;
1486 int16_t *slp;
1487 1398
1488 want_refresh = 1; 1399 want_refresh = 1;
1489 ZERO_SCROLLBACK (); 1400 ZERO_SCROLLBACK ();
1490 1401
1491 if (count <= 0) 1402 if (count <= 0)
1492 return; 1403 return;
1493 1404
1494 scr_do_wrap (); 1405 scr_do_wrap ();
1495 1406
1496 selection_check (1); 1407 selection_check (1);
1497 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1408 min_it (count, ncol - screen.cur.col);
1498 1409
1499 row = screen.cur.row + TermWin.saveLines;
1500
1501 stp = screen.text[row];
1502 srp = screen.rend[row]; 1410 row = screen.cur.row;
1503 slp = &screen.tlen[row]; 1411
1412 line_t *line = &ROW(row);
1413
1414 line->touch ();
1415 line->is_longer (0);
1504 1416
1505 switch (insdel) 1417 switch (insdel)
1506 { 1418 {
1507 case INSERT: 1419 case INSERT:
1508 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1420 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1509 { 1421 {
1510 stp[col] = stp[col - count]; 1422 line->t[col] = line->t[col - count];
1511 srp[col] = srp[col - count]; 1423 line->r[col] = line->r[col - count];
1512 } 1424 }
1513 1425
1514 if (*slp != -1) 1426 line->l = min (line->l + count, ncol);
1515 {
1516 *slp += count;
1517 MIN_IT (*slp, TermWin.ncol);
1518 }
1519 1427
1520 if (selection.op && current_screen == selection.screen 1428 if (selection.op && current_screen == selection.screen
1521 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1522 { 1430 {
1523 if (selection.end.row != screen.cur.row 1431 if (selection.end.row != screen.cur.row
1524 || (selection.end.col + count >= TermWin.ncol)) 1432 || (selection.end.col + count >= ncol))
1525 CLEAR_SELECTION (); 1433 CLEAR_SELECTION ();
1526 else 1434 else
1527 { /* shift selection */ 1435 { /* shift selection */
1528 selection.beg.col += count; 1436 selection.beg.col += count;
1529 selection.mark.col += count; /* XXX: yes? */ 1437 selection.mark.col += count; /* XXX: yes? */
1530 selection.end.col += count; 1438 selection.end.col += count;
1531 } 1439 }
1532 } 1440 }
1533 1441
1534 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1442 scr_blank_line (*line, screen.cur.col, count, rstyle);
1535 (unsigned int)count, rstyle);
1536 break; 1443 break;
1537 1444
1538 case ERASE: 1445 case ERASE:
1539 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1446 screen.cur.col += count; /* don't worry if > ncol */
1540 selection_check (1); 1447 selection_check (1);
1541 screen.cur.col -= count; 1448 screen.cur.col -= count;
1542 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1449
1543 (unsigned int)count, rstyle); 1450 line->l = max (line->l - count, 0);
1451 scr_blank_line (*line, screen.cur.col, count, rstyle);
1544 break; 1452 break;
1545 1453
1546 case DELETE: 1454 case DELETE:
1547 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1455 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1548 1456
1549 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1457 for (col = screen.cur.col; (col + count) < ncol; col++)
1550 { 1458 {
1551 stp[col] = stp[col + count]; 1459 line->t[col] = line->t[col + count];
1552 srp[col] = srp[col + count]; 1460 line->r[col] = line->r[col + count];
1553 } 1461 }
1554 1462
1555 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1463 line->l = max (line->l - count, 0);
1556 (unsigned int)count, tr); 1464 scr_blank_line (*line, ncol - count, count, tr);
1557
1558 if (*slp == -1) /* break line continuation */
1559 *slp = TermWin.ncol;
1560
1561 *slp -= count;
1562 MAX_IT (*slp, 0);
1563 1465
1564 if (selection.op && current_screen == selection.screen 1466 if (selection.op && current_screen == selection.screen
1565 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1566 { 1468 {
1567 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
1568 || (screen.cur.col >= selection.beg.col - count) 1470 || (screen.cur.col >= selection.beg.col - count)
1569 || selection.end.col >= TermWin.ncol) 1471 || selection.end.col >= ncol)
1570 CLEAR_SELECTION (); 1472 CLEAR_SELECTION ();
1571 else 1473 else
1572 { 1474 {
1573 /* shift selection */ 1475 /* shift selection */
1574 selection.beg.col -= count; 1476 selection.beg.col -= count;
… …
1587 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1489 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1588 */ 1490 */
1589void 1491void
1590rxvt_term::scr_scroll_region (int top, int bot) 1492rxvt_term::scr_scroll_region (int top, int bot)
1591{ 1493{
1592 MAX_IT (top, 0); 1494 max_it (top, 0);
1593 MIN_IT (bot, (int)TermWin.nrow - 1); 1495 min_it (bot, nrow - 1);
1594 1496
1595 if (top > bot) 1497 if (top > bot)
1596 return; 1498 return;
1597 1499
1598 screen.tscroll = top; 1500 screen.tscroll = top;
… …
1677 */ 1579 */
1678void 1580void
1679rxvt_term::scr_set_tab (int mode) 1581rxvt_term::scr_set_tab (int mode)
1680{ 1582{
1681 if (mode < 0) 1583 if (mode < 0)
1682 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1584 memset (tabs, 0, ncol * sizeof (char));
1683 else if (screen.cur.col < TermWin.ncol) 1585 else if (screen.cur.col < ncol)
1684 tabs[screen.cur.col] = (mode ? 1 : 0); 1586 tabs [screen.cur.col] = !!mode;
1685} 1587}
1686 1588
1687/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1688/* 1590/*
1689 * Set reverse/normal video 1591 * Set reverse/normal video
… …
1696 XGCValues gcvalue; 1598 XGCValues gcvalue;
1697 1599
1698 if (rvideo != mode) 1600 if (rvideo != mode)
1699 { 1601 {
1700 rvideo = mode; 1602 rvideo = mode;
1701 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1603 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1702#if XPM_BACKGROUND 1604#if XPM_BACKGROUND
1703 if (bgPixmap.pixmap == None) 1605 if (bgPixmap.pixmap == None)
1704#endif 1606#endif
1705#if TRANSPARENT 1607#if TRANSPARENT
1706 if (! (options & Opt_transparent) || am_transparent == 0) 1608 if (! OPTION (Opt_transparent) || am_transparent == 0)
1707#endif 1609#endif
1708 XSetWindowBackground (display->display, TermWin.vt, 1610 XSetWindowBackground (display->display, vt,
1709 pix_colors[Color_bg]); 1611 pix_colors[Color_bg]);
1710 1612
1711 gcvalue.foreground = pix_colors[Color_fg]; 1613 gcvalue.foreground = pix_colors[Color_fg];
1712 gcvalue.background = pix_colors[Color_bg]; 1614 gcvalue.background = pix_colors[Color_bg];
1713 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1615 XChangeGC (display->display, gc, GCBackground | GCForeground,
1714 &gcvalue); 1616 &gcvalue);
1715 scr_clear (); 1617 scr_clear ();
1716 scr_touch (true); 1618 scr_touch (true);
1717 } 1619 }
1718} 1620}
… …
1736 * Set font style 1638 * Set font style
1737 */ 1639 */
1738void 1640void
1739rxvt_term::set_font_style () 1641rxvt_term::set_font_style ()
1740{ 1642{
1643#if 0
1741 switch (charsets[screen.charset]) 1644 switch (charsets [screen.charset])
1742 { 1645 {
1743 case '0': /* DEC Special Character & Line Drawing Set */ 1646 case '0': /* DEC Special Character & Line Drawing Set */
1744 break; 1647 break;
1745 case 'A': /* United Kingdom (UK) */ 1648 case 'A': /* United Kingdom (UK) */
1746 break; 1649 break;
… …
1753 case 'C': /* Finnish character set */ 1656 case 'C': /* Finnish character set */
1754 break; 1657 break;
1755 case 'K': /* German character set */ 1658 case 'K': /* German character set */
1756 break; 1659 break;
1757 } 1660 }
1661#endif
1758} 1662}
1759 1663
1760/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
1761/* 1665/*
1762 * Choose a font 1666 * Choose a font
… …
1799bool 1703bool
1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1704rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1801{ 1705{
1802 bool found = false; 1706 bool found = false;
1803 1707
1804 for (int i = 0; i < TermWin.nrow; i++) 1708 for (int i = 0; i < nrow; i++)
1805 { 1709 {
1806 int col = 0; 1710 int col = 0;
1807 rend_t *drp = drawn_rend [i]; 1711 rend_t *drp = drawn_buf[i].r;
1808 1712
1809 for (; col < TermWin.ncol; col++, drp++) 1713 for (; col < ncol; col++, drp++)
1810 if ((*drp & mask) == value) 1714 if ((*drp & mask) == value)
1811 { 1715 {
1812 found = true; 1716 found = true;
1813 *drp = ~value; 1717 *drp = ~value;
1814 } 1718 }
… …
1825 PART_END, 1729 PART_END,
1826 RC_COUNT 1730 RC_COUNT
1827}; 1731};
1828 1732
1829void 1733void
1830rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1734rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1831{ 1735{
1832 int i; 1736 int i;
1833 row_col_t rc[RC_COUNT]; 1737 row_col_t rc[RC_COUNT];
1834 1738
1835 if (drawn_text == NULL) /* sanity check */ 1739 if (!drawn_buf) /* sanity check */
1836 return; 1740 return;
1837 1741
1838#ifndef NO_SLOW_LINK_SUPPORT 1742#ifndef NO_SLOW_LINK_SUPPORT
1839 if (refresh_type == FAST_REFRESH && !display->is_local) 1743 if (refresh_type == FAST_REFRESH && !display->is_local)
1840 { 1744 {
1841 y = 0; 1745 y = 0;
1842 height = TermWin.height; 1746 eheight = height;
1843 } 1747 }
1844#endif
1845
1846#ifdef DEBUG_STRICT
1847 x = max (x, 0);
1848 x = min (x, (int)TermWin.width);
1849 y = max (y, 0);
1850 y = min (y, (int)TermWin.height);
1851#endif 1748#endif
1852 1749
1853 /* round down */ 1750 /* round down */
1854 rc[PART_BEG].col = Pixel2Col (x); 1751 rc[PART_BEG].col = Pixel2Col (x);
1855 rc[PART_BEG].row = Pixel2Row (y); 1752 rc[PART_BEG].row = Pixel2Row (y);
1856 /* round up */ 1753 /* round up */
1857 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1754 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1858 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1755 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1859 1756
1860 /* sanity checks */ 1757 /* sanity checks */
1861 for (i = PART_BEG; i < RC_COUNT; i++) 1758 for (i = PART_BEG; i < RC_COUNT; i++)
1862 { 1759 {
1863 MIN_IT (rc[i].col, TermWin.ncol - 1); 1760 min_it (rc[i].col, ncol - 1);
1864 MIN_IT (rc[i].row, TermWin.nrow - 1); 1761 min_it (rc[i].row, nrow - 1);
1865 } 1762 }
1866 1763
1867 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1764 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1868 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1765 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1869 1766
1870 if (refresh) 1767 if (refresh)
1871 scr_refresh (SLOW_REFRESH); 1768 scr_refresh (SLOW_REFRESH);
1872} 1769}
1873 1770
… …
1876 * Refresh the entire screen 1773 * Refresh the entire screen
1877 */ 1774 */
1878void 1775void
1879rxvt_term::scr_touch (bool refresh) 1776rxvt_term::scr_touch (bool refresh)
1880{ 1777{
1881 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1778 scr_expose (0, 0, width, height, refresh);
1882} 1779}
1883 1780
1884/* ------------------------------------------------------------------------- */ 1781/* ------------------------------------------------------------------------- */
1885/* 1782/*
1886 * Move the display so that the line represented by scrollbar value Y is at 1783 * Move the display so that the line represented by scrollbar value Y is at
… …
1890rxvt_term::scr_move_to (int y, int len) 1787rxvt_term::scr_move_to (int y, int len)
1891{ 1788{
1892 long p = 0; 1789 long p = 0;
1893 unsigned int oldviewstart; 1790 unsigned int oldviewstart;
1894 1791
1895 oldviewstart = TermWin.view_start; 1792 oldviewstart = view_start;
1896 1793
1897 if (y < len) 1794 if (y < len)
1898 { 1795 {
1899 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1796 p = (nrow + nsaved) * (len - y) / len;
1900 p -= (long) (TermWin.nrow - 1); 1797 p -= (long) (nrow - 1);
1901 p = max (p, 0); 1798 p = max (p, 0);
1902 } 1799 }
1903 1800
1904 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1801 view_start = (unsigned int)min (p, nsaved);
1905 1802
1906 return scr_changeview (oldviewstart); 1803 return scr_changeview (oldviewstart);
1907} 1804}
1908 1805
1909/* ------------------------------------------------------------------------- */ 1806/* ------------------------------------------------------------------------- */
… …
1915rxvt_term::scr_page (enum page_dirn direction, int nlines) 1812rxvt_term::scr_page (enum page_dirn direction, int nlines)
1916{ 1813{
1917 int n; 1814 int n;
1918 unsigned int oldviewstart; 1815 unsigned int oldviewstart;
1919 1816
1920 oldviewstart = TermWin.view_start; 1817 oldviewstart = view_start;
1921 1818
1922 if (direction == UP) 1819 if (direction == UP)
1923 { 1820 {
1924 n = TermWin.view_start + nlines; 1821 n = view_start + nlines;
1925 TermWin.view_start = min (n, TermWin.nscrolled); 1822 view_start = min (n, nsaved);
1926 } 1823 }
1927 else 1824 else
1928 { 1825 {
1929 n = TermWin.view_start - nlines; 1826 n = view_start - nlines;
1930 TermWin.view_start = max (n, 0); 1827 view_start = max (n, 0);
1931 } 1828 }
1932 1829
1933 return scr_changeview (oldviewstart); 1830 return scr_changeview (oldviewstart);
1934} 1831}
1935 1832
1936int 1833int
1937rxvt_term::scr_changeview (unsigned int oldviewstart) 1834rxvt_term::scr_changeview (unsigned int oldviewstart)
1938{ 1835{
1939 if (TermWin.view_start != oldviewstart) 1836 if (view_start != oldviewstart)
1940 { 1837 {
1838 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839
1941 want_refresh = 1; 1840 want_refresh = 1;
1942 num_scr -= (TermWin.view_start - oldviewstart); 1841 num_scr -= (view_start - oldviewstart);
1943 } 1842 }
1944 1843
1945 return (int) (TermWin.view_start - oldviewstart); 1844 return (int)view_start - (int)oldviewstart;
1946} 1845}
1947 1846
1948/* ------------------------------------------------------------------------- */ 1847/* ------------------------------------------------------------------------- */
1949void 1848void
1950rxvt_term::scr_bell () 1849rxvt_term::scr_bell ()
1951{ 1850{
1952#ifndef NO_BELL 1851#ifndef NO_BELL
1953 1852
1954# ifndef NO_MAPALERT 1853# ifndef NO_MAPALERT
1955# ifdef MAPALERT_OPTION 1854# ifdef MAPALERT_OPTION
1956 if (options & Opt_mapAlert) 1855 if (OPTION (Opt_mapAlert))
1957# endif 1856# endif
1958 XMapWindow (display->display, TermWin.parent[0]); 1857 XMapWindow (display->display, parent[0]);
1959# endif 1858# endif
1960 1859
1961 if (options & Opt_visualBell) 1860 if (OPTION (Opt_visualBell))
1962 { 1861 {
1963 scr_rvideo_mode (!rvideo); /* refresh also done */ 1862 scr_rvideo_mode (!rvideo); /* refresh also done */
1964 rxvt_usleep (VISUAL_BELL_DURATION); 1863 rxvt_usleep (VISUAL_BELL_DURATION);
1965 scr_rvideo_mode (!rvideo); /* refresh also done */ 1864 scr_rvideo_mode (!rvideo); /* refresh also done */
1966 } 1865 }
… …
1974/* ARGSUSED */ 1873/* ARGSUSED */
1975void 1874void
1976rxvt_term::scr_printscreen (int fullhist) 1875rxvt_term::scr_printscreen (int fullhist)
1977{ 1876{
1978#ifdef PRINTPIPE 1877#ifdef PRINTPIPE
1979 int i, r1, nrows, row_offset; 1878 int nrows, row_start;
1980 FILE *fd; 1879 FILE *fd;
1981 1880
1982 if ((fd = popen_printer ()) == NULL) 1881 if ((fd = popen_printer ()) == NULL)
1983 return; 1882 return;
1984 1883
1985 nrows = TermWin.nrow;
1986 row_offset = TermWin.saveLines;
1987
1988 if (!fullhist) 1884 if (fullhist)
1989 row_offset -= TermWin.view_start; 1885 {
1886 nrows = nrow + nsaved;
1887 row_start = -nsaved;
1888 }
1990 else 1889 else
1991 { 1890 {
1992 nrows += TermWin.nscrolled; 1891 nrows = nrow;
1993 row_offset -= TermWin.nscrolled; 1892 row_start = -view_start;
1994 } 1893 }
1995 1894
1996 wctomb (0, 0); 1895 wctomb (0, 0);
1997 1896
1998 for (r1 = 0; r1 < nrows; r1++) 1897 for (int r1 = 0; r1 < nrows; r1++)
1999 { 1898 {
2000 text_t *tp = screen.text[r1 + row_offset]; 1899 text_t *tp = ROW(r1).t;
2001 int len = screen.tlen[r1 + row_offset]; 1900 int len = ROW(r1).l;
2002 1901
2003 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1902 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
2004 { 1903 {
2005 char mb[MB_LEN_MAX]; 1904 char mb[MB_LEN_MAX];
2006 text_t t = *tp++; 1905 text_t t = *tp++;
2007 if (t == NOCHAR) 1906 if (t == NOCHAR)
2008 continue; 1907 continue;
… …
2036{ 1935{
2037 unsigned char must_clear, /* use draw_string not draw_image_string */ 1936 unsigned char must_clear, /* use draw_string not draw_image_string */
2038 showcursor; /* show the cursor */ 1937 showcursor; /* show the cursor */
2039 int16_t col, row, /* column/row we're processing */ 1938 int16_t col, row, /* column/row we're processing */
2040 ocrow; /* old cursor row */ 1939 ocrow; /* old cursor row */
2041 int i, /* tmp */ 1940 int i; /* tmp */
2042 row_offset; /* basic offset in screen structure */
2043#ifndef NO_CURSORCOLOR 1941#ifndef NO_CURSORCOLOR
2044 rend_t cc1; /* store colours at cursor position (s) */ 1942 rend_t cc1; /* store colours at cursor position (s) */
2045#endif 1943#endif
2046 rend_t *crp; // cursor rendition pointer 1944 rend_t *crp; // cursor rendition pointer
2047 1945
2048 want_refresh = 0; /* screen is current */ 1946 want_refresh = 0; /* screen is current */
2049 1947
2050 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1948 if (refresh_type == NO_REFRESH || !mapped)
2051 return; 1949 return;
2052 1950
2053 /* 1951 /*
2054 * A: set up vars 1952 * A: set up vars
2055 */ 1953 */
2056 must_clear = 0; 1954 must_clear = 0;
2057 refresh_count = 0; 1955 refresh_count = 0;
2058 1956
2059 row_offset = TermWin.saveLines - TermWin.view_start;
2060
2061#if XPM_BACKGROUND 1957#if XPM_BACKGROUND
2062 must_clear |= bgPixmap.pixmap != None; 1958 must_clear |= bgPixmap.pixmap != None;
2063#endif 1959#endif
2064#if TRANSPARENT 1960#if TRANSPARENT
2065 must_clear |= (options & Opt_transparent) && am_transparent; 1961 must_clear |= OPTION (Opt_transparent) && am_transparent;
2066#endif 1962#endif
2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2068 1964
2069 /* 1965 /*
2070 * B: reverse any characters which are selected 1966 * B: reverse any characters which are selected
… …
2087 1983
2088 if (showcursor) 1984 if (showcursor)
2089 { 1985 {
2090 int col = screen.cur.col; 1986 int col = screen.cur.col;
2091 1987
2092 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 1988 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2093 col--; 1989 col--;
2094 1990
2095 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 1991 crp = &ROW(screen.cur.row).r[col];
2096 1992
2097 if (showcursor && TermWin.focus) 1993 if (showcursor && focus)
2098 { 1994 {
2099 if (options & Opt_cursorUnderline) 1995 if (OPTION (Opt_cursorUnderline))
2100 *crp ^= RS_Uline; 1996 *crp ^= RS_Uline;
2101 else 1997 else
2102 { 1998 {
2103 *crp ^= RS_RVid; 1999 *crp ^= RS_RVid;
2104 2000
… …
2106 cc1 = *crp & (RS_fgMask | RS_bgMask); 2002 cc1 = *crp & (RS_fgMask | RS_bgMask);
2107 if (ISSET_PIXCOLOR (Color_cursor)) 2003 if (ISSET_PIXCOLOR (Color_cursor))
2108 ccol1 = Color_cursor; 2004 ccol1 = Color_cursor;
2109 else 2005 else
2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2006#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2111 ccol1 = GET_FGCOLOR (rstyle); 2007 ccol1 = fgcolor_of (rstyle);
2112#else 2008#else
2113 ccol1 = Color_fg; 2009 ccol1 = Color_fg;
2114#endif 2010#endif
2115 if (ISSET_PIXCOLOR (Color_cursor2)) 2011 if (ISSET_PIXCOLOR (Color_cursor2))
2116 ccol2 = Color_cursor2; 2012 ccol2 = Color_cursor2;
2117 else 2013 else
2118#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2119 ccol2 = GET_BGCOLOR (rstyle); 2015 ccol2 = bgcolor_of (rstyle);
2120#else 2016#else
2121 ccol2 = Color_bg; 2017 ccol2 = Color_bg;
2122#endif 2018#endif
2123 *crp = SET_FGCOLOR (*crp, ccol1); 2019 *crp = SET_FGCOLOR (*crp, ccol1);
2124 *crp = SET_BGCOLOR (*crp, ccol2); 2020 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2129 2025
2130 /* make sure no outline cursor is left around */ 2026 /* make sure no outline cursor is left around */
2131 setoldcursor = 0; 2027 setoldcursor = 0;
2132 if (ocrow != -1) 2028 if (ocrow != -1)
2133 { 2029 {
2134 if (screen.cur.row + TermWin.view_start != ocrow 2030 if (screen.cur.row + view_start != ocrow
2135 || screen.cur.col != oldcursor.col) 2031 || screen.cur.col != oldcursor.col)
2136 { 2032 {
2137 if (ocrow < TermWin.nrow 2033 if (ocrow < nrow
2138 && oldcursor.col < TermWin.ncol) 2034 && oldcursor.col < ncol)
2139 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2035 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2140 2036
2141 if (TermWin.focus || !showcursor) 2037 if (focus || !showcursor)
2142 oldcursor.row = -1; 2038 oldcursor.row = -1;
2143 else 2039 else
2144 setoldcursor = 1; 2040 setoldcursor = 1;
2145 } 2041 }
2146 } 2042 }
2147 else if (!TermWin.focus) 2043 else if (!focus)
2148 setoldcursor = 1; 2044 setoldcursor = 1;
2149 2045
2150 if (setoldcursor) 2046 if (setoldcursor)
2151 { 2047 {
2152 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2048 if (screen.cur.row + view_start >= nrow)
2153 oldcursor.row = -1; 2049 oldcursor.row = -1;
2154 else 2050 else
2155 { 2051 {
2156 oldcursor.row = screen.cur.row + TermWin.view_start; 2052 oldcursor.row = screen.cur.row + view_start;
2157 oldcursor.col = screen.cur.col; 2053 oldcursor.col = screen.cur.col;
2158 } 2054 }
2159 } 2055 }
2160 } 2056 }
2161 2057
2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2162#if ENABLE_OVERLAY 2059#if ENABLE_OVERLAY
2163 scr_swap_overlay (); 2060 scr_swap_overlay ();
2164#endif 2061#endif
2165
2166 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2167 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2168 2062
2169#ifndef NO_SLOW_LINK_SUPPORT 2063#ifndef NO_SLOW_LINK_SUPPORT
2170 /* 2064 /*
2171 * D: CopyArea pass - very useful for slower links 2065 * D: CopyArea pass - very useful for slower links
2172 * This has been deliberately kept simple. 2066 * This has been deliberately kept simple.
2173 */ 2067 */
2174 i = num_scr; 2068 i = num_scr;
2175 if (!display->is_local 2069 if (!display->is_local
2176 && refresh_type == FAST_REFRESH && num_scr_allow && i 2070 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2177 && abs (i) < TermWin.nrow && !must_clear) 2071 && abs (num_scr) < nrow && !must_clear)
2178 { 2072 {
2179 int16_t nits; 2073 int16_t nits;
2180 int j; 2074 int j;
2181 int len, wlen; 2075 int len, wlen;
2182 2076
2183 j = TermWin.nrow; 2077 j = nrow;
2184 wlen = len = -1; 2078 wlen = len = -1;
2185 row = i > 0 ? 0 : j - 1; 2079 row = i > 0 ? 0 : j - 1;
2186 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2080 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2187 { 2081 {
2188 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2082 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2189 { 2083 {
2190 text_t *stp = screen.text[row + row_offset]; 2084 line_t s = ROW(row - view_start);
2191 rend_t *srp = screen.rend[row + row_offset];
2192 text_t *dtp = drawn_text[row]; 2085 line_t d = drawn_buf[row];
2193 text_t *dtp2 = drawn_text[row + i]; 2086 line_t d2 = drawn_buf[row + i];
2194 rend_t *drp = drawn_rend[row];
2195 rend_t *drp2 = drawn_rend[row + i];
2196 2087
2197 for (nits = 0, col = TermWin.ncol; col--; ) 2088 for (nits = 0, col = ncol; col--; )
2198 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2089 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2199 nits--; 2090 nits--;
2200 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2091 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2201 nits++; 2092 nits++;
2202 2093
2203 if (nits > 8) /* XXX: arbitrary choice */ 2094 if (nits > 8) /* XXX: arbitrary choice */
2204 { 2095 {
2205 for (col = TermWin.ncol; col--; ) 2096 for (col = ncol; col--; )
2206 { 2097 {
2207 *dtp++ = *dtp2++; 2098 *d.t++ = *d2.t++;
2208 *drp++ = *drp2++; 2099 *d.r++ = *d2.r++;
2209 } 2100 }
2210 2101
2211 if (len == -1) 2102 if (len == -1)
2212 len = row; 2103 len = row;
2213 2104
… …
2218 2109
2219 if (len != -1) 2110 if (len != -1)
2220 { 2111 {
2221 /* also comes here at end if needed because of >= above */ 2112 /* also comes here at end if needed because of >= above */
2222 if (wlen < len) 2113 if (wlen < len)
2223 SWAP_IT (wlen, len, int); 2114 ::swap (wlen, len);
2224 2115
2225 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2116 XCopyArea (display->display, vt, vt,
2226 TermWin.gc, 0, Row2Pixel (len + i), 2117 gc, 0, Row2Pixel (len + i),
2227 (unsigned int)TermWin_TotalWidth (), 2118 (unsigned int)this->width,
2228 (unsigned int)Height2Pixel (wlen - len + 1), 2119 (unsigned int)Height2Pixel (wlen - len + 1),
2229 0, Row2Pixel (len)); 2120 0, Row2Pixel (len));
2230 len = -1; 2121 len = -1;
2231 } 2122 }
2232 } 2123 }
… …
2234#endif 2125#endif
2235 2126
2236 /* 2127 /*
2237 * E: main pass across every character 2128 * E: main pass across every character
2238 */ 2129 */
2239 for (row = 0; row < TermWin.nrow; row++) 2130 for (row = 0; row < nrow; row++)
2240 { 2131 {
2241 text_t *stp = screen.text[row + row_offset]; 2132 text_t *stp = ROW(row - view_start).t;
2242 rend_t *srp = screen.rend[row + row_offset]; 2133 rend_t *srp = ROW(row - view_start).r;
2243 text_t *dtp = drawn_text[row]; 2134 text_t *dtp = drawn_buf[row].t;
2244 rend_t *drp = drawn_rend[row]; 2135 rend_t *drp = drawn_buf[row].r;
2245 2136
2246 /* 2137 /*
2247 * E2: OK, now the real pass 2138 * E2: OK, now the real pass
2248 */ 2139 */
2249 int ypixel = (int)Row2Pixel (row); 2140 int ypixel = (int)Row2Pixel (row);
2250 2141
2251 for (col = 0; col < TermWin.ncol; col++) 2142 for (col = 0; col < ncol; col++)
2252 { 2143 {
2253 /* compare new text with old - if exactly the same then continue */ 2144 /* compare new text with old - if exactly the same then continue */
2254 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2145 if (stp[col] == dtp[col] /* Must match characters to skip. */
2255 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2146 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2256 || (stp[col] == ' ' /* space w/ no background change */ 2147 || (stp[col] == ' ' /* space w/ no background change */
… …
2270 dtp[col] = stp[col]; 2161 dtp[col] = stp[col];
2271 drp[col] = rend; 2162 drp[col] = rend;
2272 2163
2273 int xpixel = Col2Pixel (col); 2164 int xpixel = Col2Pixel (col);
2274 2165
2275 for (i = 0; ++col < TermWin.ncol; ) 2166 for (i = 0; ++col < ncol; )
2276 { 2167 {
2277 if (stp[col] == NOCHAR) 2168 if (stp[col] == NOCHAR)
2278 { 2169 {
2279 dtp[col] = stp[col]; 2170 dtp[col] = stp[col];
2280 drp[col] = rend; 2171 drp[col] = rend;
… …
2308 2199
2309 // sometimes we optimize away the trailing NOCHAR's, add them back 2200 // sometimes we optimize away the trailing NOCHAR's, add them back
2310 while (i && text[count] == NOCHAR) 2201 while (i && text[count] == NOCHAR)
2311 count++, i--; 2202 count++, i--;
2312 2203
2313#if ENABLE_STYLES
2314 // force redraw after "careful" characters to avoid pixel droppings
2315 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2316 drp[col + 1] = ~srp[col + 1];
2317
2318 // include previous careful character(s) if possible, looks nicer (best effort...)
2319 while (text > stp
2320 && srp[text - stp - 1] & RS_Careful
2321 && RS_SAME (rend, srp[text - stp - 1]))
2322 text--, count++, xpixel -= TermWin.fwidth;
2323#endif
2324
2325 /* 2204 /*
2326 * Determine the attributes for the string 2205 * Determine the attributes for the string
2327 */ 2206 */
2328 int fore = GET_FGCOLOR (rend); // desired foreground 2207 int fore = fgcolor_of (rend); // desired foreground
2329 int back = GET_BGCOLOR (rend); // desired background 2208 int back = bgcolor_of (rend); // desired background
2330 2209
2331 // only do special processing if ana attributes are set, which is rare 2210 // only do special processing if any attributes are set, which is unlikely
2332 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2211 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2333 { 2212 {
2213#if ENABLE_STYLES
2214 // force redraw after "careful" characters to avoid pixel droppings
2215 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2216 drp[col + 1] = ~srp[col + 1];
2217
2218 // include previous careful character(s) if possible, looks nicer (best effort...)
2219 while (text > stp
2220 && srp[text - stp - 1] & RS_Careful
2221 && RS_SAME (rend, srp[text - stp - 1]))
2222 text--, count++, xpixel -= fwidth;
2223#endif
2224
2334 bool invert = rend & RS_RVid; 2225 bool invert = rend & RS_RVid;
2335 2226
2336#ifndef NO_BOLD_UNDERLINE_REVERSE 2227#ifndef NO_BOLD_UNDERLINE_REVERSE
2337 if (rend & RS_Bold 2228 if (rend & RS_Bold
2338 && fore == Color_fg) 2229 && fore == Color_fg)
… …
2360 fore = Color_UL; 2251 fore = Color_UL;
2361#endif 2252#endif
2362 2253
2363 if (invert) 2254 if (invert)
2364 { 2255 {
2365 SWAP_IT (fore, back, int); 2256 ::swap (fore, back);
2366 2257
2367#ifndef NO_BOLD_UNDERLINE_REVERSE 2258#ifndef NO_BOLD_UNDERLINE_REVERSE
2368 if (ISSET_PIXCOLOR (Color_RV)) 2259 if (ISSET_PIXCOLOR (Color_RV))
2369 back = Color_RV; 2260 back = Color_RV;
2261
2262 if (fore == back)
2263 {
2264 fore = Color_bg;
2265 back = Color_fg;
2266 }
2370#endif 2267#endif
2371 } 2268 }
2372 2269
2373#ifdef TEXT_BLINK 2270#ifdef TEXT_BLINK
2374 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2271 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2385 } 2282 }
2386 2283
2387 /* 2284 /*
2388 * Actually do the drawing of the string here 2285 * Actually do the drawing of the string here
2389 */ 2286 */
2390 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2287 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2391 2288
2392 if (back == fore) 2289 if (back == fore)
2393 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2290 font->clear_rect (*drawable, xpixel, ypixel,
2394 TermWin.fwidth * count, TermWin.fheight, 2291 fwidth * count, fheight,
2395 back); 2292 back);
2396 else if (back == Color_bg) 2293 else if (back == Color_bg)
2397 { 2294 {
2398 if (must_clear) 2295 if (must_clear)
2399 { 2296 {
2400 CLEAR_CHARS (xpixel, ypixel, count); 2297 CLEAR_CHARS (xpixel, ypixel, count);
2401 2298
2402 for (i = 0; i < count; i++) /* don't draw empty strings */ 2299 for (i = 0; i < count; i++) /* don't draw empty strings */
2403 if (text[i] != ' ') 2300 if (text[i] != ' ')
2404 { 2301 {
2405 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2302 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2406 break; 2303 break;
2407 } 2304 }
2408 } 2305 }
2409 else 2306 else
2410 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2411 } 2308 }
2412 else 2309 else
2413 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2414 2311
2415 if (rend & RS_Uline && font->descent > 1 && fore != back) 2312 if (rend & RS_Uline && font->descent > 1 && fore != back)
2416 { 2313 {
2417#if ENABLE_FRILLS 2314#if ENABLE_FRILLS
2418 if (ISSET_PIXCOLOR (Color_underline)) 2315 if (ISSET_PIXCOLOR (Color_underline))
2419 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2316 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2420 else 2317 else
2421#endif 2318#endif
2422 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2319 XSetForeground (display->display, gc, pix_colors[fore]);
2423 2320
2424 XDrawLine (display->display, drawBuffer, TermWin.gc, 2321 XDrawLine (display->display, drawBuffer, gc,
2425 xpixel, ypixel + font->ascent + 1, 2322 xpixel, ypixel + font->ascent + 1,
2426 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2323 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2427 } 2324 }
2428 } /* for (col....) */ 2325 } /* for (col....) */
2429 } /* for (row....) */ 2326 } /* for (row....) */
2430 2327
2431#if ENABLE_OVERLAY 2328#if ENABLE_OVERLAY
2432 scr_swap_overlay (); 2329 scr_swap_overlay ();
2433#endif 2330#endif
2331 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2434 2332
2435 /* 2333 /*
2436 * G: cleanup cursor and display outline cursor if necessary 2334 * G: cleanup cursor and display outline cursor if necessary
2437 */ 2335 */
2438 if (showcursor) 2336 if (showcursor)
2439 { 2337 {
2440 if (TermWin.focus) 2338 if (focus)
2441 { 2339 {
2442 if (options & Opt_cursorUnderline) 2340 if (OPTION (Opt_cursorUnderline))
2443 *crp ^= RS_Uline; 2341 *crp ^= RS_Uline;
2444 else 2342 else
2445 { 2343 {
2446 *crp ^= RS_RVid; 2344 *crp ^= RS_RVid;
2447#ifndef NO_CURSORCOLOR 2345#ifndef NO_CURSORCOLOR
… …
2452 else if (oldcursor.row >= 0) 2350 else if (oldcursor.row >= 0)
2453 { 2351 {
2454 int cursorwidth = 1; 2352 int cursorwidth = 1;
2455 int col = oldcursor.col; 2353 int col = oldcursor.col;
2456 2354
2457 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2355 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2458 col--; 2356 col--;
2459 2357
2460 while (col + cursorwidth < TermWin.ncol 2358 while (col + cursorwidth < ncol
2461 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) 2359 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2462 cursorwidth++; 2360 cursorwidth++;
2463 2361
2464#ifndef NO_CURSORCOLOR 2362#ifndef NO_CURSORCOLOR
2465 if (ISSET_PIXCOLOR (Color_cursor)) 2363 if (ISSET_PIXCOLOR (Color_cursor))
2466 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2364 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2467#endif 2365#endif
2468 2366
2469 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2367 XDrawRectangle (display->display, drawBuffer, gc,
2470 Col2Pixel (col), 2368 Col2Pixel (col),
2471 Row2Pixel (oldcursor.row), 2369 Row2Pixel (oldcursor.row),
2472 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2370 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2473 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2371 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2474 } 2372 }
2475 } 2373 }
2476 2374
2477 /* 2375 /*
2478 * H: cleanup selection 2376 * H: cleanup selection
… …
2485 num_scr = 0; 2383 num_scr = 0;
2486 num_scr_allow = 1; 2384 num_scr_allow = 1;
2487} 2385}
2488 2386
2489void 2387void
2490rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2388rxvt_term::scr_remap_chars (line_t &l)
2491{ 2389{
2492 if (!rp || !tp) 2390 if (!l.t)
2493 return; 2391 return;
2494 2392
2495 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant
2394
2395 for (int i = ncol; i--; )
2496 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497} 2397}
2498 2398
2499void 2399void
2500rxvt_term::scr_remap_chars () 2400rxvt_term::scr_remap_chars ()
2501{ 2401{
2502 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2402 for (int i = total_rows; i--; )
2503 scr_remap_chars (screen.text[i], screen.rend[i]); 2403 scr_remap_chars (row_buf [i]);
2504 2404
2505 for (int i = TermWin.nrow; i--; ) 2405 for (int i = nrow; i--; )
2506 { 2406 {
2507 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2407 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap.text[i], swap.rend[i]); 2408 scr_remap_chars (swap_buf [i]);
2509 } 2409 }
2510} 2410}
2511 2411
2512void 2412void
2513rxvt_term::scr_recolour () 2413rxvt_term::scr_recolour ()
… …
2519#if XPM_BACKGROUND 2419#if XPM_BACKGROUND
2520 && !bgPixmap.pixmap 2420 && !bgPixmap.pixmap
2521#endif 2421#endif
2522 ) 2422 )
2523 { 2423 {
2524 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2424 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2525 XClearWindow (display->display, TermWin.parent[0]); 2425 XClearWindow (display->display, parent[0]);
2526 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2426 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2527#if HAVE_SCROLLBARS 2427#if HAVE_SCROLLBARS
2528 if (scrollBar.win) 2428 if (scrollBar.win)
2529 { 2429 {
2530 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2430 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2531 scrollBar.setIdle (); 2431 scrollBar.setIdle ();
… …
2541 2441
2542/* ------------------------------------------------------------------------- */ 2442/* ------------------------------------------------------------------------- */
2543void 2443void
2544rxvt_term::scr_clear (bool really) 2444rxvt_term::scr_clear (bool really)
2545{ 2445{
2546 if (!TermWin.mapped) 2446 if (!mapped)
2547 return; 2447 return;
2548 2448
2549 num_scr_allow = 0; 2449 num_scr_allow = 0;
2550 want_refresh = 1; 2450 want_refresh = 1;
2551 2451
2552#if TRANSPARENT
2553 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2554 {
2555 int i;
2556
2557 if (!(options & Opt_transparent_all))
2558 i = 0;
2559 else
2560 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2561
2562 while (i--)
2563 if (TermWin.parent[i] != None)
2564 XClearWindow (display->display, TermWin.parent[i]);
2565 }
2566#endif
2567
2568 if (really) 2452 if (really)
2569 XClearWindow (display->display, TermWin.vt); 2453 XClearWindow (display->display, vt);
2570} 2454}
2571 2455
2572/* ------------------------------------------------------------------------- */ 2456/* ------------------------------------------------------------------------- */
2573void 2457void
2574rxvt_term::scr_reverse_selection () 2458rxvt_term::scr_reverse_selection ()
2575{ 2459{
2460 if (selection.op
2576 if (selection.op && current_screen == selection.screen) 2461 && current_screen == selection.screen
2462 && selection.end.row >= -view_start)
2577 { 2463 {
2578 int end_row = TermWin.saveLines - TermWin.view_start; 2464 int view_end = -view_start + nrow;
2579 int i = selection.beg.row + TermWin.saveLines; 2465 int row, col;
2580 int col, row = selection.end.row + TermWin.saveLines;
2581 rend_t *srp;
2582 2466
2583#if ENABLE_FRILLS 2467#if ENABLE_FRILLS
2584 if (selection.rect) 2468 if (selection.rect)
2585 { 2469 {
2586 end_row += TermWin.nrow; 2470 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2471 {
2472 text_t *stp = ROW(row).t;
2473 rend_t *srp = ROW(row).r;
2587 2474
2588 for (; i <= row && i <= end_row; i++)
2589 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2475 for (col = selection.beg.col; col < selection.end.col; col++)
2590 srp[col] ^= RS_RVid; 2476 srp[col] ^= RS_RVid;
2477
2478 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479 srp[col] ^= RS_RVid | RS_Uline;
2480
2481 if (++col < selection.end.col)
2482 srp[col] ^= RS_RVid | RS_Uline;
2483 }
2591 } 2484 }
2592 else 2485 else
2593#endif 2486#endif
2594 { 2487 {
2595 if (i >= end_row) 2488 if (selection.beg.row >= -view_start)
2489 {
2596 col = selection.beg.col; 2490 col = selection.beg.col;
2491 row = selection.beg.row;
2492 }
2597 else 2493 else
2598 { 2494 {
2599 col = 0; 2495 col = 0;
2600 i = end_row; 2496 row = -view_start;
2601 } 2497 }
2602 2498
2603 end_row += TermWin.nrow; 2499 for (; row < min (selection.end.row, view_end); row++, col = 0)
2604 2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2605 for (; i < row && i < end_row; i++, col = 0)
2606 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2607 srp[col] ^= RS_RVid; 2501 srp[col] ^= RS_RVid;
2608 2502
2609 if (i == row && i < end_row) 2503 if (row == selection.end.row)
2610 for (srp = screen.rend[i]; col < selection.end.col; col++) 2504 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2611 srp[col] ^= RS_RVid; 2505 srp[col] ^= RS_RVid;
2612 } 2506 }
2613 } 2507 }
2614} 2508}
2615 2509
… …
2624{ 2518{
2625 int row, wrote; 2519 int row, wrote;
2626 unsigned int width, towrite; 2520 unsigned int width, towrite;
2627 char r1[] = "\n"; 2521 char r1[] = "\n";
2628 2522
2629 for (row = TermWin.saveLines - TermWin.nscrolled; 2523 for (row = saveLines - nsaved;
2630 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2524 row < saveLines + nrow - 1; row++)
2631 { 2525 {
2632 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2526 width = row_buf[row].l >= 0 ? row_buf[row].l
2633 : TermWin.ncol; 2527 : ncol;
2634 for (towrite = width; towrite; towrite -= wrote) 2528 for (towrite = width; towrite; towrite -= wrote)
2635 { 2529 {
2636 wrote = write (fd, & (screen.text[row][width - towrite]), 2530 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2637 towrite); 2531 towrite);
2638 if (wrote < 0) 2532 if (wrote < 0)
2639 return; /* XXX: death, no report */ 2533 return; /* XXX: death, no report */
2640 } 2534 }
2641 if (screen.tlen[row] >= 0) 2535 if (row_buf[row].l >= 0)
2642 if (write (fd, r1, 1) <= 0) 2536 if (write (fd, r1, 1) <= 0)
2643 return; /* XXX: death, no report */ 2537 return; /* XXX: death, no report */
2644 } 2538 }
2645} 2539}
2646#endif 2540#endif
2647 2541
2648/* ------------------------------------------------------------------------- * 2542/* ------------------------------------------------------------------------- *
2649 * CHARACTER SELECTION * 2543 * CHARACTER SELECTION *
2650 * ------------------------------------------------------------------------- */ 2544 * ------------------------------------------------------------------------- */
2651
2652/*
2653 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2654 */
2655void 2545void
2656rxvt_term::selection_check (int check_more) 2546rxvt_term::selection_check (int check_more)
2657{ 2547{
2658 row_col_t pos; 2548 row_col_t pos;
2659 2549
2660 if (!selection.op) 2550 if (!selection.op)
2661 return; 2551 return;
2662 2552
2663 pos.row = pos.col = 0; 2553 pos.row = pos.col = 0;
2664 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2554 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2665 || (selection.beg.row >= TermWin.nrow) 2555 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2666 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2556 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2667 || (selection.mark.row >= TermWin.nrow)
2668 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2669 || (selection.end.row >= TermWin.nrow)
2670 || (check_more == 1 2557 || (check_more == 1
2671 && current_screen == selection.screen 2558 && current_screen == selection.screen
2672 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2559 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2673 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2560 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2674 || (check_more == 2 2561 || (check_more == 2
… …
2676 && ROWCOL_IS_AFTER (selection.end, pos)) 2563 && ROWCOL_IS_AFTER (selection.end, pos))
2677 || (check_more == 3 2564 || (check_more == 3
2678 && ROWCOL_IS_AFTER (selection.end, pos)) 2565 && ROWCOL_IS_AFTER (selection.end, pos))
2679 || (check_more == 4 /* screen width change */ 2566 || (check_more == 4 /* screen width change */
2680 && (selection.beg.row != selection.end.row 2567 && (selection.beg.row != selection.end.row
2681 || selection.end.col > TermWin.ncol))) 2568 || selection.end.col > ncol)))
2682 CLEAR_SELECTION (); 2569 CLEAR_SELECTION ();
2683} 2570}
2684 2571
2685/* ------------------------------------------------------------------------- */ 2572/* ------------------------------------------------------------------------- */
2686/* 2573/*
2687 * Paste a selection direct to the command fd 2574 * Paste a selection direct to the command fd
2688 */ 2575 */
2689void 2576void
2690rxvt_term::paste (unsigned char *data, unsigned int len) 2577rxvt_term::paste (char *data, unsigned int len)
2691{ 2578{
2692 /* convert normal newline chars into common keyboard Return key sequence */ 2579 /* convert normal newline chars into common keyboard Return key sequence */
2693 for (unsigned int i = 0; i < len; i++) 2580 for (unsigned int i = 0; i < len; i++)
2694 if (data[i] == C0_LF) 2581 if (data[i] == C0_LF)
2695 data[i] = C0_CR; 2582 data[i] = C0_CR;
… …
2839 { 2726 {
2840 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2727 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2841 char *s = rxvt_wcstombs (w); 2728 char *s = rxvt_wcstombs (w);
2842 free (w); 2729 free (w);
2843 // TODO: strlen == only the first element will be converted. well... 2730 // TODO: strlen == only the first element will be converted. well...
2844 paste ((unsigned char *)s, strlen (s)); 2731 paste (s, strlen (s));
2845 free (s); 2732 free (s);
2846 } 2733 }
2847 else 2734 else
2848#endif 2735#endif
2849 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2736 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2850 && cl) 2737 && cl)
2851 { 2738 {
2852 for (int i = 0; i < cr; i++) 2739 for (int i = 0; i < cr; i++)
2853 paste ((unsigned char *)cl[i], strlen (cl[i])); 2740 paste (cl[i], strlen (cl[i]));
2854 2741
2855 XFreeStringList (cl); 2742 XFreeStringList (cl);
2856 } 2743 }
2857 else 2744 else
2858 paste (ct.value, ct.nitems); // paste raw 2745 paste ((char *)ct.value, ct.nitems); // paste raw
2859 2746
2860bailout: 2747bailout:
2861 XFree (ct.value); 2748 XFree (ct.value);
2862 2749
2863 if (selection_wait == Sel_normal) 2750 if (selection_wait == Sel_normal)
… …
2895 * EXT: button 2 release 2782 * EXT: button 2 release
2896 */ 2783 */
2897void 2784void
2898rxvt_term::selection_request (Time tm, int x, int y) 2785rxvt_term::selection_request (Time tm, int x, int y)
2899{ 2786{
2900 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2787 if (x < 0 || x >= width || y < 0 || y >= height)
2901 return; /* outside window */ 2788 return; /* outside window */
2902 2789
2903 if (selection.text) 2790 if (selection.text)
2904 { /* internal selection */ 2791 { /* internal selection */
2905 char *str = rxvt_wcstombs (selection.text, selection.len); 2792 char *str = rxvt_wcstombs (selection.text, selection.len);
2906 paste ((unsigned char *)str, strlen (str)); 2793 paste (str, strlen (str));
2907 free (str); 2794 free (str);
2908 return; 2795 return;
2909 } 2796 }
2910 else 2797 else
2911 { 2798 {
… …
2947 sel = xa[XA_CLIPBOARD]; 2834 sel = xa[XA_CLIPBOARD];
2948 2835
2949 if (XGetSelectionOwner (display->display, sel) != None) 2836 if (XGetSelectionOwner (display->display, sel) != None)
2950 { 2837 {
2951 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2838 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2952 TermWin.vt, selection_request_time); 2839 vt, selection_request_time);
2953 return 1; 2840 return 1;
2954 } 2841 }
2955 2842
2956 return 0; 2843 return 0;
2957} 2844}
… …
2980 * EXT: button 1 or 3 release 2867 * EXT: button 1 or 3 release
2981 */ 2868 */
2982void 2869void
2983rxvt_term::selection_make (Time tm) 2870rxvt_term::selection_make (Time tm)
2984{ 2871{
2985 int i, col, end_col, row, end_row; 2872 int i;
2986 wchar_t *new_selection_text; 2873 wchar_t *new_selection_text;
2987 text_t *t; 2874 text_t *t;
2988 2875
2989 switch (selection.op) 2876 switch (selection.op)
2990 { 2877 {
… …
3003 selection.op = SELECTION_DONE; 2890 selection.op = SELECTION_DONE;
3004 2891
3005 if (selection.clicks == 4) 2892 if (selection.clicks == 4)
3006 return; /* nothing selected, go away */ 2893 return; /* nothing selected, go away */
3007 2894
2895 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2896 return;
2897
3008 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2898 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3009 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2899 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
3010 2900
3011 col = selection.beg.col;
3012 row = selection.beg.row + TermWin.saveLines;
3013 end_row = selection.end.row + TermWin.saveLines;
3014 int ofs = 0; 2901 int ofs = 0;
3015 int extra = 0; 2902 int extra = 0;
3016 2903
2904 int col = selection.beg.col;
2905 int row = selection.beg.row;
2906
2907 int end_col;
2908
3017 for (; row <= end_row; row++, col = 0) 2909 for (; row <= selection.end.row; row++, col = 0)
3018 { 2910 {
3019 end_col = screen.tlen[row];
3020
3021#if ENABLE_FRILLS 2911#if ENABLE_FRILLS
3022 if (selection.rect) 2912 if (selection.rect)
3023 { 2913 {
3024 col = selection.beg.col; 2914 col = selection.beg.col;
3025 end_col = TermWin.ncol + 1; 2915 end_col = ncol + 1;
2916 }
2917 else
2918#endif
2919 end_col = ROW(row).l;
2920
2921 col = max (col, 0);
2922
2923 if (row == selection.end.row
2924#if ENABLE_FRILLS
2925 || selection.rect
2926#endif
3026 } 2927 )
3027#endif
3028
3029 MAX_IT (col, 0);
3030
3031 if (end_col == -1)
3032 end_col = TermWin.ncol;
3033
3034 if (row == end_row || selection.rect)
3035 MIN_IT (end_col, selection.end.col); 2928 min_it (end_col, selection.end.col);
3036 2929
3037 t = &screen.text[row][col]; 2930 t = ROW(row).t + col;
2931
3038 for (; col < end_col; col++) 2932 for (; col < end_col; col++)
3039 { 2933 {
3040 if (*t == NOCHAR) 2934 if (*t == NOCHAR)
3041 t++; 2935 t++;
3042#if ENABLE_COMBINING 2936#if ENABLE_COMBINING
… …
3058#endif 2952#endif
3059 else 2953 else
3060 new_selection_text[ofs++] = *t++; 2954 new_selection_text[ofs++] = *t++;
3061 } 2955 }
3062 2956
3063 if (screen.tlen[row] != -1 && row != end_row) 2957#if ENABLE_FRILLS
2958 if (selection.rect)
2959 {
2960 while (ofs
2961 && new_selection_text[ofs - 1] != C0_LF
2962 && unicode::is_space (new_selection_text[ofs - 1]))
2963 --ofs;
2964
3064 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
2966 }
2967 else
2968#endif
2969 if (!ROW(row).is_longer () && row != selection.end.row)
2970 new_selection_text[ofs++] = C0_LF;
3065 } 2971 }
3066 2972
3067 if (end_col != selection.end.col) 2973 if (end_col != selection.end.col)
3068 new_selection_text[ofs++] = C0_LF; 2974 new_selection_text[ofs++] = C0_LF;
3069 2975
… …
3079 2985
3080 // we usually allocate much more than necessary, so realloc it smaller again 2986 // we usually allocate much more than necessary, so realloc it smaller again
3081 selection.len = ofs; 2987 selection.len = ofs;
3082 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2988 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3083 2989
2990 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2991 return;
2992
2993 selection_grab (tm);
2994}
2995
2996bool
2997rxvt_term::selection_grab (Time tm)
2998{
2999 selection_time = tm;
3000
3084 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3001 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3085 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3002 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3003 {
3086 display->set_selection_owner (this); 3004 display->set_selection_owner (this);
3005 return true;
3006 }
3087 else 3007 else
3088 rxvt_warn ("can't get primary selection, ignoring.\n"); 3008 return false;
3089 3009
3090#if 0 3010#if 0
3091 XTextProperty ct; 3011 XTextProperty ct;
3092 3012
3093 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3013 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3094 { 3014 {
3095 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3015 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3096 XFree (ct.value); 3016 XFree (ct.value);
3097 } 3017 }
3098#endif 3018#endif
3099
3100 selection_time = tm;
3101} 3019}
3102 3020
3103/* ------------------------------------------------------------------------- */ 3021/* ------------------------------------------------------------------------- */
3104/* 3022/*
3105 * Mark or select text based upon number of clicks: 1, 2, or 3 3023 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3113 3031
3114 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3032 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3115 3033
3116 if (clicks == 2 || clicks == 3) 3034 if (clicks == 2 || clicks == 3)
3117 selection_extend_colrow (selection.mark.col, 3035 selection_extend_colrow (selection.mark.col,
3118 selection.mark.row + TermWin.view_start, 3036 selection.mark.row + view_start,
3119 0, /* button 3 */ 3037 0, /* button 3 */
3120 1, /* button press */ 3038 1, /* button press */
3121 0); /* click change */ 3039 0); /* click change */
3122} 3040}
3123 3041
… …
3127 */ 3045 */
3128void 3046void
3129rxvt_term::selection_start_colrow (int col, int row) 3047rxvt_term::selection_start_colrow (int col, int row)
3130{ 3048{
3131 want_refresh = 1; 3049 want_refresh = 1;
3050
3051 selection.mark.row = row - view_start;
3132 selection.mark.col = col; 3052 selection.mark.col = col;
3133 selection.mark.row = row - TermWin.view_start;
3134 3053
3135 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3054 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3136 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3055 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3137 MAX_IT (selection.mark.col, 0);
3138 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3139 3056
3140 while (selection.mark.col > 0 3057 while (selection.mark.col > 0
3141 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3058 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3142 --selection.mark.col; 3059 --selection.mark.col;
3143 3060
3144 if (selection.op) 3061 if (selection.op)
3145 { /* clear the old selection */ 3062 { /* clear the old selection */
3146 selection.beg.row = selection.end.row = selection.mark.row; 3063 selection.beg.row = selection.end.row = selection.mark.row;
… …
3170 text_t *stp; 3087 text_t *stp;
3171 rend_t *srp; 3088 rend_t *srp;
3172 3089
3173 if (dirn == UP) 3090 if (dirn == UP)
3174 { 3091 {
3175 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3092 bound.row = - nsaved - 1;
3176 bound.col = 0; 3093 bound.col = 0;
3177 dirnadd = -1; 3094 dirnadd = -1;
3178 } 3095 }
3179 else 3096 else
3180 { 3097 {
3181 bound.row = TermWin.saveLines + TermWin.nrow; 3098 bound.row = nrow;
3182 bound.col = TermWin.ncol - 1; 3099 bound.col = ncol - 1;
3183 dirnadd = 1; 3100 dirnadd = 1;
3184 } 3101 }
3185 3102
3186 row = mark->row + TermWin.saveLines; 3103 row = mark->row;
3187 col = mark->col; 3104 col = max (mark->col, 0);
3188 MAX_IT (col, 0); 3105
3189 /* find the edge of a word */ 3106 /* find the edge of a word */
3190 stp = &screen.text[row][col]; 3107 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3191 w1 = DELIMIT_TEXT (*stp); 3108 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3192
3193 srp = &screen.rend[row][col];
3194 w2 = DELIMIT_REND (*srp);
3195 3109
3196 for (;;) 3110 for (;;)
3197 { 3111 {
3198 for (; col != bound.col; col += dirnadd) 3112 for (; col != bound.col; col += dirnadd)
3199 { 3113 {
… …
3209 break; 3123 break;
3210 } 3124 }
3211 3125
3212 if ((col == bound.col) && (row != bound.row)) 3126 if ((col == bound.col) && (row != bound.row))
3213 { 3127 {
3214 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3128 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3215 { 3129 {
3216 trow = row + dirnadd; 3130 trow = row + dirnadd;
3217 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3131 tcol = dirn == UP ? ncol - 1 : 0;
3218 3132
3219 if (screen.text[trow] == NULL) 3133 if (!ROW(trow).t)
3220 break; 3134 break;
3221 3135
3222 stp = & (screen.text[trow][tcol]); 3136 stp = ROW(trow).t + tcol;
3223 srp = & (screen.rend[trow][tcol]); 3137 srp = ROW(trow).r + tcol;
3224 3138
3225 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3139 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3226 break; 3140 break;
3227 3141
3228 row = trow; 3142 row = trow;
… …
3231 } 3145 }
3232 } 3146 }
3233 break; 3147 break;
3234 } 3148 }
3235 3149
3236Old_Word_Selection_You_Die:
3237 if (dirn == DN) 3150 if (dirn == DN)
3238 col++; /* put us on one past the end */ 3151 col++; /* put us on one past the end */
3239 3152
3240 /* Poke the values back in */ 3153 /* Poke the values back in */
3241 ret->row = row - TermWin.saveLines; 3154 ret->row = row;
3242 ret->col = col; 3155 ret->col = col;
3243} 3156}
3244 3157
3245/* ------------------------------------------------------------------------- */ 3158/* ------------------------------------------------------------------------- */
3246/* 3159/*
… …
3251 * flag == 2 ==> button 3 motion 3164 * flag == 2 ==> button 3 motion
3252 */ 3165 */
3253void 3166void
3254rxvt_term::selection_extend (int x, int y, int flag) 3167rxvt_term::selection_extend (int x, int y, int flag)
3255{ 3168{
3256 int col, row; 3169 int col = clamp (Pixel2Col (x), 0, ncol);
3257 3170 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3258 col = Pixel2Col (x);
3259 row = Pixel2Row (y);
3260 MAX_IT (row, 0);
3261 MIN_IT (row, (int)TermWin.nrow - 1);
3262 MAX_IT (col, 0);
3263 MIN_IT (col, (int)TermWin.ncol);
3264 3171
3265 /* 3172 /*
3266 * If we're selecting characters (single click) then we must check first 3173 * If we're selecting characters (single click) then we must check first
3267 * if we are at the same place as the original mark. If we are then 3174 * if we are at the same place as the original mark. If we are then
3268 * select nothing. Otherwise, if we're to the right of the mark, you have to 3175 * select nothing. Otherwise, if we're to the right of the mark, you have to
3269 * be _past_ a character for it to be selected. 3176 * be _past_ a character for it to be selected.
3270 */ 3177 */
3271 if (((selection.clicks % 3) == 1) && !flag 3178 if (((selection.clicks % 3) == 1) && !flag
3272 && (col == selection.mark.col 3179 && (col == selection.mark.col
3273 && (row == selection.mark.row + TermWin.view_start))) 3180 && (row == selection.mark.row + view_start)))
3274 { 3181 {
3275 /* select nothing */ 3182 /* select nothing */
3276 selection.beg.row = selection.end.row = 0; 3183 selection.beg.row = selection.end.row = 0;
3277 selection.beg.col = selection.end.col = 0; 3184 selection.beg.col = selection.end.col = 0;
3278 selection.clicks = 4; 3185 selection.clicks = 4;
… …
3293 * Extend the selection to the specified col/row 3200 * Extend the selection to the specified col/row
3294 */ 3201 */
3295void 3202void
3296rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3203rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3297{ 3204{
3298 int16_t ncol = TermWin.ncol;
3299 int end_col;
3300 row_col_t pos; 3205 row_col_t pos;
3301 enum { 3206 enum {
3302 LEFT, RIGHT 3207 LEFT, RIGHT
3303 } closeto = RIGHT; 3208 } closeto = RIGHT;
3304 3209
… …
3335 selection.beg.col = selection.end.col = selection.mark.col; 3240 selection.beg.col = selection.end.col = selection.mark.col;
3336 selection.beg.row = selection.end.row = selection.mark.row; 3241 selection.beg.row = selection.end.row = selection.mark.row;
3337 } 3242 }
3338 3243
3339 pos.col = col; 3244 pos.col = col;
3340 pos.row = row; 3245 pos.row = row - view_start;
3341
3342 pos.row -= TermWin.view_start; /* adjust for scroll */
3343 3246
3344 /* 3247 /*
3345 * This is mainly xterm style selection with a couple of differences, mainly 3248 * This is mainly xterm style selection with a couple of differences, mainly
3346 * in the way button3 drag extension works. 3249 * in the way button3 drag extension works.
3347 * We're either doing: button1 drag; button3 press; or button3 drag 3250 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3406 } 3309 }
3407 } 3310 }
3408 3311
3409 if (selection.clicks == 1) 3312 if (selection.clicks == 1)
3410 { 3313 {
3411 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3314 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3412 3315 && !ROW(selection.beg.row).is_longer ()
3413 if (selection.beg.col > end_col
3414 && end_col != -1
3415#if ENABLE_FRILLS 3316#if ENABLE_FRILLS
3416 && !selection.rect 3317 && !selection.rect
3417#endif 3318#endif
3418 ) 3319 )
3419 selection.beg.col = ncol; 3320 selection.beg.col = ncol;
3420 3321
3421 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3422
3423 if ( 3322 if (
3424 selection.end.col > end_col 3323 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3425 && end_col != -1 3324 && !ROW(selection.end.row).is_longer ()
3426#if ENABLE_FRILLS 3325#if ENABLE_FRILLS
3427 && !selection.rect 3326 && !selection.rect
3428#endif 3327#endif
3429 ) 3328 )
3430 selection.end.col = ncol; 3329 selection.end.col = ncol;
… …
3432 else if (selection.clicks == 2) 3331 else if (selection.clicks == 2)
3433 { 3332 {
3434 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3435 selection.end.col--; 3334 selection.end.col--;
3436 3335
3336 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 {
3437 selection_delimit_word (UP, &selection.beg, &selection.beg); 3338 selection_delimit_word (UP, &selection.beg, &selection.beg);
3438 selection_delimit_word (DN, &selection.end, &selection.end); 3339 selection_delimit_word (DN, &selection.end, &selection.end);
3340 }
3439 } 3341 }
3440 else if (selection.clicks == 3) 3342 else if (selection.clicks == 3)
3441 { 3343 {
3442#if ENABLE_FRILLS 3344#if ENABLE_FRILLS
3443 if (options & Opt_tripleclickwords) 3345 if (OPTION (Opt_tripleclickwords))
3444 { 3346 {
3445 int end_row;
3446
3447 selection_delimit_word (UP, &selection.beg, &selection.beg); 3347 selection_delimit_word (UP, &selection.beg, &selection.beg);
3448 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3449 3348
3450 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3349 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3451 { 3350 {
3452 end_col = screen.tlen[end_row + TermWin.saveLines]; 3351 if (!ROW(end_row).is_longer ())
3453
3454 if (end_col != -1)
3455 { 3352 {
3456 selection.end.row = end_row; 3353 selection.end.row = end_row;
3457 selection.end.col = end_col; 3354 selection.end.col = ROW(end_row).l;
3458 selection_remove_trailing_spaces (); 3355 selection_remove_trailing_spaces ();
3459 break; 3356 break;
3460 } 3357 }
3461 } 3358 }
3462 } 3359 }
… …
3468 3365
3469 selection.beg.col = 0; 3366 selection.beg.col = 0;
3470 selection.end.col = ncol; 3367 selection.end.col = ncol;
3471 3368
3472 // select a complete logical line 3369 // select a complete logical line
3473 while (selection.beg.row > -TermWin.saveLines 3370 while (selection.beg.row > -saveLines
3474 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3371 && ROW(selection.beg.row - 1).is_longer ())
3475 selection.beg.row--; 3372 selection.beg.row--;
3476 3373
3477 while (selection.end.row < TermWin.nrow 3374 while (selection.end.row < nrow
3478 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3375 && ROW(selection.end.row).is_longer ())
3479 selection.end.row++; 3376 selection.end.row++;
3480 } 3377 }
3481 } 3378 }
3482 3379
3483 if (button3 && buttonpress) 3380 if (button3 && buttonpress)
… …
3494 } 3391 }
3495 } 3392 }
3496 3393
3497#if ENABLE_FRILLS 3394#if ENABLE_FRILLS
3498 if (selection.rect && selection.beg.col > selection.end.col) 3395 if (selection.rect && selection.beg.col > selection.end.col)
3499 SWAP_IT (selection.beg.col, selection.end.col, int); 3396 ::swap (selection.beg.col, selection.end.col);
3500#endif 3397#endif
3501} 3398}
3502 3399
3503#if ENABLE_FRILLS 3400#if ENABLE_FRILLS
3504void 3401void
… …
3508 text_t *stp; 3405 text_t *stp;
3509 3406
3510 end_col = selection.end.col; 3407 end_col = selection.end.col;
3511 end_row = selection.end.row; 3408 end_row = selection.end.row;
3512 3409
3513 for ( ; end_row >= selection.beg.row; ) 3410 for (; end_row >= selection.beg.row; )
3514 { 3411 {
3515 stp = screen.text[end_row + TermWin.saveLines]; 3412 stp = ROW(end_row).t;
3516 3413
3517 while (--end_col >= 0) 3414 while (--end_col >= 0)
3518 { 3415 {
3519 if (stp[end_col] != ' ' 3416 if (stp[end_col] != NOCHAR
3520 && stp[end_col] != '\t' 3417 && !unicode::is_space (stp[end_col]))
3521 && stp[end_col] != NOCHAR)
3522 break; 3418 break;
3523 } 3419 }
3524 3420
3525 if (end_col >= 0 3421 if (end_col >= 0
3526 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3422 || !ROW(end_row - 1).is_longer ())
3527 { 3423 {
3528 selection.end.col = end_col + 1; 3424 selection.end.col = end_col + 1;
3529 selection.end.row = end_row; 3425 selection.end.row = end_row;
3530 break; 3426 break;
3531 } 3427 }
3532 3428
3533 end_row--; 3429 end_row--;
3534 end_col = TermWin.ncol; 3430 end_col = ncol;
3535 } 3431 }
3536 3432
3537 if (selection.mark.row > selection.end.row) 3433 if (selection.mark.row > selection.end.row)
3538 { 3434 {
3539 selection.mark.row = selection.end.row; 3435 selection.mark.row = selection.end.row;
… …
3702 */ 3598 */
3703void 3599void
3704rxvt_term::pixel_position (int *x, int *y) 3600rxvt_term::pixel_position (int *x, int *y)
3705{ 3601{
3706 *x = Pixel2Col (*x); 3602 *x = Pixel2Col (*x);
3707 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3603 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3708 *y = Pixel2Row (*y); 3604 *y = Pixel2Row (*y);
3709 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3605 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3710} 3606}
3711 3607
3712/* ------------------------------------------------------------------------- */ 3608/* ------------------------------------------------------------------------- */
3713#ifdef USE_XIM 3609#ifdef USE_XIM
3714void 3610void
3715rxvt_term::im_set_position (XPoint &pos) 3611rxvt_term::im_set_position (XPoint &pos)
3716{ 3612{
3717 XWindowAttributes xwa; 3613 XWindowAttributes xwa;
3718 3614
3719 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3615 XGetWindowAttributes (display->display, vt, &xwa);
3720 3616
3721 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3617 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3722 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3618 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3723} 3619}
3724#endif 3620#endif
3725 3621
3726#if ENABLE_OVERLAY 3622#if ENABLE_OVERLAY
3727void 3623void
3728rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3624rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3729{ 3625{
3730 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3626 if (nrow < 1 || ncol < 1)
3731 return; 3627 return;
3732 3628
3733 want_refresh = 1; 3629 want_refresh = 1;
3734 3630
3735 scr_overlay_off (); 3631 scr_overlay_off ();
3736 3632
3737 if (x < 0) x = TermWin.ncol - w; 3633 if (x < 0) x = ncol - w;
3738 if (y < 0) y = TermWin.nrow - h; 3634 if (y < 0) y = nrow - h;
3739 3635
3740 // make space for border 3636 // make space for border
3741 w += 2; MIN_IT (w, TermWin.ncol); 3637 w += 2; min_it (w, ncol);
3742 h += 2; MIN_IT (h, TermWin.nrow); 3638 h += 2; min_it (h, nrow);
3743 3639
3744 x -= 1; MAX_IT (x, 0); 3640 x -= 1; clamp_it (x, 0, ncol - w);
3745 y -= 1; MAX_IT (y, 0); 3641 y -= 1; clamp_it (y, 0, nrow - h);
3746
3747 MIN_IT (x, TermWin.ncol - w);
3748 MIN_IT (y, TermWin.nrow - h);
3749 3642
3750 ov_x = x; ov_y = y; 3643 ov_x = x; ov_y = y;
3751 ov_w = w; ov_h = h; 3644 ov_w = w; ov_h = h;
3752 3645
3753 ov_text = new text_t *[h]; 3646 ov_text = new text_t *[h];
… …
3839rxvt_term::scr_swap_overlay () 3732rxvt_term::scr_swap_overlay ()
3840{ 3733{
3841 if (!ov_text) 3734 if (!ov_text)
3842 return; 3735 return;
3843 3736
3844 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3845
3846 // swap screen mem with overlay 3737 // swap screen mem with overlay
3847 for (int y = ov_h; y--; ) 3738 for (int y = ov_h; y--; )
3848 { 3739 {
3849 text_t *t1 = ov_text[y]; 3740 text_t *t1 = ov_text[y];
3850 rend_t *r1 = ov_rend[y]; 3741 rend_t *r1 = ov_rend[y];
3851 3742
3852 text_t *t2 = screen.text[y + row_offset] + ov_x; 3743 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3853 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3744 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3854 3745
3855 for (int x = ov_w; x--; ) 3746 for (int x = ov_w; x--; )
3856 { 3747 {
3857 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3748 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3858 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3749 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3860 } 3751 }
3861} 3752}
3862 3753
3863#endif 3754#endif
3864/* ------------------------------------------------------------------------- */ 3755/* ------------------------------------------------------------------------- */
3756

Diff Legend

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