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

Diff Legend

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