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.166 by root, Sun Jun 26 20:06:52 2005 UTC vs.
Revision 1.216 by root, Mon Jan 9 18:51:19 2006 UTC

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

Diff Legend

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