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

Diff Legend

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