ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.166 by root, Sun Jun 26 20:06:52 2005 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

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

Diff Legend

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