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.159 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 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) const
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) const
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 top_row--;
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 {
197 /*
198 * first time called so just malloc everything: don't rely on realloc
199 */
200 top_row = 0; /* no saved lines */
201 term_start = 0;
202
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199 205
200 if (!screen.text) 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
201 { 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 /* 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 * first time called so just malloc everything: don't rely on realloc 209
204 * Note: this is still needed so that all the scrollback lines are NULL 210 for (int row = nrow; row--; )
205 */ 211 {
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_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));
213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219 for (p = 0; p < nrow; p++)
220 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 213 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); 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
226 } 215 }
227 216
228 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 220 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 221 screen.charset = 0;
234 current_screen = PRIMARY; 222 current_screen = PRIMARY;
… …
251 CLEAR_ALL_SELECTION (); 239 CLEAR_ALL_SELECTION ();
252 rvideo = 0; 240 rvideo = 0;
253 } 241 }
254 else 242 else
255 { 243 {
244 CLEAR_ALL_SELECTION ();
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 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; )
268 {
269 lresize (drawn_buf[row]);
270 lresize (swap_buf [row]);
271 }
272
273 for (int row = prev_nrow; row < nrow; row++)
274 {
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row
285
286 if (top_row)
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 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
336 // fill a single destination line
337 while (lofs < llen && qcol < ncol)
338 {
339 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol;
341
342 prow = MOD (p + prow, prev_total_rows);
343
344 // we only adjust the cursor _row_ and put it into
345 // the topmost line of "long line" it was in, as
346 // this seems to upset applications/shells/readline
347 // least.
348 if (prow == ocur.row)
349 screen.cur.row = q - (total_rows - nrow);
350
351 line_t &pline = old_buf [prow];
352
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354
283 assert (swap.rend[p]); 355 assert (len);
284#endif 356 assert (pline.t);
285 talloc->free (swap.text[p]); 357
286 ralloc->free (swap.rend[p]); 358 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
359 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
360
361 lofs += len;
362 qcol += len;
363 }
287 } 364 }
288 365
289#ifdef DEBUG_STRICT 366 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
290 assert (drawn_text[p] && drawn_rend[p]); 367 qline->is_longer (0);
291#endif 368 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
292 talloc->free (drawn_text[p]);
293 ralloc->free (drawn_rend[p]);
294 } 369 }
370 while (p != pend && q > 0);
295 371
296 /* we have fewer rows so fix up cursor position */ 372 term_start = total_rows - nrow;
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 373 top_row = q - term_start;
298 374
299 scr_reset_realloc (); /* realloc _last_ */ 375 // make sure all terminal lines exist
300 } 376 while (top_row > 0)
301 else if (nrow > prev_nrow) 377 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
302 { 378 }
303 /* add rows */ 379 else
304 scr_reset_realloc (); /* realloc _first_ */ 380 {
305 381 // if no scrollback exists (yet), wing, instead of wrap
306 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 382
307 383 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 { 384 {
312 screen.tlen[p] = 0; 385 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
313 screen.text[p] = NULL; 386 line_t &qline = row_buf [row];
314 screen.rend[p] = NULL; 387
388 qline = pline;
389 lresize (qline);
315 } 390 }
316 391
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++) 392 for (int row = prev_nrow; row < nrow; row++)
321 { 393 {
322 swap.tlen[p] = 0; 394 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 } 395 }
330 396
331 if (k > 0) 397 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 { 398 }
350 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
351 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
352 399
353 for (p = 0; p < total_rows; p++) 400 free (old_buf);
354 { 401 delete old_ta;
355 if (screen.text[p]) 402 delete old_ra;
356 {
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 403
360 MIN_IT (screen.tlen[p], (int16_t)ncol); 404 clamp_it (screen.cur.row, 0, nrow - 1);
361 405 clamp_it (screen.cur.col, 0, ncol - 1);
362 if (ncol > prev_ncol)
363 scr_blank_line (&screen.text[p][prev_ncol],
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 406
400 if (tabs) 407 if (tabs)
401 free (tabs); 408 free (tabs);
402 } 409 }
403 410
404 prev_nrow = nrow; 411 prev_nrow = nrow;
405 prev_ncol = ncol; 412 prev_ncol = ncol;
406 413
407 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 414 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
408 415
409 for (p = 0; p < ncol; p++) 416 for (int col = ncol; col--; )
410 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 417 tabs [col] = col % TABSIZE == 0;
411 418
412 tt_winch (); 419 tt_winch ();
413}
414 420
415void 421 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} 422}
437 423
438/* ------------------------------------------------------------------------- */ 424/* ------------------------------------------------------------------------- */
439/* 425/*
440 * Free everything. That way malloc debugging can find leakage. 426 * Free everything. That way malloc debugging can find leakage.
441 */ 427 */
442void 428void
443rxvt_term::scr_release () 429rxvt_term::scr_release ()
444{ 430{
445 unsigned int total_rows;
446 int i;
447
448 total_rows = TermWin.nrow + TermWin.saveLines;
449
450 delete talloc; talloc = 0; 431 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 432 delete ralloc; ralloc = 0;
452 433
453 free (screen.text); 434 free (row_buf);
454 free (screen.tlen); 435 free (swap_buf);
455 free (screen.rend);
456 free (drawn_text); 436 free (drawn_buf);
457 free (drawn_rend);
458 free (swap.text);
459 free (swap.tlen);
460 free (swap.rend);
461 free (buf_text);
462 free (buf_rend);
463 free (tabs); 437 free (tabs);
464 438
465 /* NULL these so if anything tries to use them, we'll know about it */ 439 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} 440}
473 441
474/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
475/* 443/*
476 * Hard reset 444 * Hard reset
… …
481 scr_release (); 449 scr_release ();
482 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
483 scr_reset (); 451 scr_reset ();
484 452
485 scr_clear (true); 453 scr_clear (true);
486 scr_refresh (SLOW_REFRESH); 454 scr_refresh ();
487} 455}
488 456
489/* ------------------------------------------------------------------------- * 457/* ------------------------------------------------------------------------- *
490 * PROCESS SCREEN COMMANDS * 458 * PROCESS SCREEN COMMANDS *
491 * ------------------------------------------------------------------------- */ 459 * ------------------------------------------------------------------------- */
… …
527 set_font_style (); 495 set_font_style ();
528 break; 496 break;
529 } 497 }
530 498
531 /* boundary check in case screen size changed between SAVE and RESTORE */ 499 /* boundary check in case screen size changed between SAVE and RESTORE */
532 MIN_IT (s->cur.row, TermWin.nrow - 1); 500 min_it (s->cur.row, nrow - 1);
533 MIN_IT (s->cur.col, TermWin.ncol - 1); 501 min_it (s->cur.col, ncol - 1);
534#ifdef DEBUG_STRICT 502#ifdef DEBUG_STRICT
535 assert (s->cur.row >= 0); 503 assert (s->cur.row >= 0);
536 assert (s->cur.col >= 0); 504 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 505#endif
541} 506}
542 507
543/* ------------------------------------------------------------------------- */ 508/* ------------------------------------------------------------------------- */
544/* 509/*
… …
547 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 512 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
548 */ 513 */
549int 514int
550rxvt_term::scr_change_screen (int scrn) 515rxvt_term::scr_change_screen (int scrn)
551{ 516{
552 int i;
553#if NSCREENS
554 int offset;
555#endif
556
557 want_refresh = 1; 517 want_refresh = 1;
558
559 TermWin.view_start = 0; 518 view_start = 0;
560 519
561 if (current_screen == scrn) 520 if (current_screen == scrn)
562 return scrn; 521 return scrn;
563 522
564 selection_check (2); /* check for boundary cross */ 523 selection_check (2); /* check for boundary cross */
565 524
566 i = current_screen; current_screen = scrn; scrn = i; 525 int i = current_screen; current_screen = scrn; scrn = i;
567 526
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 527 ::swap (screen.cur.row, swap.cur.row);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 528 ::swap (screen.cur.col, swap.cur.col);
570 MAX_IT (screen.cur.row, 0); 529
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 530 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0); 531 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574 532
575#if NSCREENS 533#if NSCREENS
576 if (options & Opt_secondaryScreen) 534 if (OPTION (Opt_secondaryScreen))
577 { 535 {
578 num_scr = 0; 536 num_scr = 0;
579 offset = TermWin.saveLines;
580 537
581 for (i = prev_nrow; i--;) 538 for (int i = prev_nrow; i--; )
582 { 539 ::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 540
588 SWAP_IT (screen.charset, swap.charset, int16_t); 541 ::swap (screen.charset, swap.charset);
589 SWAP_IT (screen.flags, swap.flags, int); 542 ::swap (screen.flags, swap.flags);
590 screen.flags |= Screen_VisibleCursor; 543 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 544 swap.flags |= Screen_VisibleCursor;
592 } 545 }
593 else 546 else
594#endif 547#endif
595 if (options & Opt_secondaryScroll) 548 if (OPTION (Opt_secondaryScroll))
596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 549 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
597 550
598 return scrn; 551 return scrn;
599} 552}
600 553
601// clear WrapNext indicator, solidifying position on next line 554// clear WrapNext indicator, solidifying position on next line
… …
608 screen.flags &= ~Screen_WrapNext; 561 screen.flags &= ~Screen_WrapNext;
609 562
610 screen.cur.col = 0; 563 screen.cur.col = 0;
611 564
612 if (screen.cur.row == screen.bscroll) 565 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 566 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
614 else if (screen.cur.row < TermWin.nrow - 1) 567 else if (screen.cur.row < nrow - 1)
615 screen.cur.row++; 568 screen.cur.row++;
616} 569}
617 570
618/* ------------------------------------------------------------------------- */ 571/* ------------------------------------------------------------------------- */
619/* 572/*
620 * Change the colour for following text 573 * Change the colour for following text
621 */ 574 */
622void 575void
623rxvt_term::scr_color (unsigned int color, int fgbg) 576rxvt_term::scr_color (unsigned int color, int fgbg)
624{ 577{
625 if (color > maxTermCOLOR) 578 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
626 color = fgbg; 579 color = fgbg;
627 580
628 if (fgbg == Color_fg) 581 if (fgbg == Color_fg)
629 rstyle = SET_FGCOLOR (rstyle, color); 582 rstyle = SET_FGCOLOR (rstyle, color);
630 else 583 else
… …
649/* ------------------------------------------------------------------------- */ 602/* ------------------------------------------------------------------------- */
650/* 603/*
651 * Scroll text between <row1> and <row2> inclusive, by <count> lines 604 * Scroll text between <row1> and <row2> inclusive, by <count> lines
652 * count positive ==> scroll up 605 * count positive ==> scroll up
653 * count negative ==> scroll down 606 * count negative ==> scroll down
654 * spec == 0 for normal routines
655 */ 607 */
656int 608int
657rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 609rxvt_term::scr_scroll_text (int row1, int row2, int count)
658{ 610{
659 int i, j;
660 long nscrolled;
661
662 if (count == 0 || (row1 > row2)) 611 if (count == 0 || (row1 > row2))
663 return 0; 612 return 0;
664 613
665 want_refresh = 1; 614 want_refresh = 1;
615 num_scr += count;
666 616
667 if (row1 == 0 && count > 0 617 if (count > 0
618 && row1 == 0
668 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 {
621 top_row = max (top_row - count, -saveLines);
622
623 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows;
625
626 // sever bottommost line
669 { 627 {
670 nscrolled = (long)TermWin.nscrolled + (long)count; 628 line_t &l = ROW(row2 - count);
671 629 l.is_longer (0);
672 if (nscrolled > (long)TermWin.saveLines) 630 l.touch ();
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 } 631 }
682 else if (!spec)
683 row1 += TermWin.saveLines;
684 632
685 row2 += TermWin.saveLines; 633 // erase newly scrolled-in lines
634 for (int i = count; i--; )
635 {
636 // basically this is a slightly optimized scr_blank_screen_mem
637 // it is worth the effort on slower machines
638 line_t &l = ROW(nrow - 1 - i);
686 639
640 scr_blank_line (l, 0, l.l, rstyle);
641
642 l.l = 0;
643 l.f = 0;
644 }
645
646 // now copy lines below the scroll region bottom to the
647 // bottom of the screen again, so they look as if they
648 // hadn't moved.
649 for (int i = nrow; --i > row2; )
650 {
651 line_t &l1 = ROW(i - count);
652 line_t &l2 = ROW(i);
653
654 ::swap (l1, l2);
655 l2.touch ();
656 }
657
658 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 659 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 } 660 {
701 else if (j >= row1 && j <= row2)
702 {
703 /* move selected region too */
704 selection.beg.row -= count; 661 selection.beg.row -= count;
705 selection.end.row -= count; 662 selection.end.row -= count;
706 selection.mark.row -= count; 663 selection.mark.row -= count;
664
665 if (selection.beg.row < top_row
666 || selection.end.row < top_row
667 || selection.mark.row < top_row)
668 {
669 CLEAR_ALL_SELECTION ();
670 selection.op = SELECTION_CLEAR;
707 } 671 }
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 { 672 }
744 buf_text[i] = screen.text[j]; 673
745 buf_rend[i] = screen.rend[j]; 674 // finally move the view window, if desired
675 if (OPTION (Opt_scrollWithBuffer)
676 && view_start != 0
677 && view_start != -saveLines)
678 scr_page (UP, count);
679
680 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
681 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
682 }
683 else
684 {
685 if (selection.op && current_screen == selection.screen)
746 } 686 {
747 687 if ((selection.beg.row < row1 && selection.end.row > row1)
748 /* Rotate lines */ 688 || (selection.beg.row < row2 && selection.end.row > row2)
749 for (j = row2, i = j - count; i >= row1; i--, j--) 689 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
690 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
691 || (selection.end.row - count < row1 && selection.end.row >= row1)
692 || (selection.end.row - count > row2 && selection.end.row <= row2))
693 {
694 CLEAR_ALL_SELECTION ();
695 selection.op = SELECTION_CLEAR;
696 }
697 else if (selection.end.row >= row1 && selection.end.row <= row2)
698 {
699 /* move selected region too */
700 selection.beg.row -= count;
701 selection.end.row -= count;
702 selection.mark.row -= count;
703
704 selection_check (0);
705 }
750 { 706 }
751 screen.tlen[j] = screen.tlen[i]; 707
752 screen.text[j] = screen.text[i]; 708 // use a simple and robust scrolling algorithm, this
753 screen.rend[j] = screen.rend[i]; 709 // part of scr_scroll_text is not time-critical.
710
711 int rows = row2 - row1 + 1;
712
713 min_it (count, rows);
714
715 line_t *temp_buf = row_buf + total_rows;
716
717 for (int row = 0; row < rows; row++)
754 } 718 {
719 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
755 720
756 j = row1, i = count; 721 if (!IN_RANGE_EXC (row + count, 0, rows))
757 count = -count; 722 scr_blank_screen_mem (temp_buf [row], rstyle);
758 } 723 }
759 724
760 /* Resurrect lines */ 725 for (int row = 0; row < rows; row++)
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 726 ROW(row1 + row) = temp_buf [row];
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 727 }
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
764 if (!spec) /* line length may not equal TermWin.ncol */
765 for (; i--; j++)
766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
767 728
768 return count; 729 return count;
769} 730}
770 731
771/* ------------------------------------------------------------------------- */ 732/* ------------------------------------------------------------------------- */
772/* 733/*
773 * Add text given in <str> of length <len> to screen struct 734 * Add text given in <str> of length <len> to screen struct
774 */ 735 */
775void 736void
776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 737rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
777{ 738{
739 if (len <= 0) /* sanity */
740 return;
741
778 unsigned char checksel; 742 unsigned char checksel;
779 unicode_t c; 743 unicode_t c;
780 int i, row, last_col; 744 int ncol = this->ncol;
781 text_t *stp; 745 const wchar_t *strend = str + len;
782 rend_t *srp;
783
784 if (len <= 0) /* sanity */
785 return;
786 746
787 want_refresh = 1; 747 want_refresh = 1;
788 ZERO_SCROLLBACK (); 748 ZERO_SCROLLBACK ();
789 last_col = TermWin.ncol;
790 749
791 if (nlines > 0) 750 if (minlines > 0)
792 { 751 {
793 nlines += screen.cur.row - screen.bscroll; 752 minlines += screen.cur.row - screen.bscroll;
753
794 if ((nlines > 0) 754 if (minlines > 0
795 && (screen.tscroll == 0) 755 && screen.tscroll == 0
796 && (screen.bscroll == (TermWin.nrow - 1))) 756 && screen.bscroll == nrow - 1)
797 { 757 {
798 /* _at least_ this many lines need to be scrolled */ 758 /* _at least_ this many lines need to be scrolled */
799 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 759 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
800 screen.cur.row -= nlines; 760 screen.cur.row -= minlines;
801 } 761 }
802 } 762 }
803 763
804#ifdef DEBUG_STRICT 764#ifdef DEBUG_STRICT
805 assert (screen.cur.col < last_col); 765 assert (screen.cur.col < ncol);
806 assert ((screen.cur.row < TermWin.nrow) 766 assert (screen.cur.row < nrow
807 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 767 && screen.cur.row >= top_row);
808#else /* drive with your eyes closed */
809 MIN_IT (screen.cur.col, last_col - 1);
810 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
811 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
812#endif 768#endif
813 row = screen.cur.row + TermWin.saveLines; 769 int row = screen.cur.row;
814 770
815 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 771 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816 772
817 stp = screen.text[row]; 773 line_t *line = &ROW(row);
818 srp = screen.rend[row];
819 774
820 while (len--) 775 while (str < strend)
821 { 776 {
822 c = *str++; 777 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
823 778
824 if (c < 0x20) 779 if (c < 0x20)
825 switch (c) 780 if (c == C0_LF)
826 { 781 {
827 case C0_HT: 782 max_it (line->l, screen.cur.col);
828 scr_tab (1, true);
829 continue;
830 783
831 case C0_LF:
832 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col);
834
835 screen.flags &= ~Screen_WrapNext; 784 screen.flags &= ~Screen_WrapNext;
836 785
837 if (screen.cur.row == screen.bscroll) 786 if (screen.cur.row == screen.bscroll)
838 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 787 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
839 else if (screen.cur.row < (TermWin.nrow - 1)) 788 else if (screen.cur.row < (nrow - 1))
840 row = (++screen.cur.row) + TermWin.saveLines; 789 row = ++screen.cur.row;
841 790
842 stp = screen.text[row]; /* _must_ refresh */ 791 line = &ROW(row); /* _must_ refresh */
843 srp = screen.rend[row]; /* _must_ refresh */
844 continue; 792 continue;
793 }
794 else if (c == C0_CR)
795 {
796 max_it (line->l, screen.cur.col);
845 797
846 case C0_CR:
847 if (screen.tlen[row] != -1) /* XXX: think about this */
848 MAX_IT (screen.tlen[row], screen.cur.col);
849
850 screen.flags &= ~Screen_WrapNext; 798 screen.flags &= ~Screen_WrapNext;
851 screen.cur.col = 0; 799 screen.cur.col = 0;
852 continue; 800 continue;
801 }
802 else if (c == C0_HT)
803 {
804 scr_tab (1, true);
805 continue;
853 } 806 }
854 807
855 if (checksel /* see if we're writing within selection */ 808 if (checksel /* see if we're writing within selection */
856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 809 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
857 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 810 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
865 CLEAR_SELECTION (); 818 CLEAR_SELECTION ();
866 } 819 }
867 820
868 if (screen.flags & Screen_WrapNext) 821 if (screen.flags & Screen_WrapNext)
869 { 822 {
870 screen.tlen[row] = -1; 823 scr_do_wrap ();
871
872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
873
874 stp = screen.text[row]; /* _must_ refresh */
875 srp = screen.rend[row]; /* _must_ refresh */
876 } 824
825 line->l = ncol;
826 line->is_longer (1);
827
828 row = screen.cur.row;
829 line = &ROW(row); /* _must_ refresh */
830 }
831
832 // some utf-8 decoders "decode" surrogate characters: let's fix this.
833 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
834 c = 0xfffd;
877 835
878 // rely on wcwidth to tell us the character width, at least for non-latin1 836 // rely on wcwidth to tell us the character width, at least for non-latin1
879 // do wcwidth before further replacements, as wcwidth says that line-drawing 837 // do wcwidth before further replacements, as wcwidth might return -1
880 // characters have width -1 (DOH!) on GNU/Linux sometimes. 838 // for the line drawing characters below as they might be invalid in the current
839 // locale.
881 int width = c < 0x100 ? 1 : wcwidth (c); 840 int width = c < 0x100 ? 1 : wcwidth (c);
882 841
883 if (charsets[screen.charset] == '0') // DEC SPECIAL 842 if (charsets [screen.charset] == '0') // DEC SPECIAL
884 { 843 {
885 // vt100 special graphics and line drawing 844 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100 845 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars 846 // 40-5e rxvt extension for extra curses acs chars
888 static uint16_t vt100_0[63] = { // 40 .. 7e 847 static uint16_t vt100_0[62] = { // 41 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 848 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 849 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 850 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 851 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 852 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 853 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 854 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 855 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897 }; 856 };
898 857
899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 858 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
900 { 859 {
901 c = vt100_0[c - 0x40]; 860 c = vt100_0[c - 0x41];
902 width = 1; 861 width = 1; // vt100 line drawing characters are always single-width
903 } 862 }
904 } 863 }
905 864
906 if (screen.flags & Screen_Insert) 865 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT); 866 scr_insdel_chars (width, INSERT);
908 867
909 if (width != 0) 868 if (width != 0)
910 { 869 {
911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3 870#if !UNICODE_3
916 // trim characters we can't store directly :( 871 // trim characters we can't store directly :(
917 if (c >= 0x10000) 872 if (c >= 0x10000)
918# if ENABLE_COMBINING 873# if ENABLE_COMBINING
919 c = rxvt_composite.compose (c); // map to lower 16 bits 874 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
921 c = 0xfffd; 876 c = 0xfffd;
922# endif 877# endif
923#endif 878#endif
924 879
925 // nuke the character at this position, if required 880 // nuke the character at this position, if required
926 if (stp[screen.cur.col] == NOCHAR 881 if (line->t[screen.cur.col] == NOCHAR
927 || (screen.cur.col < TermWin.ncol - 1 882 || (screen.cur.col < ncol - 1
928 && stp[screen.cur.col + 1] == NOCHAR)) 883 && line->t[screen.cur.col + 1] == NOCHAR))
929 { 884 {
930 int col = screen.cur.col; 885 int col = screen.cur.col;
931 886
932 // find begin 887 // find begin
933 while (col > 0 && stp[col] == NOCHAR) 888 while (col > 0 && line->t[col] == NOCHAR)
934 col--; 889 col--;
935 890
936 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 891 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
937 892
938 // found begin, nuke 893 // found begin, nuke
939 do { 894 do {
940 stp[col] = ' '; 895 line->t[col] = ' ';
941 srp[col] = rend; 896 line->r[col] = rend;
942 col++; 897 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR); 898 } while (col < ncol && line->t[col] == NOCHAR);
944 } 899 }
945 900
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 901 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
902
903 // if the character doesn't fit into the remaining columns...
904 if (screen.cur.col > ncol - width && ncol >= width)
905 {
906 // ...output spaces
907 c = ' ';
908 // and try the same character next loop iteration
909 --str;
910 }
911
912 line->touch ();
947 913
948 do 914 do
949 { 915 {
950 stp[screen.cur.col] = c; 916 line->t[screen.cur.col] = c;
951 srp[screen.cur.col] = rend; 917 line->r[screen.cur.col] = rend;
952 918
953 if (screen.cur.col < last_col - 1) 919 if (screen.cur.col < ncol - 1)
954 screen.cur.col++; 920 screen.cur.col++;
955 else 921 else
956 { 922 {
957 screen.tlen[row] = last_col; 923 line->l = ncol;
958 if (screen.flags & Screen_Autowrap) 924 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 925 screen.flags |= Screen_WrapNext;
960 break; 926 break;
961 } 927 }
962 928
… …
964 } 930 }
965 while (--width > 0); 931 while (--width > 0);
966 932
967 // pad with spaces when overwriting wide character with smaller one 933 // pad with spaces when overwriting wide character with smaller one
968 if (!width) 934 if (!width)
935 {
936 line->touch ();
937
969 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 938 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
970 { 939 {
971 stp[c] = ' '; 940 line->t[c] = ' ';
972 srp[c] = rend; 941 line->r[c] = rend;
973 } 942 }
974 } 943 }
944 }
975 else if (width == 0) 945 else // width == 0
976 { 946 {
977#if ENABLE_COMBINING 947#if ENABLE_COMBINING
978 // handle combining characters 948 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 949 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 950 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 951 // we don't handle double-width characters nicely yet.
982 952 line_t *linep;
983 text_t *tp; 953 text_t *tp;
984 rend_t *rp; 954 rend_t *rp;
985 955
986 if (screen.cur.col > 0) 956 if (screen.cur.col > 0)
987 { 957 {
958 linep = line;
988 tp = stp + screen.cur.col - 1; 959 tp = line->t + screen.cur.col - 1;
989 rp = srp + screen.cur.col - 1; 960 rp = line->r + screen.cur.col - 1;
990
991 while (*tp == NOCHAR && tp > stp)
992 tp--, rp--;
993 } 961 }
994 else if (screen.cur.row > 0 962 else if (screen.cur.row > 0
995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 963 && ROW(screen.cur.row - 1).is_longer ())
996 { 964 {
997 int line = screen.cur.row - 1 + TermWin.saveLines; 965 linep = &ROW(screen.cur.row - 1);
998
999 tp = screen.text[line] + last_col - 1; 966 tp = line->t + ncol - 1;
1000 rp = screen.rend[line] + last_col - 1; 967 rp = line->r + ncol - 1;
1001
1002 while (*tp == NOCHAR && tp > screen.text[line])
1003 tp--, rp--;
1004 } 968 }
1005 else 969 else
1006 continue; 970 continue;
971
972 linep->touch ();
973
974 while (*tp == NOCHAR && tp > linep->t)
975 tp--, rp--;
1007 976
1008 // first try to find a precomposed character 977 // first try to find a precomposed character
1009 unicode_t n = rxvt_compose (*tp, c); 978 unicode_t n = rxvt_compose (*tp, c);
1010 if (n == NOCHAR) 979 if (n == NOCHAR)
1011 n = rxvt_composite.compose (*tp, c); 980 n = rxvt_composite.compose (*tp, c);
… …
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 983 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1015#endif 984#endif
1016 } 985 }
1017 } 986 }
1018 987
1019 if (screen.tlen[row] != -1) /* XXX: think about this */ 988 max_it (line->l, screen.cur.col);
1020 MAX_IT (screen.tlen[row], screen.cur.col);
1021 989
1022#ifdef DEBUG_STRICT 990#ifdef DEBUG_STRICT
1023 assert (screen.cur.row >= 0); 991 assert (screen.cur.row >= 0);
1024#else /* drive with your eyes closed */
1025 MAX_IT (screen.cur.row, 0);
1026#endif 992#endif
1027} 993}
1028 994
1029/* ------------------------------------------------------------------------- */ 995/* ------------------------------------------------------------------------- */
1030/* 996/*
… …
1039 if (screen.cur.col == 0) 1005 if (screen.cur.col == 0)
1040 { 1006 {
1041 if (screen.cur.row > 0) 1007 if (screen.cur.row > 0)
1042 { 1008 {
1043#ifdef TERMCAP_HAS_BW 1009#ifdef TERMCAP_HAS_BW
1044 screen.cur.col = TermWin.ncol - 1; 1010 screen.cur.col = ncol - 1;
1045 screen.cur.row--; 1011 screen.cur.row--;
1046 return; 1012 return;
1047#endif 1013#endif
1048 } 1014 }
1049 } 1015 }
… …
1069 1035
1070 if (count == 0) 1036 if (count == 0)
1071 return; 1037 return;
1072 else if (count > 0) 1038 else if (count > 0)
1073 { 1039 {
1074 int row = TermWin.saveLines + screen.cur.row; 1040 line_t &l = ROW(screen.cur.row);
1075 text_t *tp = screen.text[row];
1076 rend_t *rp = screen.rend[row];
1077 rend_t base_rend = rp[i]; 1041 rend_t base_rend = l.r[i];
1078 ht &= tp[i] == ' '; 1042 ht &= l.t[i] == ' ';
1079 1043
1080 for (; ++i < TermWin.ncol; ) 1044 for (; ++i < ncol; )
1081 if (tabs[i]) 1045 if (tabs[i])
1082 { 1046 {
1083 x = i; 1047 x = i;
1048
1084 if (!--count) 1049 if (!--count)
1085 break; 1050 break;
1086 } 1051 }
1087 else 1052 else
1088 ht &= tp[i] == ' ' 1053 ht &= l.t[i] == ' '
1089 && RS_SAME (rp[i], base_rend); 1054 && RS_SAME (l.r[i], base_rend);
1090 1055
1091 if (count) 1056 if (count)
1092 x = TermWin.ncol - 1; 1057 x = ncol - 1;
1093 1058
1094 // store horizontal tab commands as characters inside the text 1059 // store horizontal tab commands as characters inside the text
1095 // buffer so they can be selected and pasted. 1060 // buffer so they can be selected and pasted.
1096 if (ht && options & Opt_pastableTabs) 1061 if (ht && OPTION (Opt_pastableTabs))
1097 { 1062 {
1098 base_rend = SET_FONT (base_rend, 0); 1063 base_rend = SET_FONT (base_rend, 0);
1099 1064
1100 if (screen.tlen[row] != -1) /* XXX: think about this */ 1065 l.touch (x);
1101 MAX_IT (screen.tlen[row], x);
1102 1066
1103 i = screen.cur.col; 1067 i = screen.cur.col;
1104 1068
1105 tp[i] = '\t'; 1069 l.t[i] = '\t';
1106 rp[i] = base_rend; 1070 l.r[i] = base_rend;
1107 1071
1108 while (++i < x) 1072 while (++i < x)
1109 { 1073 {
1110 tp[i] = NOCHAR; 1074 l.t[i] = NOCHAR;
1111 rp[i] = base_rend; 1075 l.r[i] = base_rend;
1112 } 1076 }
1113 } 1077 }
1114 } 1078 }
1115 else /* if (count < 0) */ 1079 else /* if (count < 0) */
1116 { 1080 {
… …
1142rxvt_term::scr_backindex () 1106rxvt_term::scr_backindex ()
1143{ 1107{
1144 if (screen.cur.col > 0) 1108 if (screen.cur.col > 0)
1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1109 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1146 else 1110 else
1147 {
1148 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1149 return; /* um, yeah? */
1150
1151 scr_insdel_chars (1, INSERT); 1111 scr_insdel_chars (1, INSERT);
1152 }
1153} 1112}
1154#endif 1113#endif
1155/* ------------------------------------------------------------------------- */ 1114/* ------------------------------------------------------------------------- */
1156/* 1115/*
1157 * Process DEC Forward Index 1116 * Process DEC Forward Index
… …
1161 */ 1120 */
1162#if ENABLE_FRILLS 1121#if ENABLE_FRILLS
1163void 1122void
1164rxvt_term::scr_forwardindex () 1123rxvt_term::scr_forwardindex ()
1165{ 1124{
1166 int row;
1167
1168 if (screen.cur.col < TermWin.ncol - 1) 1125 if (screen.cur.col < ncol - 1)
1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1126 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1170 else 1127 else
1171 { 1128 {
1172 row = screen.cur.row + TermWin.saveLines; 1129 line_t &l = ROW(screen.cur.row);
1173 1130
1174 if (screen.tlen[row] == 0) 1131 l.touch ();
1175 return; /* um, yeah? */ 1132 l.is_longer (0);
1176 else if (screen.tlen[row] == -1)
1177 screen.tlen[row] = TermWin.ncol;
1178 1133
1179 scr_gotorc (0, 0, R_RELATIVE); 1134 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1135 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1136 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1137 }
1183} 1138}
1184#endif 1139#endif
1185 1140
1186/* ------------------------------------------------------------------------- */ 1141/* ------------------------------------------------------------------------- */
… …
1192{ 1147{
1193 want_refresh = 1; 1148 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1149 ZERO_SCROLLBACK ();
1195 1150
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1151 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1152 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1199 1153
1200 screen.flags &= ~Screen_WrapNext; 1154 screen.flags &= ~Screen_WrapNext;
1201 1155
1202 if (relative & R_RELATIVE) 1156 if (relative & R_RELATIVE)
1203 { 1157 {
… …
1221 else 1175 else
1222 { 1176 {
1223 if (screen.flags & Screen_Relative) 1177 if (screen.flags & Screen_Relative)
1224 { /* relative origin mode */ 1178 { /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1179 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1180 min_it (screen.cur.row, screen.bscroll);
1227 } 1181 }
1228 else 1182 else
1229 screen.cur.row = row; 1183 screen.cur.row = row;
1230 } 1184 }
1231 1185
1232 MAX_IT (screen.cur.row, 0); 1186 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1234} 1187}
1235 1188
1236/* ------------------------------------------------------------------------- */ 1189/* ------------------------------------------------------------------------- */
1237/* 1190/*
1238 * direction should be UP or DN 1191 * direction should be UP or DN
… …
1249 1202
1250 screen.flags &= ~Screen_WrapNext; 1203 screen.flags &= ~Screen_WrapNext;
1251 1204
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1205 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1206 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1207 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1208 else
1256 screen.cur.row += dirn; 1209 screen.cur.row += dirn;
1257 1210
1258 MAX_IT (screen.cur.row, 0); 1211 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1260 selection_check (0); 1212 selection_check (0);
1261} 1213}
1262 1214
1263/* ------------------------------------------------------------------------- */ 1215/* ------------------------------------------------------------------------- */
1264/* 1216/*
… …
1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1220 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1269 */ 1221 */
1270void 1222void
1271rxvt_term::scr_erase_line (int mode) 1223rxvt_term::scr_erase_line (int mode)
1272{ 1224{
1273 unsigned int row, col, num; 1225 unsigned int col, num;
1274 1226
1275 want_refresh = 1; 1227 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1228 ZERO_SCROLLBACK ();
1277 1229
1278 selection_check (1); 1230 selection_check (1);
1279 1231
1280 row = TermWin.saveLines + screen.cur.row; 1232 line_t &line = ROW(screen.cur.row);
1233
1234 line.touch ();
1235 line.is_longer (0);
1236
1281 switch (mode) 1237 switch (mode)
1282 { 1238 {
1283 case 0: /* erase to end of line */ 1239 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1240 col = screen.cur.col;
1285 num = TermWin.ncol - col; 1241 num = ncol - col;
1286 MIN_IT (screen.tlen[row], (int16_t)col); 1242 min_it (line.l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1243 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1244 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1245 CLEAR_SELECTION ();
1290 break; 1246 break;
1291 case 1: /* erase to beginning of line */ 1247 case 1: /* erase to beginning of line */
… …
1295 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1251 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1296 CLEAR_SELECTION (); 1252 CLEAR_SELECTION ();
1297 break; 1253 break;
1298 case 2: /* erase whole line */ 1254 case 2: /* erase whole line */
1299 col = 0; 1255 col = 0;
1300 num = TermWin.ncol; 1256 num = ncol;
1301 screen.tlen[row] = 0; 1257 line.l = 0;
1302 if (selection.beg.row <= screen.cur.row 1258 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1259 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1260 CLEAR_SELECTION ();
1305 break; 1261 break;
1306 default: 1262 default:
1307 return; 1263 return;
1308 } 1264 }
1309 1265
1310 if (screen.text[row]) 1266 scr_blank_line (line, col, num, rstyle);
1311 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1312 else
1313 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1314} 1267}
1315 1268
1316/* ------------------------------------------------------------------------- */ 1269/* ------------------------------------------------------------------------- */
1317/* 1270/*
1318 * Erase part of whole of the screen 1271 * Erase part of whole of the screen
… …
1322 */ 1275 */
1323void 1276void
1324rxvt_term::scr_erase_screen (int mode) 1277rxvt_term::scr_erase_screen (int mode)
1325{ 1278{
1326 int num; 1279 int num;
1327 int32_t row, row_offset; 1280 int32_t row;
1328 rend_t ren; 1281 rend_t ren;
1329 XGCValues gcvalue; 1282 XGCValues gcvalue;
1330 1283
1331 want_refresh = 1; 1284 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1285 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)TermWin.saveLines;
1335 1286
1336 switch (mode) 1287 switch (mode)
1337 { 1288 {
1338 case 0: /* erase to end of screen */ 1289 case 0: /* erase to end of screen */
1339 selection_check (1); 1290 selection_check (1);
1340 scr_erase_line (0); 1291 scr_erase_line (0);
1341 row = screen.cur.row + 1; /* possible OOB */ 1292 row = screen.cur.row + 1; /* possible OOB */
1342 num = TermWin.nrow - row; 1293 num = nrow - row;
1343 break; 1294 break;
1344 case 1: /* erase to beginning of screen */ 1295 case 1: /* erase to beginning of screen */
1345 selection_check (3); 1296 selection_check (3);
1346 scr_erase_line (1); 1297 scr_erase_line (1);
1347 row = 0; 1298 row = 0;
1348 num = screen.cur.row; 1299 num = screen.cur.row;
1349 break; 1300 break;
1350 case 2: /* erase whole screen */ 1301 case 2: /* erase whole screen */
1351 selection_check (3); 1302 selection_check (3);
1352 row = 0; 1303 row = 0;
1353 num = TermWin.nrow; 1304 num = nrow;
1354 break; 1305 break;
1355 default: 1306 default:
1356 return; 1307 return;
1357 } 1308 }
1358 1309
… …
1360 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1311 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1361 || (selection.end.row >= row 1312 || (selection.end.row >= row
1362 && selection.end.row <= row + num))) 1313 && selection.end.row <= row + num)))
1363 CLEAR_SELECTION (); 1314 CLEAR_SELECTION ();
1364 1315
1365 if (row >= TermWin.nrow) /* Out Of Bounds */ 1316 if (row >= nrow) /* Out Of Bounds */
1366 return; 1317 return;
1367 1318
1368 MIN_IT (num, (TermWin.nrow - row)); 1319 min_it (num, nrow - row);
1369 1320
1370 if (rstyle & (RS_RVid | RS_Uline)) 1321 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1322 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1323 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1324 {
… …
1375 CLEAR_ROWS (row, num); 1326 CLEAR_ROWS (row, num);
1376 } 1327 }
1377 else 1328 else
1378 { 1329 {
1379 ren = rstyle & (RS_fgMask | RS_bgMask); 1330 ren = rstyle & (RS_fgMask | RS_bgMask);
1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1331 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1332 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1382 ERASE_ROWS (row, num); 1333 ERASE_ROWS (row, num);
1383 gcvalue.foreground = pix_colors[Color_fg]; 1334 gcvalue.foreground = pix_colors[Color_fg];
1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1335 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1336 }
1386 1337
1387 for (; num--; row++) 1338 for (; num--; row++)
1388 { 1339 {
1389 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1340 scr_blank_screen_mem (ROW(row), rstyle);
1390 screen.tlen[row + row_offset] = 0; 1341 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1392 } 1342 }
1393} 1343}
1394 1344
1345#if ENABLE_FRILLS
1395void 1346void
1396rxvt_term::scr_erase_savelines () 1347rxvt_term::scr_erase_savelines ()
1397{ 1348{
1398 want_refresh = 1; 1349 want_refresh = 1;
1399 ZERO_SCROLLBACK (); 1350 ZERO_SCROLLBACK ();
1400 1351
1401 for (int i = 0; i < TermWin.saveLines; ++i) 1352 top_row = 0;
1402 if (screen.text [i])
1403 {
1404 screen.tlen[i] = 0;
1405 scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
1406 }
1407} 1353}
1354#endif
1408 1355
1409/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1410/* 1357/*
1411 * Fill the screen with `E's 1358 * Fill the screen with `E's
1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1359 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1413 */ 1360 */
1414void 1361void
1415rxvt_term::scr_E () 1362rxvt_term::scr_E ()
1416{ 1363{
1417 int i, j, k;
1418 rend_t *r1, fs; 1364 rend_t fs;
1419 1365
1420 want_refresh = 1; 1366 want_refresh = 1;
1421 ZERO_SCROLLBACK (); 1367 ZERO_SCROLLBACK ();
1422 1368
1423 num_scr_allow = 0; 1369 num_scr_allow = 0;
1424 selection_check (3); 1370 selection_check (3);
1425 1371
1426 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1372 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1373 for (int row = nrow; row--; )
1428 { 1374 {
1429 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1375 line_t &line = ROW(row);
1376
1430 fill_text (screen.text[k], 'E', TermWin.ncol); 1377 fill_text (line.t, 'E', ncol);
1431 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1378 rend_t *r1 = line.r;
1379
1380 for (int j = ncol; j--; )
1432 *r1++ = fs; 1381 *r1++ = fs;
1382
1383 line.is_longer (0);
1384 line.touch (ncol);
1433 } 1385 }
1434} 1386}
1435 1387
1436/* ------------------------------------------------------------------------- */ 1388/* ------------------------------------------------------------------------- */
1437/* 1389/*
… …
1458 count = end; 1410 count = end;
1459 } 1411 }
1460 1412
1461 scr_do_wrap (); 1413 scr_do_wrap ();
1462 1414
1463 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1415 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1464} 1416}
1465 1417
1466/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1467/* 1419/*
1468 * Insert/Delete <count> characters from the current position 1420 * Insert/Delete <count> characters from the current position
… …
1470void 1422void
1471rxvt_term::scr_insdel_chars (int count, int insdel) 1423rxvt_term::scr_insdel_chars (int count, int insdel)
1472{ 1424{
1473 int col, row; 1425 int col, row;
1474 rend_t tr; 1426 rend_t tr;
1475 text_t *stp;
1476 rend_t *srp;
1477 int16_t *slp;
1478 1427
1479 want_refresh = 1; 1428 want_refresh = 1;
1480 ZERO_SCROLLBACK (); 1429 ZERO_SCROLLBACK ();
1481 1430
1482 if (count <= 0) 1431 if (count <= 0)
1483 return; 1432 return;
1484 1433
1485 scr_do_wrap (); 1434 scr_do_wrap ();
1486 1435
1487 selection_check (1); 1436 selection_check (1);
1488 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1437 min_it (count, ncol - screen.cur.col);
1489 1438
1490 row = screen.cur.row + TermWin.saveLines;
1491
1492 stp = screen.text[row];
1493 srp = screen.rend[row]; 1439 row = screen.cur.row;
1494 slp = &screen.tlen[row]; 1440
1441 line_t *line = &ROW(row);
1442
1443 line->touch ();
1444 line->is_longer (0);
1495 1445
1496 switch (insdel) 1446 switch (insdel)
1497 { 1447 {
1498 case INSERT: 1448 case INSERT:
1499 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1449 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1500 { 1450 {
1501 stp[col] = stp[col - count]; 1451 line->t[col] = line->t[col - count];
1502 srp[col] = srp[col - count]; 1452 line->r[col] = line->r[col - count];
1503 } 1453 }
1504 1454
1505 if (*slp != -1) 1455 line->l = min (line->l + count, ncol);
1506 {
1507 *slp += count;
1508 MIN_IT (*slp, TermWin.ncol);
1509 }
1510 1456
1511 if (selection.op && current_screen == selection.screen 1457 if (selection.op && current_screen == selection.screen
1512 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1458 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513 { 1459 {
1514 if (selection.end.row != screen.cur.row 1460 if (selection.end.row != screen.cur.row
1515 || (selection.end.col + count >= TermWin.ncol)) 1461 || (selection.end.col + count >= ncol))
1516 CLEAR_SELECTION (); 1462 CLEAR_SELECTION ();
1517 else 1463 else
1518 { /* shift selection */ 1464 { /* shift selection */
1519 selection.beg.col += count; 1465 selection.beg.col += count;
1520 selection.mark.col += count; /* XXX: yes? */ 1466 selection.mark.col += count; /* XXX: yes? */
1521 selection.end.col += count; 1467 selection.end.col += count;
1522 } 1468 }
1523 } 1469 }
1524 1470
1525 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1471 scr_blank_line (*line, screen.cur.col, count, rstyle);
1526 (unsigned int)count, rstyle);
1527 break; 1472 break;
1528 1473
1529 case ERASE: 1474 case ERASE:
1530 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1475 screen.cur.col += count; /* don't worry if > ncol */
1531 selection_check (1); 1476 selection_check (1);
1532 screen.cur.col -= count; 1477 screen.cur.col -= count;
1533 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1478
1534 (unsigned int)count, rstyle); 1479 line->l = max (line->l - count, 0);
1480 scr_blank_line (*line, screen.cur.col, count, rstyle);
1535 break; 1481 break;
1536 1482
1537 case DELETE: 1483 case DELETE:
1538 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1484 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1539 1485
1540 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1486 for (col = screen.cur.col; (col + count) < ncol; col++)
1541 { 1487 {
1542 stp[col] = stp[col + count]; 1488 line->t[col] = line->t[col + count];
1543 srp[col] = srp[col + count]; 1489 line->r[col] = line->r[col + count];
1544 } 1490 }
1545 1491
1546 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1492 line->l = max (line->l - count, 0);
1547 (unsigned int)count, tr); 1493 scr_blank_line (*line, ncol - count, count, tr);
1548
1549 if (*slp == -1) /* break line continuation */
1550 *slp = TermWin.ncol;
1551
1552 *slp -= count;
1553 MAX_IT (*slp, 0);
1554 1494
1555 if (selection.op && current_screen == selection.screen 1495 if (selection.op && current_screen == selection.screen
1556 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1557 { 1497 {
1558 if (selection.end.row != screen.cur.row 1498 if (selection.end.row != screen.cur.row
1559 || (screen.cur.col >= selection.beg.col - count) 1499 || (screen.cur.col >= selection.beg.col - count)
1560 || selection.end.col >= TermWin.ncol) 1500 || selection.end.col >= ncol)
1561 CLEAR_SELECTION (); 1501 CLEAR_SELECTION ();
1562 else 1502 else
1563 { 1503 {
1564 /* shift selection */ 1504 /* shift selection */
1565 selection.beg.col -= count; 1505 selection.beg.col -= count;
… …
1578 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1518 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1579 */ 1519 */
1580void 1520void
1581rxvt_term::scr_scroll_region (int top, int bot) 1521rxvt_term::scr_scroll_region (int top, int bot)
1582{ 1522{
1583 MAX_IT (top, 0); 1523 max_it (top, 0);
1584 MIN_IT (bot, (int)TermWin.nrow - 1); 1524 min_it (bot, nrow - 1);
1585 1525
1586 if (top > bot) 1526 if (top > bot)
1587 return; 1527 return;
1588 1528
1589 screen.tscroll = top; 1529 screen.tscroll = top;
… …
1668 */ 1608 */
1669void 1609void
1670rxvt_term::scr_set_tab (int mode) 1610rxvt_term::scr_set_tab (int mode)
1671{ 1611{
1672 if (mode < 0) 1612 if (mode < 0)
1673 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1613 memset (tabs, 0, ncol * sizeof (char));
1674 else if (screen.cur.col < TermWin.ncol) 1614 else if (screen.cur.col < ncol)
1675 tabs[screen.cur.col] = (mode ? 1 : 0); 1615 tabs [screen.cur.col] = !!mode;
1676} 1616}
1677 1617
1678/* ------------------------------------------------------------------------- */ 1618/* ------------------------------------------------------------------------- */
1679/* 1619/*
1680 * Set reverse/normal video 1620 * Set reverse/normal video
… …
1687 XGCValues gcvalue; 1627 XGCValues gcvalue;
1688 1628
1689 if (rvideo != mode) 1629 if (rvideo != mode)
1690 { 1630 {
1691 rvideo = mode; 1631 rvideo = mode;
1692 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1632 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1693#if XPM_BACKGROUND 1633#if XPM_BACKGROUND
1694 if (bgPixmap.pixmap == None) 1634 if (bgPixmap.pixmap == None)
1695#endif 1635#endif
1696#if TRANSPARENT 1636#if TRANSPARENT
1697 if (! (options & Opt_transparent) || am_transparent == 0) 1637 if (! OPTION (Opt_transparent) || am_transparent == 0)
1698#endif 1638#endif
1699 XSetWindowBackground (display->display, TermWin.vt, 1639 XSetWindowBackground (display->display, vt,
1700 pix_colors[Color_bg]); 1640 pix_colors[Color_bg]);
1701 1641
1702 gcvalue.foreground = pix_colors[Color_fg]; 1642 gcvalue.foreground = pix_colors[Color_fg];
1703 gcvalue.background = pix_colors[Color_bg]; 1643 gcvalue.background = pix_colors[Color_bg];
1704 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1644 XChangeGC (display->display, gc, GCBackground | GCForeground,
1705 &gcvalue); 1645 &gcvalue);
1706 scr_clear (); 1646 scr_clear ();
1707 scr_touch (true); 1647 scr_touch (true);
1708 } 1648 }
1709} 1649}
… …
1727 * Set font style 1667 * Set font style
1728 */ 1668 */
1729void 1669void
1730rxvt_term::set_font_style () 1670rxvt_term::set_font_style ()
1731{ 1671{
1672#if 0
1732 switch (charsets[screen.charset]) 1673 switch (charsets [screen.charset])
1733 { 1674 {
1734 case '0': /* DEC Special Character & Line Drawing Set */ 1675 case '0': /* DEC Special Character & Line Drawing Set */
1735 break; 1676 break;
1736 case 'A': /* United Kingdom (UK) */ 1677 case 'A': /* United Kingdom (UK) */
1737 break; 1678 break;
… …
1744 case 'C': /* Finnish character set */ 1685 case 'C': /* Finnish character set */
1745 break; 1686 break;
1746 case 'K': /* German character set */ 1687 case 'K': /* German character set */
1747 break; 1688 break;
1748 } 1689 }
1690#endif
1749} 1691}
1750 1692
1751/* ------------------------------------------------------------------------- */ 1693/* ------------------------------------------------------------------------- */
1752/* 1694/*
1753 * Choose a font 1695 * Choose a font
… …
1790bool 1732bool
1791rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1733rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1792{ 1734{
1793 bool found = false; 1735 bool found = false;
1794 1736
1795 for (int i = 0; i < TermWin.nrow; i++) 1737 for (int i = 0; i < nrow; i++)
1796 { 1738 {
1797 int col = 0; 1739 int col = 0;
1798 rend_t *drp = drawn_rend [i]; 1740 rend_t *drp = drawn_buf[i].r;
1799 1741
1800 for (; col < TermWin.ncol; col++, drp++) 1742 for (; col < ncol; col++, drp++)
1801 if ((*drp & mask) == value) 1743 if ((*drp & mask) == value)
1802 { 1744 {
1803 found = true; 1745 found = true;
1804 *drp = ~value; 1746 *drp = ~value;
1805 } 1747 }
… …
1816 PART_END, 1758 PART_END,
1817 RC_COUNT 1759 RC_COUNT
1818}; 1760};
1819 1761
1820void 1762void
1821rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1763rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1822{ 1764{
1823 int i; 1765 int i;
1824 row_col_t rc[RC_COUNT]; 1766 row_col_t rc[RC_COUNT];
1825 1767
1826 if (drawn_text == NULL) /* sanity check */ 1768 if (!drawn_buf) /* sanity check */
1827 return; 1769 return;
1828 1770
1829#ifndef NO_SLOW_LINK_SUPPORT 1771#ifndef NO_SLOW_LINK_SUPPORT
1830 if (refresh_type == FAST_REFRESH && !display->is_local) 1772 if (refresh_type == FAST_REFRESH && !display->is_local)
1831 { 1773 {
1832 y = 0; 1774 y = 0;
1833 height = TermWin.height; 1775 eheight = height;
1834 } 1776 }
1835#endif
1836
1837#ifdef DEBUG_STRICT
1838 x = max (x, 0);
1839 x = min (x, (int)TermWin.width);
1840 y = max (y, 0);
1841 y = min (y, (int)TermWin.height);
1842#endif 1777#endif
1843 1778
1844 /* round down */ 1779 /* round down */
1845 rc[PART_BEG].col = Pixel2Col (x); 1780 rc[PART_BEG].col = Pixel2Col (x);
1846 rc[PART_BEG].row = Pixel2Row (y); 1781 rc[PART_BEG].row = Pixel2Row (y);
1847 /* round up */ 1782 /* round up */
1848 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1783 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1849 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1784 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1850 1785
1851 /* sanity checks */ 1786 /* sanity checks */
1852 for (i = PART_BEG; i < RC_COUNT; i++) 1787 for (i = PART_BEG; i < RC_COUNT; i++)
1853 { 1788 {
1854 MIN_IT (rc[i].col, TermWin.ncol - 1); 1789 min_it (rc[i].col, ncol - 1);
1855 MIN_IT (rc[i].row, TermWin.nrow - 1); 1790 min_it (rc[i].row, nrow - 1);
1856 } 1791 }
1857 1792
1858 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1793 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1859 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1794 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1795
1796 num_scr_allow = 0;
1860 1797
1861 if (refresh) 1798 if (refresh)
1862 scr_refresh (SLOW_REFRESH); 1799 scr_refresh ();
1863} 1800}
1864 1801
1865/* ------------------------------------------------------------------------- */ 1802/* ------------------------------------------------------------------------- */
1866/* 1803/*
1867 * Refresh the entire screen 1804 * Refresh the entire screen
1868 */ 1805 */
1869void 1806void
1870rxvt_term::scr_touch (bool refresh) 1807rxvt_term::scr_touch (bool refresh)
1871{ 1808{
1872 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1809 scr_expose (0, 0, width, height, refresh);
1873} 1810}
1874 1811
1875/* ------------------------------------------------------------------------- */ 1812/* ------------------------------------------------------------------------- */
1876/* 1813/*
1877 * Move the display so that the line represented by scrollbar value Y is at 1814 * Move the display so that the line represented by scrollbar value Y is at
1878 * the top of the screen 1815 * the top of the screen
1879 */ 1816 */
1880int 1817void
1881rxvt_term::scr_move_to (int y, int len) 1818rxvt_term::scr_move_to (int y, int len)
1882{ 1819{
1883 long p = 0; 1820 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1884 unsigned int oldviewstart;
1885
1886 oldviewstart = TermWin.view_start;
1887
1888 if (y < len)
1889 {
1890 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1891 p -= (long) (TermWin.nrow - 1);
1892 p = max (p, 0);
1893 }
1894
1895 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1896
1897 return scr_changeview (oldviewstart);
1898} 1821}
1899 1822
1900/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1901/* 1824/*
1902 * Page the screen up/down nlines 1825 * Page the screen up/down nlines
1903 * direction should be UP or DN 1826 * direction should be UP or DN
1904 */ 1827 */
1905int 1828bool
1906rxvt_term::scr_page (enum page_dirn direction, int nlines) 1829rxvt_term::scr_page (enum page_dirn direction, int nlines)
1907{ 1830{
1908 int n; 1831 int new_view_start =
1909 unsigned int oldviewstart; 1832 direction == UP ? view_start - nlines
1833 : view_start + nlines;
1910 1834
1911 oldviewstart = TermWin.view_start;
1912
1913 if (direction == UP)
1914 {
1915 n = TermWin.view_start + nlines;
1916 TermWin.view_start = min (n, TermWin.nscrolled);
1917 }
1918 else
1919 {
1920 n = TermWin.view_start - nlines;
1921 TermWin.view_start = max (n, 0);
1922 }
1923
1924 return scr_changeview (oldviewstart); 1835 return scr_changeview (new_view_start);
1925} 1836}
1926 1837
1927int 1838bool
1928rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (int new_view_start)
1929{ 1840{
1841 clamp_it (new_view_start, top_row, 0);
1842
1930 if (TermWin.view_start != oldviewstart) 1843 if (new_view_start == view_start)
1931 { 1844 return false;
1845
1846 num_scr += new_view_start - view_start;
1847 view_start = new_view_start;
1932 want_refresh = 1; 1848 want_refresh = 1;
1933 num_scr -= (TermWin.view_start - oldviewstart);
1934 }
1935 1849
1936 return (int) (TermWin.view_start - oldviewstart); 1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1851
1852 return true;
1937} 1853}
1938 1854
1939/* ------------------------------------------------------------------------- */ 1855/* ------------------------------------------------------------------------- */
1940void 1856void
1941rxvt_term::scr_bell () 1857rxvt_term::scr_bell ()
1942{ 1858{
1943#ifndef NO_BELL 1859#ifndef NO_BELL
1860
1944# ifndef NO_MAPALERT 1861# ifndef NO_MAPALERT
1945# ifdef MAPALERT_OPTION 1862# ifdef MAPALERT_OPTION
1946 if (options & Opt_mapAlert) 1863 if (OPTION (Opt_mapAlert))
1947# endif 1864# endif
1948 XMapWindow (display->display, TermWin.parent[0]); 1865 XMapWindow (display->display, parent[0]);
1949# endif 1866# endif
1950 if (options & Opt_visualBell) 1867
1868 if (OPTION (Opt_visualBell))
1951 { 1869 {
1952 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 display->flush ();
1872 rxvt_usleep (VISUAL_BELL_DURATION);
1953 scr_rvideo_mode (!rvideo); /* refresh also done */ 1873 scr_rvideo_mode (!rvideo); /* refresh also done */
1954 } 1874 }
1955 else 1875 else
1956 XBell (display->display, 0); 1876 XBell (display->display, 0);
1877
1957#endif 1878#endif
1958} 1879}
1959 1880
1960/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1961/* ARGSUSED */ 1882/* ARGSUSED */
1962void 1883void
1963rxvt_term::scr_printscreen (int fullhist) 1884rxvt_term::scr_printscreen (int fullhist)
1964{ 1885{
1965#ifdef PRINTPIPE 1886#ifdef PRINTPIPE
1966 int i, r1, nrows, row_offset; 1887 int nrows, row_start;
1967 FILE *fd; 1888 FILE *fd;
1968 1889
1969 if ((fd = popen_printer ()) == NULL) 1890 if ((fd = popen_printer ()) == NULL)
1970 return; 1891 return;
1971 1892
1972 nrows = TermWin.nrow;
1973 row_offset = TermWin.saveLines;
1974
1975 if (!fullhist) 1893 if (fullhist)
1976 row_offset -= TermWin.view_start; 1894 {
1895 nrows = nrow - top_row;
1896 row_start = top_row;
1897 }
1977 else 1898 else
1978 { 1899 {
1979 nrows += TermWin.nscrolled; 1900 nrows = nrow;
1980 row_offset -= TermWin.nscrolled; 1901 row_start = view_start;
1981 } 1902 }
1982 1903
1983 wctomb (0, 0); 1904 wctomb (0, 0);
1984 1905
1985 for (r1 = 0; r1 < nrows; r1++) 1906 for (int r1 = 0; r1 < nrows; r1++)
1986 { 1907 {
1987 text_t *tp = screen.text[r1 + row_offset]; 1908 text_t *tp = ROW(r1).t;
1988 int len = screen.tlen[r1 + row_offset]; 1909 int len = ROW(r1).l;
1989 1910
1990 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1911 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1991 { 1912 {
1992 char mb[MB_LEN_MAX]; 1913 char mb[MB_LEN_MAX];
1993 text_t t = *tp++; 1914 text_t t = *tp++;
1994 if (t == NOCHAR) 1915 if (t == NOCHAR)
1995 continue; 1916 continue;
… …
2016/* 1937/*
2017 * Refresh the screen 1938 * Refresh the screen
2018 * drawn_text/drawn_rend contain the screen information before the update. 1939 * drawn_text/drawn_rend contain the screen information before the update.
2019 * screen.text/screen.rend contain what the screen will change to. 1940 * screen.text/screen.rend contain what the screen will change to.
2020 */ 1941 */
2021
2022#define FONT_WIDTH(X, Y) \
2023 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2024#define FONT_RBEAR(X, Y) \
2025 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2026#define FONT_LBEAR(X, Y) \
2027 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2028#define IS_FONT_CHAR(X, Y) \
2029 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2030
2031void 1942void
2032rxvt_term::scr_refresh (unsigned char refresh_type) 1943rxvt_term::scr_refresh ()
2033{ 1944{
2034 unsigned char must_clear, /* use draw_string not draw_image_string */ 1945 unsigned char must_clear, /* use draw_string not draw_image_string */
2035 showcursor; /* show the cursor */ 1946 showcursor; /* show the cursor */
2036 int16_t col, row, /* column/row we're processing */ 1947 int16_t col, row, /* column/row we're processing */
2037 ocrow; /* old cursor row */ 1948 ocrow; /* old cursor row */
2038 int i, /* tmp */ 1949 int i; /* tmp */
2039 row_offset; /* basic offset in screen structure */
2040#ifndef NO_CURSORCOLOR 1950#ifndef NO_CURSORCOLOR
2041 rend_t cc1; /* store colours at cursor position (s) */ 1951 rend_t cc1; /* store colours at cursor position (s) */
2042#endif 1952#endif
2043 rend_t *crp; // cursor rendition pointer 1953 rend_t *crp; // cursor rendition pointer
2044 1954
2045 want_refresh = 0; /* screen is current */ 1955 want_refresh = 0; /* screen is current */
2046 1956
2047 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1957 if (refresh_type == NO_REFRESH || !mapped)
2048 return; 1958 return;
2049 1959
2050 /* 1960 /*
2051 * A: set up vars 1961 * A: set up vars
2052 */ 1962 */
2053 must_clear = 0; 1963 must_clear = 0;
2054 refresh_count = 0; 1964 refresh_count = 0;
2055 1965
2056 row_offset = TermWin.saveLines - TermWin.view_start;
2057
2058#if XPM_BACKGROUND 1966#if XPM_BACKGROUND
2059 must_clear |= (bgPixmap.pixmap != None); 1967 must_clear |= bgPixmap.pixmap != None;
2060#endif 1968#endif
2061#if TRANSPARENT 1969#if TRANSPARENT
2062 must_clear |= ((options & Opt_transparent) && am_transparent); 1970 must_clear |= OPTION (Opt_transparent) && am_transparent;
2063#endif 1971#endif
2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2065 1973
2066 /* 1974 /*
2067 * B: reverse any characters which are selected 1975 * B: reverse any characters which are selected
… …
2084 1992
2085 if (showcursor) 1993 if (showcursor)
2086 { 1994 {
2087 int col = screen.cur.col; 1995 int col = screen.cur.col;
2088 1996
2089 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 1997 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090 col--; 1998 col--;
2091 1999
2092 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2000 crp = &ROW(screen.cur.row).r[col];
2093 2001
2094 if (showcursor && TermWin.focus) 2002 if (showcursor && focus)
2095 { 2003 {
2004 if (OPTION (Opt_cursorUnderline))
2005 *crp ^= RS_Uline;
2006 else
2007 {
2096 *crp ^= RS_RVid; 2008 *crp ^= RS_RVid;
2009
2097#ifndef NO_CURSORCOLOR 2010#ifndef NO_CURSORCOLOR
2098 cc1 = *crp & (RS_fgMask | RS_bgMask); 2011 cc1 = *crp & (RS_fgMask | RS_bgMask);
2099 if (ISSET_PIXCOLOR (Color_cursor)) 2012 if (ISSET_PIXCOLOR (Color_cursor))
2100 ccol1 = Color_cursor; 2013 ccol1 = Color_cursor;
2101 else 2014 else
2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2015#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2103 ccol1 = GET_FGCOLOR (rstyle); 2016 ccol1 = fgcolor_of (rstyle);
2104#else 2017#else
2105 ccol1 = Color_fg; 2018 ccol1 = Color_fg;
2106#endif 2019#endif
2107 if (ISSET_PIXCOLOR (Color_cursor2)) 2020 if (ISSET_PIXCOLOR (Color_cursor2))
2108 ccol2 = Color_cursor2; 2021 ccol2 = Color_cursor2;
2109 else 2022 else
2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2023#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2111 ccol2 = GET_BGCOLOR (rstyle); 2024 ccol2 = bgcolor_of (rstyle);
2112#else 2025#else
2113 ccol2 = Color_bg; 2026 ccol2 = Color_bg;
2114#endif 2027#endif
2115 *crp = SET_FGCOLOR (*crp, ccol1); 2028 *crp = SET_FGCOLOR (*crp, ccol1);
2116 *crp = SET_BGCOLOR (*crp, ccol2); 2029 *crp = SET_BGCOLOR (*crp, ccol2);
2117#endif 2030#endif
2031 }
2118 } 2032 }
2119 } 2033 }
2120 2034
2121 /* make sure no outline cursor is left around */ 2035 /* make sure no outline cursor is left around */
2122 setoldcursor = 0; 2036 setoldcursor = 0;
2123 if (ocrow != -1) 2037 if (ocrow != -1)
2124 { 2038 {
2125 if (screen.cur.row + TermWin.view_start != ocrow 2039 if (screen.cur.row - view_start != ocrow
2126 || screen.cur.col != oldcursor.col) 2040 || screen.cur.col != oldcursor.col)
2127 { 2041 {
2128 if (ocrow < TermWin.nrow 2042 if (ocrow < nrow
2129 && oldcursor.col < TermWin.ncol) 2043 && oldcursor.col < ncol)
2130 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2044 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2131 2045
2132 if (TermWin.focus || !showcursor) 2046 if (focus || !showcursor)
2133 oldcursor.row = -1; 2047 oldcursor.row = -1;
2134 else 2048 else
2135 setoldcursor = 1; 2049 setoldcursor = 1;
2136 } 2050 }
2137 } 2051 }
2138 else if (!TermWin.focus) 2052 else if (!focus)
2139 setoldcursor = 1; 2053 setoldcursor = 1;
2140 2054
2141 if (setoldcursor) 2055 if (setoldcursor)
2142 { 2056 {
2143 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2057 if (screen.cur.row - view_start >= nrow)
2144 oldcursor.row = -1; 2058 oldcursor.row = -1;
2145 else 2059 else
2146 { 2060 {
2147 oldcursor.row = screen.cur.row + TermWin.view_start; 2061 oldcursor.row = screen.cur.row - view_start;
2148 oldcursor.col = screen.cur.col; 2062 oldcursor.col = screen.cur.col;
2149 } 2063 }
2150 } 2064 }
2151 } 2065 }
2152 2066
2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2153#if ENABLE_OVERLAY 2068#if ENABLE_OVERLAY
2154 scr_swap_overlay (); 2069 scr_swap_overlay ();
2155#endif 2070#endif
2156
2157 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2158 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2159 2071
2160#ifndef NO_SLOW_LINK_SUPPORT 2072#ifndef NO_SLOW_LINK_SUPPORT
2161 /* 2073 /*
2162 * D: CopyArea pass - very useful for slower links 2074 * D: CopyArea pass - very useful for slower links
2163 * This has been deliberately kept simple. 2075 * This has been deliberately kept simple.
2164 */ 2076 */
2165 i = num_scr;
2166 if (!display->is_local 2077 if (!display->is_local
2167 && refresh_type == FAST_REFRESH && num_scr_allow && i 2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2168 && abs (i) < TermWin.nrow && !must_clear) 2079 && abs (num_scr) < nrow && !must_clear)
2169 { 2080 {
2170 int16_t nits; 2081 int16_t nits;
2171 int j; 2082 int j;
2172 int len, wlen; 2083 int len, wlen;
2084 dLocal (int, num_scr);
2173 2085
2174 j = TermWin.nrow; 2086 j = nrow;
2175 wlen = len = -1; 2087 wlen = len = -1;
2176 row = i > 0 ? 0 : j - 1; 2088 row = i > 0 ? 0 : j - 1;
2177 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2089 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2178 { 2090 {
2179 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2091 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2180 { 2092 {
2181 text_t *stp = screen.text[row + row_offset]; 2093 line_t s = ROW(view_start + row);
2182 rend_t *srp = screen.rend[row + row_offset];
2183 text_t *dtp = drawn_text[row]; 2094 line_t d = drawn_buf[row];
2184 text_t *dtp2 = drawn_text[row + i]; 2095 line_t d2 = drawn_buf[row + i];
2185 rend_t *drp = drawn_rend[row];
2186 rend_t *drp2 = drawn_rend[row + i];
2187 2096
2188 for (nits = 0, col = TermWin.ncol; col--; ) 2097 for (nits = 0, col = ncol; col--; )
2189 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2098 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2190 nits--; 2099 nits--;
2191 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2100 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2192 nits++; 2101 nits++;
2193 2102
2194 if (nits > 8) /* XXX: arbitrary choice */ 2103 if (nits > 8) /* XXX: arbitrary choice */
2195 { 2104 {
2196 for (col = TermWin.ncol; col--; ) 2105 for (col = ncol; col--; )
2197 { 2106 {
2198 *dtp++ = *dtp2++; 2107 *d.t++ = *d2.t++;
2199 *drp++ = *drp2++; 2108 *d.r++ = *d2.r++;
2200 } 2109 }
2201 2110
2202 if (len == -1) 2111 if (len == -1)
2203 len = row; 2112 len = row;
2204 2113
… …
2209 2118
2210 if (len != -1) 2119 if (len != -1)
2211 { 2120 {
2212 /* also comes here at end if needed because of >= above */ 2121 /* also comes here at end if needed because of >= above */
2213 if (wlen < len) 2122 if (wlen < len)
2214 SWAP_IT (wlen, len, int); 2123 ::swap (wlen, len);
2215 2124
2216 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2125 XCopyArea (display->display, vt, vt,
2217 TermWin.gc, 0, Row2Pixel (len + i), 2126 gc, 0, Row2Pixel (len + i),
2218 (unsigned int)TermWin_TotalWidth (), 2127 (unsigned int)this->width,
2219 (unsigned int)Height2Pixel (wlen - len + 1), 2128 (unsigned int)Height2Pixel (wlen - len + 1),
2220 0, Row2Pixel (len)); 2129 0, Row2Pixel (len));
2221 len = -1; 2130 len = -1;
2222 } 2131 }
2223 } 2132 }
… …
2225#endif 2134#endif
2226 2135
2227 /* 2136 /*
2228 * E: main pass across every character 2137 * E: main pass across every character
2229 */ 2138 */
2230 for (row = 0; row < TermWin.nrow; row++) 2139 for (row = 0; row < nrow; row++)
2231 { 2140 {
2232 text_t *stp = screen.text[row + row_offset]; 2141 text_t *stp = ROW(view_start + row).t;
2233 rend_t *srp = screen.rend[row + row_offset]; 2142 rend_t *srp = ROW(view_start + row).r;
2234 text_t *dtp = drawn_text[row]; 2143 text_t *dtp = drawn_buf[row].t;
2235 rend_t *drp = drawn_rend[row]; 2144 rend_t *drp = drawn_buf[row].r;
2236 2145
2237 /* 2146 /*
2238 * E2: OK, now the real pass 2147 * E2: OK, now the real pass
2239 */ 2148 */
2240 int ypixel = (int)Row2Pixel (row); 2149 int ypixel = (int)Row2Pixel (row);
2241 2150
2242 for (col = 0; col < TermWin.ncol; col++) 2151 for (col = 0; col < ncol; col++)
2243 { 2152 {
2244 /* compare new text with old - if exactly the same then continue */ 2153 /* compare new text with old - if exactly the same then continue */
2245 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2154 if (stp[col] == dtp[col] /* Must match characters to skip. */
2246 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2155 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2247 || (stp[col] == ' ' /* space w/ no background change */ 2156 || (stp[col] == ' ' /* space w/ no background change */
… …
2261 dtp[col] = stp[col]; 2170 dtp[col] = stp[col];
2262 drp[col] = rend; 2171 drp[col] = rend;
2263 2172
2264 int xpixel = Col2Pixel (col); 2173 int xpixel = Col2Pixel (col);
2265 2174
2266 for (i = 0; ++col < TermWin.ncol; ) 2175 for (i = 0; ++col < ncol; )
2267 { 2176 {
2268 if (stp[col] == NOCHAR) 2177 if (stp[col] == NOCHAR)
2269 { 2178 {
2270 dtp[col] = stp[col]; 2179 dtp[col] = stp[col];
2271 drp[col] = rend; 2180 drp[col] = rend;
… …
2299 2208
2300 // sometimes we optimize away the trailing NOCHAR's, add them back 2209 // sometimes we optimize away the trailing NOCHAR's, add them back
2301 while (i && text[count] == NOCHAR) 2210 while (i && text[count] == NOCHAR)
2302 count++, i--; 2211 count++, i--;
2303 2212
2304#if ENABLE_STYLES
2305 // force redraw after "careful" characters to avoid pixel droppings
2306 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2307 drp[col + 1] = ~srp[col + 1];
2308
2309 // include previous careful character(s) if possible, looks nicer (best effort...)
2310 while (text > stp
2311 && srp[text - stp - 1] & RS_Careful
2312 && RS_SAME (rend, srp[text - stp - 1]))
2313 text--, count++, xpixel -= TermWin.fwidth;
2314#endif
2315
2316 /* 2213 /*
2317 * Determine the attributes for the string 2214 * Determine the attributes for the string
2318 */ 2215 */
2319 int fore = GET_FGCOLOR (rend); // desired foreground 2216 int fore = fgcolor_of (rend); // desired foreground
2320 int back = GET_BGCOLOR (rend); // desired background 2217 int back = bgcolor_of (rend); // desired background
2321 2218
2322 // only do special processing if ana attributes are set, which is rare 2219 // only do special processing if any attributes are set, which is unlikely
2323 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2220 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2324 { 2221 {
2222#if ENABLE_STYLES
2223 // force redraw after "careful" characters to avoid pixel droppings
2224 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2225 drp[col + 1] = ~srp[col + 1];
2226
2227 // include previous careful character(s) if possible, looks nicer (best effort...)
2228 while (text > stp
2229 && srp[text - stp - 1] & RS_Careful
2230 && RS_SAME (rend, srp[text - stp - 1]))
2231 text--, count++, xpixel -= fwidth;
2232#endif
2233
2325 bool invert = rend & RS_RVid; 2234 bool invert = rend & RS_RVid;
2326 2235
2327#ifndef NO_BOLD_UNDERLINE_REVERSE 2236#ifndef NO_BOLD_UNDERLINE_REVERSE
2328 if (rend & RS_Bold 2237 if (rend & RS_Bold
2329 && fore == Color_fg) 2238 && fore == Color_fg)
… …
2351 fore = Color_UL; 2260 fore = Color_UL;
2352#endif 2261#endif
2353 2262
2354 if (invert) 2263 if (invert)
2355 { 2264 {
2356 SWAP_IT (fore, back, int); 2265 ::swap (fore, back);
2357 2266
2358#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2359 if (ISSET_PIXCOLOR (Color_RV)) 2268 if (ISSET_PIXCOLOR (Color_RV))
2360 back = Color_RV; 2269 back = Color_RV;
2270
2271 if (fore == back)
2272 {
2273 fore = Color_bg;
2274 back = Color_fg;
2275 }
2361#endif 2276#endif
2362 } 2277 }
2363 2278
2364#ifdef TEXT_BLINK 2279#ifdef TEXT_BLINK
2365 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2280 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2376 } 2291 }
2377 2292
2378 /* 2293 /*
2379 * Actually do the drawing of the string here 2294 * Actually do the drawing of the string here
2380 */ 2295 */
2381 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2296 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2382 2297
2383 if (back == fore) 2298 if (back == fore)
2384 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2299 font->clear_rect (*drawable, xpixel, ypixel,
2385 TermWin.fwidth * count, TermWin.fheight, 2300 fwidth * count, fheight,
2386 back); 2301 back);
2387 else if (back == Color_bg) 2302 else if (back == Color_bg)
2388 { 2303 {
2389 if (must_clear) 2304 if (must_clear)
2390 { 2305 {
2391 CLEAR_CHARS (xpixel, ypixel, count); 2306 CLEAR_CHARS (xpixel, ypixel, count);
2392 2307
2393 for (i = 0; i < count; i++) /* don't draw empty strings */ 2308 for (i = 0; i < count; i++) /* don't draw empty strings */
2394 if (text[i] != ' ') 2309 if (text[i] != ' ')
2395 { 2310 {
2396 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2311 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2397 break; 2312 break;
2398 } 2313 }
2399 } 2314 }
2400 else 2315 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2402 } 2317 }
2403 else 2318 else
2404 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2319 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2405 2320
2406 if (rend & RS_Uline && font->descent > 1 && fore != back) 2321 if (rend & RS_Uline && font->descent > 1 && fore != back)
2407 { 2322 {
2408#if ENABLE_FRILLS 2323#if ENABLE_FRILLS
2409 if (ISSET_PIXCOLOR (Color_underline)) 2324 if (ISSET_PIXCOLOR (Color_underline))
2410 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2325 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2411 else 2326 else
2412#endif 2327#endif
2413 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2328 XSetForeground (display->display, gc, pix_colors[fore]);
2414 2329
2415 XDrawLine (display->display, drawBuffer, TermWin.gc, 2330 XDrawLine (display->display, drawBuffer, gc,
2416 xpixel, ypixel + font->ascent + 1, 2331 xpixel, ypixel + font->ascent + 1,
2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2332 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2418 } 2333 }
2419 } /* for (col....) */ 2334 } /* for (col....) */
2420 } /* for (row....) */ 2335 } /* for (row....) */
2421 2336
2422#if ENABLE_OVERLAY 2337#if ENABLE_OVERLAY
2423 scr_swap_overlay (); 2338 scr_swap_overlay ();
2424#endif 2339#endif
2340 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425 2341
2426 /* 2342 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2343 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2344 */
2429 if (showcursor) 2345 if (showcursor)
2430 { 2346 {
2431 if (TermWin.focus) 2347 if (focus)
2348 {
2349 if (OPTION (Opt_cursorUnderline))
2350 *crp ^= RS_Uline;
2351 else
2432 { 2352 {
2433 *crp ^= RS_RVid; 2353 *crp ^= RS_RVid;
2434#ifndef NO_CURSORCOLOR 2354#ifndef NO_CURSORCOLOR
2435 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2355 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2436#endif 2356#endif
2357 }
2437 } 2358 }
2438 else if (oldcursor.row >= 0) 2359 else if (oldcursor.row >= 0)
2439 { 2360 {
2361 int cursorwidth = 1;
2362 int col = oldcursor.col;
2363
2364 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2365 col--;
2366
2367 while (col + cursorwidth < ncol
2368 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2369 cursorwidth++;
2370
2440#ifndef NO_CURSORCOLOR 2371#ifndef NO_CURSORCOLOR
2441 if (ISSET_PIXCOLOR (Color_cursor)) 2372 if (ISSET_PIXCOLOR (Color_cursor))
2442 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2373 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2443#endif 2374#endif
2444 int cursorwidth = 1;
2445 while (oldcursor.col + cursorwidth < TermWin.ncol
2446 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2447 cursorwidth++;
2448 2375
2449 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2376 XDrawRectangle (display->display, drawBuffer, gc,
2450 Col2Pixel (oldcursor.col), 2377 Col2Pixel (col),
2451 Row2Pixel (oldcursor.row), 2378 Row2Pixel (oldcursor.row),
2452 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2379 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2453 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2380 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2454 } 2381 }
2455 } 2382 }
2456 2383
2457 /* 2384 /*
2458 * H: cleanup selection 2385 * H: cleanup selection
2459 */ 2386 */
2460 scr_reverse_selection (); 2387 scr_reverse_selection ();
2461 2388
2462 if (refresh_type & SMOOTH_REFRESH)
2463 XFlush (display->display);
2464
2465 num_scr = 0; 2389 num_scr = 0;
2466 num_scr_allow = 1; 2390 num_scr_allow = 1;
2467} 2391}
2468 2392
2469void 2393void
2470rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2394rxvt_term::scr_remap_chars (line_t &l)
2471{ 2395{
2472 if (!rp || !tp) 2396 if (!l.t)
2473 return; 2397 return;
2474 2398
2475 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--; )
2476 *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]));
2477} 2403}
2478 2404
2479void 2405void
2480rxvt_term::scr_remap_chars () 2406rxvt_term::scr_remap_chars ()
2481{ 2407{
2482 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2408 for (int i = total_rows; i--; )
2483 scr_remap_chars (screen.text[i], screen.rend[i]); 2409 scr_remap_chars (row_buf [i]);
2484 2410
2485 for (int i = TermWin.nrow; i--; ) 2411 for (int i = nrow; i--; )
2486 { 2412 {
2487 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2413 scr_remap_chars (drawn_buf [i]);
2488 scr_remap_chars (swap.text[i], swap.rend[i]); 2414 scr_remap_chars (swap_buf [i]);
2489 } 2415 }
2490} 2416}
2491 2417
2492void 2418void
2493rxvt_term::scr_recolour () 2419rxvt_term::scr_recolour ()
… …
2499#if XPM_BACKGROUND 2425#if XPM_BACKGROUND
2500 && !bgPixmap.pixmap 2426 && !bgPixmap.pixmap
2501#endif 2427#endif
2502 ) 2428 )
2503 { 2429 {
2504 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2430 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2505 XClearWindow (display->display, TermWin.parent[0]); 2431 XClearWindow (display->display, parent[0]);
2506 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2432 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2507#if HAVE_SCROLLBARS 2433#if HAVE_SCROLLBARS
2508 if (scrollBar.win) 2434 if (scrollBar.win)
2509 { 2435 {
2510 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2436 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2511 scrollBar.setIdle (); 2437 scrollBar.setIdle ();
… …
2521 2447
2522/* ------------------------------------------------------------------------- */ 2448/* ------------------------------------------------------------------------- */
2523void 2449void
2524rxvt_term::scr_clear (bool really) 2450rxvt_term::scr_clear (bool really)
2525{ 2451{
2526 if (!TermWin.mapped) 2452 if (!mapped)
2527 return; 2453 return;
2528 2454
2529 num_scr_allow = 0; 2455 num_scr_allow = 0;
2530 want_refresh = 1; 2456 want_refresh = 1;
2531 2457
2532#if TRANSPARENT
2533 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2534 {
2535 int i;
2536
2537 if (!(options & Opt_transparent_all))
2538 i = 0;
2539 else
2540 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2541
2542 while (i--)
2543 if (TermWin.parent[i] != None)
2544 XClearWindow (display->display, TermWin.parent[i]);
2545 }
2546#endif
2547
2548 if (really) 2458 if (really)
2549 XClearWindow (display->display, TermWin.vt); 2459 XClearWindow (display->display, vt);
2460}
2461
2462void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2464{
2465 int view_end = view_start + nrow;
2466 int row, col;
2467
2468 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2469 {
2470 text_t *stp = ROW(row).t;
2471 rend_t *srp = ROW(row).r;
2472
2473 for (col = beg_col; col < end_col; col++)
2474 srp[col] ^= rstyle1;
2475
2476 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2477 srp[col] ^= rstyle2;
2478
2479 if (++col < end_col)
2480 srp[col] ^= rstyle2;
2481 }
2482}
2483
2484void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2486{
2487 int view_end = view_start + nrow;
2488 int row, col;
2489
2490 if (beg_row >= view_start)
2491 {
2492 col = beg_col;
2493 row = beg_row;
2494 }
2495 else
2496 {
2497 col = 0;
2498 row = view_start;
2499 }
2500
2501 for (; row < min (end_row, view_end); row++, col = 0)
2502 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2503 srp[col] ^= rstyle;
2504
2505 if (row == end_row)
2506 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2507 srp[col] ^= rstyle;
2550} 2508}
2551 2509
2552/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2553void 2511void
2554rxvt_term::scr_reverse_selection () 2512rxvt_term::scr_reverse_selection ()
2555{ 2513{
2514 if (selection.op
2556 if (selection.op && current_screen == selection.screen) 2515 && current_screen == selection.screen
2516 && selection.end.row >= view_start)
2557 { 2517 {
2558 int end_row = TermWin.saveLines - TermWin.view_start;
2559 int i = selection.beg.row + TermWin.saveLines;
2560 int col, row = selection.end.row + TermWin.saveLines;
2561 rend_t *srp;
2562
2563#if ENABLE_FRILLS 2518#if ENABLE_FRILLS
2564 if (selection.rect) 2519 if (selection.rect)
2565 { 2520 scr_xor_rect (selection.beg.row, selection.beg.col,
2566 end_row += TermWin.nrow; 2521 selection.end.row, selection.end.col,
2567 2522 RS_RVid, RS_RVid | RS_Uline);
2568 for (; i <= row && i <= end_row; i++)
2569 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2570 srp[col] ^= RS_RVid;
2571 }
2572 else 2523 else
2573#endif 2524#endif
2574 { 2525 scr_xor_span (selection.beg.row, selection.beg.col,
2575 if (i >= end_row) 2526 selection.end.row, selection.end.col,
2576 col = selection.beg.col; 2527 RS_RVid);
2577 else
2578 {
2579 col = 0;
2580 i = end_row;
2581 }
2582
2583 end_row += TermWin.nrow;
2584
2585 for (; i < row && i < end_row; i++, col = 0)
2586 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2587 srp[col] ^= RS_RVid;
2588
2589 if (i == row && i < end_row)
2590 for (srp = screen.rend[i]; col < selection.end.col; col++)
2591 srp[col] ^= RS_RVid;
2592 }
2593 } 2528 }
2594} 2529}
2595 2530
2596/* ------------------------------------------------------------------------- */ 2531/* ------------------------------------------------------------------------- */
2597/* 2532/*
… …
2604{ 2539{
2605 int row, wrote; 2540 int row, wrote;
2606 unsigned int width, towrite; 2541 unsigned int width, towrite;
2607 char r1[] = "\n"; 2542 char r1[] = "\n";
2608 2543
2609 for (row = TermWin.saveLines - TermWin.nscrolled; 2544 for (row = saveLines - nsaved;
2610 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2545 row < saveLines + nrow - 1; row++)
2611 { 2546 {
2612 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2547 width = row_buf[row].l >= 0 ? row_buf[row].l
2613 : TermWin.ncol; 2548 : ncol;
2614 for (towrite = width; towrite; towrite -= wrote) 2549 for (towrite = width; towrite; towrite -= wrote)
2615 { 2550 {
2616 wrote = write (fd, & (screen.text[row][width - towrite]), 2551 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2617 towrite); 2552 towrite);
2618 if (wrote < 0) 2553 if (wrote < 0)
2619 return; /* XXX: death, no report */ 2554 return; /* XXX: death, no report */
2620 } 2555 }
2621 if (screen.tlen[row] >= 0) 2556 if (row_buf[row].l >= 0)
2622 if (write (fd, r1, 1) <= 0) 2557 if (write (fd, r1, 1) <= 0)
2623 return; /* XXX: death, no report */ 2558 return; /* XXX: death, no report */
2624 } 2559 }
2625} 2560}
2626#endif 2561#endif
2627 2562
2628/* ------------------------------------------------------------------------- * 2563/* ------------------------------------------------------------------------- *
2629 * CHARACTER SELECTION * 2564 * CHARACTER SELECTION *
2630 * ------------------------------------------------------------------------- */ 2565 * ------------------------------------------------------------------------- */
2631
2632/*
2633 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2634 */
2635void 2566void
2636rxvt_term::selection_check (int check_more) 2567rxvt_term::selection_check (int check_more)
2637{ 2568{
2638 row_col_t pos; 2569 row_col_t pos;
2639 2570
2640 if (!selection.op) 2571 if (!selection.op)
2641 return; 2572 return;
2642 2573
2643 pos.row = pos.col = 0; 2574 pos.row = pos.col = 0;
2644 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2575 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2645 || (selection.beg.row >= TermWin.nrow) 2576 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2646 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2577 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2647 || (selection.mark.row >= TermWin.nrow)
2648 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2649 || (selection.end.row >= TermWin.nrow)
2650 || (check_more == 1 2578 || (check_more == 1
2651 && current_screen == selection.screen 2579 && current_screen == selection.screen
2652 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2580 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2653 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2581 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2654 || (check_more == 2 2582 || (check_more == 2
… …
2656 && ROWCOL_IS_AFTER (selection.end, pos)) 2584 && ROWCOL_IS_AFTER (selection.end, pos))
2657 || (check_more == 3 2585 || (check_more == 3
2658 && ROWCOL_IS_AFTER (selection.end, pos)) 2586 && ROWCOL_IS_AFTER (selection.end, pos))
2659 || (check_more == 4 /* screen width change */ 2587 || (check_more == 4 /* screen width change */
2660 && (selection.beg.row != selection.end.row 2588 && (selection.beg.row != selection.end.row
2661 || selection.end.col > TermWin.ncol))) 2589 || selection.end.col > ncol)))
2662 CLEAR_SELECTION (); 2590 CLEAR_SELECTION ();
2663} 2591}
2664 2592
2665/* ------------------------------------------------------------------------- */ 2593/* ------------------------------------------------------------------------- */
2666/* 2594/*
2667 * Paste a selection direct to the command fd 2595 * Paste a selection direct to the command fd
2668 */ 2596 */
2669void 2597void
2670rxvt_term::paste (unsigned char *data, unsigned int len) 2598rxvt_term::paste (char *data, unsigned int len)
2671{ 2599{
2672 /* convert normal newline chars into common keyboard Return key sequence */ 2600 /* convert normal newline chars into common keyboard Return key sequence */
2673 for (unsigned int i = 0; i < len; i++) 2601 for (unsigned int i = 0; i < len; i++)
2674 if (data[i] == C0_LF) 2602 if (data[i] == C0_LF)
2675 data[i] = C0_CR; 2603 data[i] = C0_CR;
… …
2819 { 2747 {
2820 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2748 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2821 char *s = rxvt_wcstombs (w); 2749 char *s = rxvt_wcstombs (w);
2822 free (w); 2750 free (w);
2823 // TODO: strlen == only the first element will be converted. well... 2751 // TODO: strlen == only the first element will be converted. well...
2824 paste ((unsigned char *)s, strlen (s)); 2752 paste (s, strlen (s));
2825 free (s); 2753 free (s);
2826 } 2754 }
2827 else 2755 else
2828#endif 2756#endif
2829 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2757 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2830 && cl) 2758 && cl)
2831 { 2759 {
2832 for (int i = 0; i < cr; i++) 2760 for (int i = 0; i < cr; i++)
2833 paste ((unsigned char *)cl[i], strlen (cl[i])); 2761 paste (cl[i], strlen (cl[i]));
2834 2762
2835 XFreeStringList (cl); 2763 XFreeStringList (cl);
2836 } 2764 }
2837 else 2765 else
2838 paste (ct.value, ct.nitems); // paste raw 2766 paste ((char *)ct.value, ct.nitems); // paste raw
2839 2767
2840bailout: 2768bailout:
2841 XFree (ct.value); 2769 XFree (ct.value);
2842 2770
2843 if (selection_wait == Sel_normal) 2771 if (selection_wait == Sel_normal)
… …
2873 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2874 * will auto fallback to CUT_BUFFER0 2802 * will auto fallback to CUT_BUFFER0
2875 * EXT: button 2 release 2803 * EXT: button 2 release
2876 */ 2804 */
2877void 2805void
2878rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm)
2879{ 2807{
2880 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2881 return; /* outside window */
2882
2883 if (selection.text) 2808 if (selection.text)
2884 { /* internal selection */ 2809 { /* internal selection */
2885 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2886 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2887 free (str); 2812 free (str);
2888 return; 2813 return;
2889 } 2814 }
2890 else 2815 else
2891 { 2816 {
… …
2914 2839
2915int 2840int
2916rxvt_term::selection_request_other (Atom target, int selnum) 2841rxvt_term::selection_request_other (Atom target, int selnum)
2917{ 2842{
2918 Atom sel; 2843 Atom sel;
2919#ifdef DEBUG_SELECT
2920 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2921#endif
2922 2844
2923 selection_type |= selnum; 2845 selection_type |= selnum;
2924 2846
2925 if (selnum == Sel_Primary) 2847 if (selnum == Sel_Primary)
2926 sel = XA_PRIMARY; 2848 sel = XA_PRIMARY;
… …
2930 sel = xa[XA_CLIPBOARD]; 2852 sel = xa[XA_CLIPBOARD];
2931 2853
2932 if (XGetSelectionOwner (display->display, sel) != None) 2854 if (XGetSelectionOwner (display->display, sel) != None)
2933 { 2855 {
2934 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2856 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2935 TermWin.vt, selection_request_time); 2857 vt, selection_request_time);
2936 return 1; 2858 return 1;
2937 } 2859 }
2938 2860
2939 return 0; 2861 return 0;
2940} 2862}
… …
2963 * EXT: button 1 or 3 release 2885 * EXT: button 1 or 3 release
2964 */ 2886 */
2965void 2887void
2966rxvt_term::selection_make (Time tm) 2888rxvt_term::selection_make (Time tm)
2967{ 2889{
2968 int i, col, end_col, row, end_row; 2890 int i;
2969 wchar_t *new_selection_text; 2891 wchar_t *new_selection_text;
2970 text_t *t; 2892 text_t *t;
2971 2893
2972 switch (selection.op) 2894 switch (selection.op)
2973 { 2895 {
… …
2986 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2987 2909
2988 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2989 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2990 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2991 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2992 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2993 2918
2994 col = selection.beg.col;
2995 row = selection.beg.row + TermWin.saveLines;
2996 end_row = selection.end.row + TermWin.saveLines;
2997 int ofs = 0; 2919 int ofs = 0;
2998 int extra = 0; 2920 int extra = 0;
2999 2921
2922 int col = selection.beg.col;
2923 int row = selection.beg.row;
2924
2925 int end_col;
2926
3000 for (; row <= end_row; row++, col = 0) 2927 for (; row <= selection.end.row; row++, col = 0)
3001 { 2928 {
3002 end_col = screen.tlen[row];
3003
3004#if ENABLE_FRILLS 2929#if ENABLE_FRILLS
3005 if (selection.rect) 2930 if (selection.rect)
3006 { 2931 {
3007 col = selection.beg.col; 2932 col = selection.beg.col;
3008 end_col = TermWin.ncol + 1; 2933 end_col = ncol + 1;
2934 }
2935 else
2936#endif
2937 end_col = ROW(row).l;
2938
2939 col = max (col, 0);
2940
2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
3009 } 2945 )
3010#endif
3011
3012 MAX_IT (col, 0);
3013
3014 if (end_col == -1)
3015 end_col = TermWin.ncol;
3016
3017 if (row == end_row || selection.rect)
3018 MIN_IT (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
3019 2947
3020 t = &screen.text[row][col]; 2948 t = ROW(row).t + col;
2949
3021 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
3022 { 2951 {
3023 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
3024 t++; 2953 t++;
3025#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
3041#endif 2970#endif
3042 else 2971 else
3043 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
3044 } 2973 }
3045 2974
3046 if (screen.tlen[row] != -1 && row != end_row) 2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
3047 new_selection_text[ofs++] = C0_LF; 2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
2987 if (!ROW(row).is_longer () && row != selection.end.row)
2988 new_selection_text[ofs++] = C0_LF;
3048 } 2989 }
3049 2990
3050 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
3051 new_selection_text[ofs++] = C0_LF; 2992 new_selection_text[ofs++] = C0_LF;
3052 2993
… …
3062 3003
3063 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
3064 selection.len = ofs; 3005 selection.len = ofs;
3065 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3066 3007
3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3009 return;
3010
3011 selection_grab (tm);
3012}
3013
3014bool
3015rxvt_term::selection_grab (Time tm)
3016{
3017 selection_time = tm;
3018
3067 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3068 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
3069 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
3070 else 3025 else
3071 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 {
3027 selection_clear ();
3028 return false;
3029 }
3072 3030
3073#if 0 3031#if 0
3074 XTextProperty ct; 3032 XTextProperty ct;
3075 3033
3076 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3077 { 3035 {
3078 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3079 XFree (ct.value); 3037 XFree (ct.value);
3080 } 3038 }
3081#endif 3039#endif
3082
3083 selection_time = tm;
3084} 3040}
3085 3041
3086/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
3087/* 3043/*
3088 * Mark or select text based upon number of clicks: 1, 2, or 3 3044 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3092rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
3093{ 3049{
3094 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
3095 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
3096 3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 selection.screen = current_screen;
3058 selection.op = SELECTION_CONT;
3059 return;
3060 }
3061
3097 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3098 3063
3099 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
3100 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
3101 selection.mark.row + TermWin.view_start, 3066 selection.mark.row - view_start,
3102 0, /* button 3 */ 3067 0, /* button 3 */
3103 1, /* button press */ 3068 1, /* button press */
3104 0); /* click change */ 3069 0); /* click change */
3105} 3070}
3106 3071
… …
3110 */ 3075 */
3111void 3076void
3112rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
3113{ 3078{
3114 want_refresh = 1; 3079 want_refresh = 1;
3080
3081 selection.mark.row = row + view_start;
3115 selection.mark.col = col; 3082 selection.mark.col = col;
3116 selection.mark.row = row - TermWin.view_start;
3117 3083
3118 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3119 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3120 MAX_IT (selection.mark.col, 0);
3121 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3122 3086
3123 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
3124 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3125 --selection.mark.col; 3089 --selection.mark.col;
3126 3090
3127 if (selection.op) 3091 if (selection.op)
3128 { /* clear the old selection */ 3092 { /* clear the old selection */
3129 selection.beg.row = selection.end.row = selection.mark.row; 3093 selection.beg.row = selection.end.row = selection.mark.row;
… …
3153 text_t *stp; 3117 text_t *stp;
3154 rend_t *srp; 3118 rend_t *srp;
3155 3119
3156 if (dirn == UP) 3120 if (dirn == UP)
3157 { 3121 {
3158 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3122 bound.row = top_row - 1;
3159 bound.col = 0; 3123 bound.col = 0;
3160 dirnadd = -1; 3124 dirnadd = -1;
3161 } 3125 }
3162 else 3126 else
3163 { 3127 {
3164 bound.row = TermWin.saveLines + TermWin.nrow; 3128 bound.row = nrow;
3165 bound.col = TermWin.ncol - 1; 3129 bound.col = ncol - 1;
3166 dirnadd = 1; 3130 dirnadd = 1;
3167 } 3131 }
3168 3132
3169 row = mark->row + TermWin.saveLines; 3133 row = mark->row;
3170 col = mark->col; 3134 col = max (mark->col, 0);
3171 MAX_IT (col, 0); 3135
3172 /* find the edge of a word */ 3136 /* find the edge of a word */
3173 stp = &screen.text[row][col]; 3137 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3174 w1 = DELIMIT_TEXT (*stp); 3138 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3175
3176 srp = &screen.rend[row][col];
3177 w2 = DELIMIT_REND (*srp);
3178 3139
3179 for (;;) 3140 for (;;)
3180 { 3141 {
3181 for (; col != bound.col; col += dirnadd) 3142 for (; col != bound.col; col += dirnadd)
3182 { 3143 {
… …
3192 break; 3153 break;
3193 } 3154 }
3194 3155
3195 if ((col == bound.col) && (row != bound.row)) 3156 if ((col == bound.col) && (row != bound.row))
3196 { 3157 {
3197 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3158 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3198 { 3159 {
3199 trow = row + dirnadd; 3160 trow = row + dirnadd;
3200 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3161 tcol = dirn == UP ? ncol - 1 : 0;
3201 3162
3202 if (screen.text[trow] == NULL) 3163 if (!ROW(trow).t)
3203 break; 3164 break;
3204 3165
3205 stp = & (screen.text[trow][tcol]); 3166 stp = ROW(trow).t + tcol;
3206 srp = & (screen.rend[trow][tcol]); 3167 srp = ROW(trow).r + tcol;
3207 3168
3208 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3169 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3209 break; 3170 break;
3210 3171
3211 row = trow; 3172 row = trow;
… …
3214 } 3175 }
3215 } 3176 }
3216 break; 3177 break;
3217 } 3178 }
3218 3179
3219Old_Word_Selection_You_Die:
3220 if (dirn == DN) 3180 if (dirn == DN)
3221 col++; /* put us on one past the end */ 3181 col++; /* put us on one past the end */
3222 3182
3223 /* Poke the values back in */ 3183 /* Poke the values back in */
3224 ret->row = row - TermWin.saveLines; 3184 ret->row = row;
3225 ret->col = col; 3185 ret->col = col;
3226} 3186}
3227 3187
3228/* ------------------------------------------------------------------------- */ 3188/* ------------------------------------------------------------------------- */
3229/* 3189/*
… …
3234 * flag == 2 ==> button 3 motion 3194 * flag == 2 ==> button 3 motion
3235 */ 3195 */
3236void 3196void
3237rxvt_term::selection_extend (int x, int y, int flag) 3197rxvt_term::selection_extend (int x, int y, int flag)
3238{ 3198{
3239 int col, row; 3199 int col = clamp (Pixel2Col (x), 0, ncol);
3240 3200 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3241 col = Pixel2Col (x);
3242 row = Pixel2Row (y);
3243 MAX_IT (row, 0);
3244 MIN_IT (row, (int)TermWin.nrow - 1);
3245 MAX_IT (col, 0);
3246 MIN_IT (col, (int)TermWin.ncol);
3247 3201
3248 /* 3202 /*
3249 * If we're selecting characters (single click) then we must check first 3203 * If we're selecting characters (single click) then we must check first
3250 * if we are at the same place as the original mark. If we are then 3204 * if we are at the same place as the original mark. If we are then
3251 * select nothing. Otherwise, if we're to the right of the mark, you have to 3205 * select nothing. Otherwise, if we're to the right of the mark, you have to
3252 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3253 */ 3207 */
3254 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3255 && (col == selection.mark.col 3209 && (col == selection.mark.col
3256 && (row == selection.mark.row + TermWin.view_start))) 3210 && (row == selection.mark.row - view_start)))
3257 { 3211 {
3258 /* select nothing */ 3212 /* select nothing */
3259 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3260 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3261 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3276 * Extend the selection to the specified col/row 3230 * Extend the selection to the specified col/row
3277 */ 3231 */
3278void 3232void
3279rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3280{ 3234{
3281 int16_t ncol = TermWin.ncol;
3282 int end_col;
3283 row_col_t pos; 3235 row_col_t pos;
3284 enum { 3236 enum {
3285 LEFT, RIGHT 3237 LEFT, RIGHT
3286 } closeto = RIGHT; 3238 } closeto = RIGHT;
3287 3239
… …
3318 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3319 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3320 } 3272 }
3321 3273
3322 pos.col = col; 3274 pos.col = col;
3323 pos.row = row; 3275 pos.row = view_start + row;
3324
3325 pos.row -= TermWin.view_start; /* adjust for scroll */
3326 3276
3327 /* 3277 /*
3328 * This is mainly xterm style selection with a couple of differences, mainly 3278 * This is mainly xterm style selection with a couple of differences, mainly
3329 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3330 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3389 } 3339 }
3390 } 3340 }
3391 3341
3392 if (selection.clicks == 1) 3342 if (selection.clicks == 1)
3393 { 3343 {
3394 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3344 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3395 3345 && !ROW(selection.beg.row).is_longer ()
3396 if (selection.beg.col > end_col
3397 && end_col != -1
3398#if ENABLE_FRILLS 3346#if ENABLE_FRILLS
3399 && !selection.rect 3347 && !selection.rect
3400#endif 3348#endif
3401 ) 3349 )
3402 selection.beg.col = ncol; 3350 selection.beg.col = ncol;
3403 3351
3404 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3405
3406 if ( 3352 if (
3407 selection.end.col > end_col 3353 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3408 && end_col != -1 3354 && !ROW(selection.end.row).is_longer ()
3409#if ENABLE_FRILLS 3355#if ENABLE_FRILLS
3410 && !selection.rect 3356 && !selection.rect
3411#endif 3357#endif
3412 ) 3358 )
3413 selection.end.col = ncol; 3359 selection.end.col = ncol;
… …
3421 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3422 } 3368 }
3423 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3424 { 3370 {
3425#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3426 if (options & Opt_tripleclickwords) 3372 if (OPTION (Opt_tripleclickwords))
3427 { 3373 {
3428 int end_row;
3429
3430 selection_delimit_word (UP, &selection.beg, &selection.beg); 3374 selection_delimit_word (UP, &selection.beg, &selection.beg);
3431 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3432 3375
3433 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3434 { 3377 {
3435 end_col = screen.tlen[end_row + TermWin.saveLines]; 3378 if (!ROW(end_row).is_longer ())
3436
3437 if (end_col != -1)
3438 { 3379 {
3439 selection.end.row = end_row; 3380 selection.end.row = end_row;
3440 selection.end.col = end_col; 3381 selection.end.col = ROW(end_row).l;
3441 selection_remove_trailing_spaces (); 3382 selection_remove_trailing_spaces ();
3442 break; 3383 break;
3443 } 3384 }
3444 } 3385 }
3445 } 3386 }
… …
3451 3392
3452 selection.beg.col = 0; 3393 selection.beg.col = 0;
3453 selection.end.col = ncol; 3394 selection.end.col = ncol;
3454 3395
3455 // select a complete logical line 3396 // select a complete logical line
3456 while (selection.beg.row > -TermWin.saveLines 3397 while (selection.beg.row > -saveLines
3457 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3398 && ROW(selection.beg.row - 1).is_longer ())
3458 selection.beg.row--; 3399 selection.beg.row--;
3459 3400
3460 while (selection.end.row < TermWin.nrow 3401 while (selection.end.row < nrow
3461 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3402 && ROW(selection.end.row).is_longer ())
3462 selection.end.row++; 3403 selection.end.row++;
3463 } 3404 }
3464 } 3405 }
3465 3406
3466 if (button3 && buttonpress) 3407 if (button3 && buttonpress)
… …
3477 } 3418 }
3478 } 3419 }
3479 3420
3480#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3481 if (selection.rect && selection.beg.col > selection.end.col) 3422 if (selection.rect && selection.beg.col > selection.end.col)
3482 SWAP_IT (selection.beg.col, selection.end.col, int); 3423 ::swap (selection.beg.col, selection.end.col);
3483#endif 3424#endif
3484} 3425}
3485 3426
3486#if ENABLE_FRILLS 3427#if ENABLE_FRILLS
3487void 3428void
… …
3491 text_t *stp; 3432 text_t *stp;
3492 3433
3493 end_col = selection.end.col; 3434 end_col = selection.end.col;
3494 end_row = selection.end.row; 3435 end_row = selection.end.row;
3495 3436
3496 for ( ; end_row >= selection.beg.row; ) 3437 for (; end_row >= selection.beg.row; )
3497 { 3438 {
3498 stp = screen.text[end_row + TermWin.saveLines]; 3439 stp = ROW(end_row).t;
3499 3440
3500 while (--end_col >= 0) 3441 while (--end_col >= 0)
3501 { 3442 {
3502 if (stp[end_col] != ' ' 3443 if (stp[end_col] != NOCHAR
3503 && stp[end_col] != '\t' 3444 && !unicode::is_space (stp[end_col]))
3504 && stp[end_col] != NOCHAR)
3505 break; 3445 break;
3506 } 3446 }
3507 3447
3508 if (end_col >= 0 3448 if (end_col >= 0
3509 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3449 || !ROW(end_row - 1).is_longer ())
3510 { 3450 {
3511 selection.end.col = end_col + 1; 3451 selection.end.col = end_col + 1;
3512 selection.end.row = end_row; 3452 selection.end.row = end_row;
3513 break; 3453 break;
3514 } 3454 }
3515 3455
3516 end_row--; 3456 end_row--;
3517 end_col = TermWin.ncol; 3457 end_col = ncol;
3518 } 3458 }
3519 3459
3520 if (selection.mark.row > selection.end.row) 3460 if (selection.mark.row > selection.end.row)
3521 { 3461 {
3522 selection.mark.row = selection.end.row; 3462 selection.mark.row = selection.end.row;
… …
3685 */ 3625 */
3686void 3626void
3687rxvt_term::pixel_position (int *x, int *y) 3627rxvt_term::pixel_position (int *x, int *y)
3688{ 3628{
3689 *x = Pixel2Col (*x); 3629 *x = Pixel2Col (*x);
3690 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3691 *y = Pixel2Row (*y); 3631 *y = Pixel2Row (*y);
3692 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3693} 3633}
3694 3634
3695/* ------------------------------------------------------------------------- */ 3635/* ------------------------------------------------------------------------- */
3696#ifdef USE_XIM 3636#ifdef USE_XIM
3697void 3637void
3698rxvt_term::im_set_position (XPoint &pos) 3638rxvt_term::im_set_position (XPoint &pos)
3699{ 3639{
3700 XWindowAttributes xwa; 3640 XWindowAttributes xwa;
3701 3641
3702 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3642 XGetWindowAttributes (display->display, vt, &xwa);
3703 3643
3704 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3644 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3705 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3645 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3706} 3646}
3707#endif 3647#endif
3708 3648
3709#if ENABLE_OVERLAY 3649#if ENABLE_OVERLAY
3710void 3650void
3711rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3651rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3712{ 3652{
3713 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3653 if (nrow < 1 || ncol < 1)
3714 return; 3654 return;
3715 3655
3716 want_refresh = 1; 3656 want_refresh = 1;
3717 3657
3718 scr_overlay_off (); 3658 scr_overlay_off ();
3719 3659
3720 if (x < 0) x = TermWin.ncol - w; 3660 if (x < 0) x = ncol - w;
3721 if (y < 0) y = TermWin.nrow - h; 3661 if (y < 0) y = nrow - h;
3722 3662
3723 // make space for border 3663 // make space for border
3724 w += 2; MIN_IT (w, TermWin.ncol); 3664 w += 2; min_it (w, ncol);
3725 h += 2; MIN_IT (h, TermWin.nrow); 3665 h += 2; min_it (h, nrow);
3726 3666
3727 x -= 1; MAX_IT (x, 0); 3667 x -= 1; clamp_it (x, 0, ncol - w);
3728 y -= 1; MAX_IT (y, 0); 3668 y -= 1; clamp_it (y, 0, nrow - h);
3729
3730 MIN_IT (x, TermWin.ncol - w);
3731 MIN_IT (y, TermWin.nrow - h);
3732 3669
3733 ov_x = x; ov_y = y; 3670 ov_x = x; ov_y = y;
3734 ov_w = w; ov_h = h; 3671 ov_w = w; ov_h = h;
3735 3672
3736 ov_text = new text_t *[h]; 3673 ov_text = new text_t *[h];
… …
3801 while (*s) 3738 while (*s)
3802 scr_overlay_set (x++, y, *s++); 3739 scr_overlay_set (x++, y, *s++);
3803} 3740}
3804 3741
3805void 3742void
3743rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3744{
3745 while (*s)
3746 {
3747 text_t t = *s++;
3748 int width = wcwidth (t);
3749
3750 while (width--)
3751 {
3752 scr_overlay_set (x++, y, t);
3753 t = NOCHAR;
3754 }
3755 }
3756}
3757
3758void
3806rxvt_term::scr_swap_overlay () 3759rxvt_term::scr_swap_overlay ()
3807{ 3760{
3808 if (!ov_text) 3761 if (!ov_text)
3809 return; 3762 return;
3810 3763
3811 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3812
3813 // swap screen mem with overlay 3764 // swap screen mem with overlay
3814 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3815 { 3766 {
3816 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3817 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3818 3769
3819 text_t *t2 = screen.text[y + row_offset] + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3820 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3821 3772
3822 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3823 { 3774 {
3824 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3825 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3827 } 3778 }
3828} 3779}
3829 3780
3830#endif 3781#endif
3831/* ------------------------------------------------------------------------- */ 3782/* ------------------------------------------------------------------------- */
3783

Diff Legend

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