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.164 by root, Wed Jun 22 14:33:23 2005 UTC vs.
Revision 1.248 by root, Sun Jan 22 20:58:33 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 TermWin.view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
… …
88/* 89/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 93 */
93#define drawBuffer TermWin.vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const 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 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i);
686 649
650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0;
653 l.f = 0;
654 }
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 669 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 } 670 {
701 else if (j >= row1 && j <= row2)
702 {
703 /* move selected region too */
704 selection.beg.row -= count; 671 selection.beg.row -= count;
705 selection.end.row -= count; 672 selection.end.row -= count;
706 selection.mark.row -= count; 673 selection.mark.row -= count;
674
675 if (selection.beg.row < top_row
676 || selection.end.row < top_row
677 || selection.mark.row < top_row)
678 {
679 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR;
707 } 681 }
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 { 682 }
744 buf_text[i] = screen.text[j]; 683
745 buf_rend[i] = screen.rend[j]; 684 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer)
686 && view_start != 0
687 && view_start != -saveLines)
688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
692 }
693 else
694 {
695 if (selection.op && current_screen == selection.screen)
746 } 696 {
747 697 if ((selection.beg.row < row1 && selection.end.row > row1)
748 /* Rotate lines */ 698 || (selection.beg.row < row2 && selection.end.row > row2)
749 for (j = row2, i = j - count; i >= row1; i--, j--) 699 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
700 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
701 || (selection.end.row - count < row1 && selection.end.row >= row1)
702 || (selection.end.row - count > row2 && selection.end.row <= row2))
703 {
704 CLEAR_ALL_SELECTION ();
705 selection.op = SELECTION_CLEAR;
706 }
707 else if (selection.end.row >= row1 && selection.end.row <= row2)
708 {
709 /* move selected region too */
710 selection.beg.row -= count;
711 selection.end.row -= count;
712 selection.mark.row -= count;
713
714 selection_check (0);
715 }
750 { 716 }
751 screen.tlen[j] = screen.tlen[i]; 717
752 screen.text[j] = screen.text[i]; 718 // use a simple and robust scrolling algorithm, this
753 screen.rend[j] = screen.rend[i]; 719 // part of scr_scroll_text is not time-critical.
720
721 int rows = row2 - row1 + 1;
722
723 min_it (count, rows);
724
725 line_t *temp_buf = row_buf + total_rows;
726
727 for (int row = 0; row < rows; row++)
754 } 728 {
729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
755 730
756 j = row1, i = count; 731 if (!IN_RANGE_EXC (row + count, 0, rows))
757 count = -count; 732 scr_blank_screen_mem (temp_buf [row], rstyle);
758 } 733 }
759 734
760 /* Resurrect lines */ 735 for (int row = 0; row < rows; row++)
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 736 ROW(row1 + row) = temp_buf [row];
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 737 }
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 738
768 return count; 739 return count;
769} 740}
770 741
771/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
772/* 743/*
773 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
774 */ 745 */
775void 746void
776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
777{ 748{
749 if (len <= 0) /* sanity */
750 return;
751
778 unsigned char checksel; 752 unsigned char checksel;
779 unicode_t c; 753 unicode_t c;
780 int i, row, last_col; 754 int ncol = this->ncol;
781 text_t *stp; 755 const wchar_t *strend = str + len;
782 rend_t *srp;
783
784 if (len <= 0) /* sanity */
785 return;
786 756
787 want_refresh = 1; 757 want_refresh = 1;
788 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
789 last_col = TermWin.ncol;
790 759
791 if (nlines > 0) 760 if (minlines > 0)
792 { 761 {
793 nlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
764
794 if ((nlines > 0) 765 if (minlines > 0
795 && (screen.tscroll == 0) 766 && screen.tscroll == 0
796 && (screen.bscroll == (TermWin.nrow - 1))) 767 && screen.bscroll == nrow - 1)
797 { 768 {
798 /* _at least_ this many lines need to be scrolled */ 769 /* _at least_ this many lines need to be scrolled */
799 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
800 screen.cur.row -= nlines; 771 screen.cur.row -= minlines;
801 } 772 }
802 } 773 }
803 774
804#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
805 assert (screen.cur.col < last_col); 776 assert (screen.cur.col < ncol);
806 assert ((screen.cur.row < TermWin.nrow) 777 assert (screen.cur.row < nrow
807 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 778 && screen.cur.row >= top_row);
808#else /* drive with your eyes closed */
809 MIN_IT (screen.cur.col, last_col - 1);
810 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
811 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
812#endif 779#endif
813 row = screen.cur.row + TermWin.saveLines; 780 int row = screen.cur.row;
814 781
815 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816 783
817 stp = screen.text[row]; 784 line_t *line = &ROW(row);
818 srp = screen.rend[row];
819 785
820 while (len--) 786 while (str < strend)
821 { 787 {
822 c = *str++; 788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
823 789
824 if (c < 0x20) 790 if (c < 0x20)
825 switch (c) 791 if (c == C0_LF)
826 { 792 {
827 case C0_HT: 793 max_it (line->l, screen.cur.col);
828 scr_tab (1, true);
829 continue;
830 794
831 case C0_LF:
832 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col);
834
835 screen.flags &= ~Screen_WrapNext; 795 screen.flags &= ~Screen_WrapNext;
836 796
837 if (screen.cur.row == screen.bscroll) 797 if (screen.cur.row == screen.bscroll)
838 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 798 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
839 else if (screen.cur.row < (TermWin.nrow - 1)) 799 else if (screen.cur.row < (nrow - 1))
840 row = (++screen.cur.row) + TermWin.saveLines; 800 row = ++screen.cur.row;
841 801
842 stp = screen.text[row]; /* _must_ refresh */ 802 line = &ROW(row); /* _must_ refresh */
843 srp = screen.rend[row]; /* _must_ refresh */
844 continue; 803 continue;
804 }
805 else if (c == C0_CR)
806 {
807 max_it (line->l, screen.cur.col);
845 808
846 case C0_CR:
847 if (screen.tlen[row] != -1) /* XXX: think about this */
848 MAX_IT (screen.tlen[row], screen.cur.col);
849
850 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
851 screen.cur.col = 0; 810 screen.cur.col = 0;
852 continue; 811 continue;
812 }
813 else if (c == C0_HT)
814 {
815 scr_tab (1, true);
816 continue;
853 } 817 }
854 818
855 if (checksel /* see if we're writing within selection */ 819 if (checksel /* see if we're writing within selection */
856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
857 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 821 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
865 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
866 } 830 }
867 831
868 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
869 { 833 {
870 screen.tlen[row] = -1; 834 scr_do_wrap ();
871
872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
873
874 stp = screen.text[row]; /* _must_ refresh */
875 srp = screen.rend[row]; /* _must_ refresh */
876 } 835
836 line->l = ncol;
837 line->is_longer (1);
838
839 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */
841 }
842
843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
845 c = 0xfffd;
877 846
878 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, at least for non-latin1
879 // do wcwidth before further replacements, as wcwidth says that line-drawing 848 // do wcwidth before further replacements, as wcwidth might return -1
880 // characters have width -1 (DOH!) on GNU/Linux sometimes. 849 // for the line drawing characters below as they might be invalid in the current
850 // locale.
881 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = c < 0x100 ? 1 : wcwidth (c);
882 852
883 if (charsets[screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
884 { 854 {
885 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100 856 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars 857 // 40-5e rxvt extension for extra curses acs chars
888 static uint16_t vt100_0[63] = { // 40 .. 7e 858 static uint16_t vt100_0[62] = { // 41 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 859 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 860 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 861 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 862 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 863 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 864 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 865 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 866 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897 }; 867 };
898 868
899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 869 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
900 { 870 {
901 c = vt100_0[c - 0x40]; 871 c = vt100_0[c - 0x41];
902 width = 1; 872 width = 1; // vt100 line drawing characters are always single-width
903 } 873 }
904 } 874 }
905 875
906 if (screen.flags & Screen_Insert) 876 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT); 877 scr_insdel_chars (width, INSERT);
908 878
909 if (width != 0) 879 if (width != 0)
910 { 880 {
911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3 881#if !UNICODE_3
916 // trim characters we can't store directly :( 882 // trim characters we can't store directly :(
917 if (c >= 0x10000) 883 if (c >= 0x10000)
918# if ENABLE_COMBINING 884# if ENABLE_COMBINING
919 c = rxvt_composite.compose (c); // map to lower 16 bits 885 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
921 c = 0xfffd; 887 c = 0xfffd;
922# endif 888# endif
923#endif 889#endif
924 890
925 // nuke the character at this position, if required 891 // nuke the character at this position, if required
926 if (stp[screen.cur.col] == NOCHAR 892 if (line->t[screen.cur.col] == NOCHAR
927 || (screen.cur.col < TermWin.ncol - 1 893 || (screen.cur.col < ncol - 1
928 && stp[screen.cur.col + 1] == NOCHAR)) 894 && line->t[screen.cur.col + 1] == NOCHAR))
929 { 895 {
930 int col = screen.cur.col; 896 int col = screen.cur.col;
931 897
932 // find begin 898 // find begin
933 while (col > 0 && stp[col] == NOCHAR) 899 while (col > 0 && line->t[col] == NOCHAR)
934 col--; 900 col--;
935 901
936 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
937 903
938 // found begin, nuke 904 // found begin, nuke
939 do { 905 do {
940 stp[col] = ' '; 906 line->t[col] = ' ';
941 srp[col] = rend; 907 line->r[col] = rend;
942 col++; 908 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR); 909 } while (col < ncol && line->t[col] == NOCHAR);
944 } 910 }
945 911
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' ';
919 // and try the same character next loop iteration
920 --str;
921 }
922
923 line->touch ();
947 924
948 do 925 do
949 { 926 {
950 stp[screen.cur.col] = c; 927 line->t[screen.cur.col] = c;
951 srp[screen.cur.col] = rend; 928 line->r[screen.cur.col] = rend;
952 929
953 if (screen.cur.col < last_col - 1) 930 if (screen.cur.col < ncol - 1)
954 screen.cur.col++; 931 screen.cur.col++;
955 else 932 else
956 { 933 {
957 screen.tlen[row] = last_col; 934 line->l = ncol;
958 if (screen.flags & Screen_Autowrap) 935 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 936 screen.flags |= Screen_WrapNext;
960 break; 937 break;
961 } 938 }
962 939
… …
964 } 941 }
965 while (--width > 0); 942 while (--width > 0);
966 943
967 // pad with spaces when overwriting wide character with smaller one 944 // pad with spaces when overwriting wide character with smaller one
968 if (!width) 945 if (!width)
946 {
947 line->touch ();
948
969 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
970 { 950 {
971 stp[c] = ' '; 951 line->t[c] = ' ';
972 srp[c] = rend; 952 line->r[c] = rend;
973 } 953 }
974 } 954 }
955 }
975 else if (width == 0) 956 else // width == 0
976 { 957 {
977#if ENABLE_COMBINING 958#if ENABLE_COMBINING
978 // handle combining characters 959 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 960 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 961 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 962 // we don't handle double-width characters nicely yet.
982 963 line_t *linep;
983 text_t *tp; 964 text_t *tp;
984 rend_t *rp; 965 rend_t *rp;
985 966
986 if (screen.cur.col > 0) 967 if (screen.cur.col > 0)
987 { 968 {
969 linep = line;
988 tp = stp + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
989 rp = srp + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
990
991 while (*tp == NOCHAR && tp > stp)
992 tp--, rp--;
993 } 972 }
994 else if (screen.cur.row > 0 973 else if (screen.cur.row > 0
995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 974 && ROW(screen.cur.row - 1).is_longer ())
996 { 975 {
997 int line = screen.cur.row - 1 + TermWin.saveLines; 976 linep = &ROW(screen.cur.row - 1);
998
999 tp = screen.text[line] + last_col - 1; 977 tp = line->t + ncol - 1;
1000 rp = screen.rend[line] + last_col - 1; 978 rp = line->r + ncol - 1;
1001
1002 while (*tp == NOCHAR && tp > screen.text[line])
1003 tp--, rp--;
1004 } 979 }
1005 else 980 else
1006 continue; 981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
1007 987
1008 // first try to find a precomposed character 988 // first try to find a precomposed character
1009 unicode_t n = rxvt_compose (*tp, c); 989 unicode_t n = rxvt_compose (*tp, c);
1010 if (n == NOCHAR) 990 if (n == NOCHAR)
1011 n = rxvt_composite.compose (*tp, c); 991 n = rxvt_composite.compose (*tp, c);
… …
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1015#endif 995#endif
1016 } 996 }
1017 } 997 }
1018 998
1019 if (screen.tlen[row] != -1) /* XXX: think about this */ 999 max_it (line->l, screen.cur.col);
1020 MAX_IT (screen.tlen[row], screen.cur.col);
1021 1000
1022#ifdef DEBUG_STRICT 1001#ifdef DEBUG_STRICT
1023 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
1024#else /* drive with your eyes closed */
1025 MAX_IT (screen.cur.row, 0);
1026#endif 1003#endif
1027} 1004}
1028 1005
1029/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1030/* 1007/*
1031 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
1032 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1033 */ 1010 */
1034void 1011void
1035rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
1036{ 1013{
1037 want_refresh = 1; 1014 want_refresh = 1;
1038 1015
1039 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
1040 { 1017 {
1041 if (screen.cur.row > 0) 1018 if (screen.cur.row > 0)
1042 { 1019 {
1043#ifdef TERMCAP_HAS_BW 1020#ifdef TERMCAP_HAS_BW
1044 screen.cur.col = TermWin.ncol - 1; 1021 screen.cur.col = ncol - 1;
1045 screen.cur.row--; 1022 screen.cur.row--;
1046 return; 1023 return;
1047#endif 1024#endif
1048 } 1025 }
1049 } 1026 }
… …
1058 * Process Horizontal Tab 1035 * Process Horizontal Tab
1059 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
1060 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
1061 */ 1038 */
1062void 1039void
1063rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
1064{ 1041{
1065 int i, x; 1042 int i, x;
1066 1043
1067 want_refresh = 1; 1044 want_refresh = 1;
1068 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
1069 1046
1070 if (count == 0) 1047 if (count == 0)
1071 return; 1048 return;
1072 else if (count > 0) 1049 else if (count > 0)
1073 { 1050 {
1074 int row = TermWin.saveLines + screen.cur.row; 1051 line_t &l = ROW(screen.cur.row);
1075 text_t *tp = screen.text[row];
1076 rend_t *rp = screen.rend[row];
1077 rend_t base_rend = rp[i]; 1052 rend_t base_rend = l.r[i];
1078 ht &= tp[i] == ' '; 1053 ht &= l.t[i] == ' ';
1079 1054
1080 for (; ++i < TermWin.ncol; ) 1055 for (; ++i < ncol; )
1081 if (tabs[i]) 1056 if (tabs[i])
1082 { 1057 {
1083 x = i; 1058 x = i;
1059
1084 if (!--count) 1060 if (!--count)
1085 break; 1061 break;
1086 } 1062 }
1087 else 1063 else
1088 ht &= tp[i] == ' ' 1064 ht &= l.t[i] == ' '
1089 && RS_SAME (rp[i], base_rend); 1065 && RS_SAME (l.r[i], base_rend);
1090 1066
1091 if (count) 1067 if (count)
1092 x = TermWin.ncol - 1; 1068 x = ncol - 1;
1093 1069
1094 // store horizontal tab commands as characters inside the text 1070 // store horizontal tab commands as characters inside the text
1095 // buffer so they can be selected and pasted. 1071 // buffer so they can be selected and pasted.
1096 if (ht && options & Opt_pastableTabs) 1072 if (ht && OPTION (Opt_pastableTabs))
1097 { 1073 {
1098 base_rend = SET_FONT (base_rend, 0); 1074 base_rend = SET_FONT (base_rend, 0);
1099 1075
1100 if (screen.tlen[row] != -1) /* XXX: think about this */ 1076 l.touch (x);
1101 MAX_IT (screen.tlen[row], x);
1102 1077
1103 i = screen.cur.col; 1078 i = screen.cur.col;
1104 1079
1105 tp[i] = '\t'; 1080 l.t[i] = '\t';
1106 rp[i] = base_rend; 1081 l.r[i] = base_rend;
1107 1082
1108 while (++i < x) 1083 while (++i < x)
1109 { 1084 {
1110 tp[i] = NOCHAR; 1085 l.t[i] = NOCHAR;
1111 rp[i] = base_rend; 1086 l.r[i] = base_rend;
1112 } 1087 }
1113 } 1088 }
1114 } 1089 }
1115 else /* if (count < 0) */ 1090 else /* if (count < 0) */
1116 { 1091 {
… …
1137 * Move cursor left in row. If we're at the left boundary, shift everything 1112 * Move cursor left in row. If we're at the left boundary, shift everything
1138 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1139 */ 1114 */
1140#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1141void 1116void
1142rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1143{ 1118{
1144 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1146 else 1121 else
1147 {
1148 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1149 return; /* um, yeah? */
1150
1151 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
1152 }
1153} 1123}
1154#endif 1124#endif
1155/* ------------------------------------------------------------------------- */ 1125/* ------------------------------------------------------------------------- */
1156/* 1126/*
1157 * Process DEC Forward Index 1127 * Process DEC Forward Index
… …
1159 * Move cursor right in row. If we're at the right boundary, shift everything 1129 * Move cursor right in row. If we're at the right boundary, shift everything
1160 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1161 */ 1131 */
1162#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1163void 1133void
1164rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1165{ 1135{
1166 int row;
1167
1168 if (screen.cur.col < TermWin.ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1170 else 1138 else
1171 { 1139 {
1172 row = screen.cur.row + TermWin.saveLines; 1140 line_t &l = ROW(screen.cur.row);
1173 1141
1174 if (screen.tlen[row] == 0) 1142 l.touch ();
1175 return; /* um, yeah? */ 1143 l.is_longer (0);
1176 else if (screen.tlen[row] == -1)
1177 screen.tlen[row] = TermWin.ncol;
1178 1144
1179 scr_gotorc (0, 0, R_RELATIVE); 1145 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1146 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1147 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1148 }
1183} 1149}
1184#endif 1150#endif
1185 1151
1186/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1187/* 1153/*
1188 * Goto Row/Column 1154 * Goto Row/Column
1189 */ 1155 */
1190void 1156void
1191rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1192{ 1158{
1193 want_refresh = 1; 1159 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1195 1161
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1163 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1199 1164
1200 screen.flags &= ~Screen_WrapNext; 1165 screen.flags &= ~Screen_WrapNext;
1201 1166
1202 if (relative & R_RELATIVE) 1167 if (relative & R_RELATIVE)
1203 { 1168 {
… …
1221 else 1186 else
1222 { 1187 {
1223 if (screen.flags & Screen_Relative) 1188 if (screen.flags & Screen_Relative)
1224 { /* relative origin mode */ 1189 { /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1190 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1191 min_it (screen.cur.row, screen.bscroll);
1227 } 1192 }
1228 else 1193 else
1229 screen.cur.row = row; 1194 screen.cur.row = row;
1230 } 1195 }
1231 1196
1232 MAX_IT (screen.cur.row, 0); 1197 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1234} 1198}
1235 1199
1236/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1237/* 1201/*
1238 * direction should be UP or DN 1202 * direction should be UP or DN
1239 */ 1203 */
1240void 1204void
1241rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1242{ 1206{
1243 int dirn; 1207 int dirn;
1244 1208
1245 want_refresh = 1; 1209 want_refresh = 1;
1246 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1249 1213
1250 screen.flags &= ~Screen_WrapNext; 1214 screen.flags &= ~Screen_WrapNext;
1251 1215
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1216 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1217 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1218 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1219 else
1256 screen.cur.row += dirn; 1220 screen.cur.row += dirn;
1257 1221
1258 MAX_IT (screen.cur.row, 0); 1222 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1260 selection_check (0); 1223 selection_check (0);
1261} 1224}
1262 1225
1263/* ------------------------------------------------------------------------- */ 1226/* ------------------------------------------------------------------------- */
1264/* 1227/*
… …
1266 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1267 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1269 */ 1232 */
1270void 1233void
1271rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1272{ 1235{
1273 unsigned int row, col, num; 1236 unsigned int col, num;
1274 1237
1275 want_refresh = 1; 1238 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
1277 1240
1278 selection_check (1); 1241 selection_check (1);
1279 1242
1280 row = TermWin.saveLines + screen.cur.row; 1243 line_t &line = ROW(screen.cur.row);
1244
1245 line.touch ();
1246 line.is_longer (0);
1247
1281 switch (mode) 1248 switch (mode)
1282 { 1249 {
1283 case 0: /* erase to end of line */ 1250 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1251 col = screen.cur.col;
1285 num = TermWin.ncol - col; 1252 num = ncol - col;
1286 MIN_IT (screen.tlen[row], (int16_t)col); 1253 min_it (line.l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1256 CLEAR_SELECTION ();
1290 break; 1257 break;
1291 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
… …
1295 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1296 CLEAR_SELECTION (); 1263 CLEAR_SELECTION ();
1297 break; 1264 break;
1298 case 2: /* erase whole line */ 1265 case 2: /* erase whole line */
1299 col = 0; 1266 col = 0;
1300 num = TermWin.ncol; 1267 num = ncol;
1301 screen.tlen[row] = 0; 1268 line.l = 0;
1302 if (selection.beg.row <= screen.cur.row 1269 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1270 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1305 break; 1272 break;
1306 default: 1273 default:
1307 return; 1274 return;
1308 } 1275 }
1309 1276
1310 if (screen.text[row]) 1277 scr_blank_line (line, col, num, rstyle);
1311 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1312 else
1313 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1314} 1278}
1315 1279
1316/* ------------------------------------------------------------------------- */ 1280/* ------------------------------------------------------------------------- */
1317/* 1281/*
1318 * Erase part of whole of the screen 1282 * Erase part of whole of the screen
1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1322 */ 1286 */
1323void 1287void
1324rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1325{ 1289{
1326 int num; 1290 int num;
1327 int32_t row, row_offset; 1291 int32_t row;
1328 rend_t ren; 1292 rend_t ren;
1329 XGCValues gcvalue; 1293 XGCValues gcvalue;
1330 1294
1331 want_refresh = 1; 1295 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1296 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)TermWin.saveLines;
1335 1297
1336 switch (mode) 1298 switch (mode)
1337 { 1299 {
1338 case 0: /* erase to end of screen */ 1300 case 0: /* erase to end of screen */
1339 selection_check (1); 1301 selection_check (1);
1340 scr_erase_line (0); 1302 scr_erase_line (0);
1341 row = screen.cur.row + 1; /* possible OOB */ 1303 row = screen.cur.row + 1; /* possible OOB */
1342 num = TermWin.nrow - row; 1304 num = nrow - row;
1343 break; 1305 break;
1344 case 1: /* erase to beginning of screen */ 1306 case 1: /* erase to beginning of screen */
1345 selection_check (3); 1307 selection_check (3);
1346 scr_erase_line (1); 1308 scr_erase_line (1);
1347 row = 0; 1309 row = 0;
1348 num = screen.cur.row; 1310 num = screen.cur.row;
1349 break; 1311 break;
1350 case 2: /* erase whole screen */ 1312 case 2: /* erase whole screen */
1351 selection_check (3); 1313 selection_check (3);
1352 row = 0; 1314 row = 0;
1353 num = TermWin.nrow; 1315 num = nrow;
1354 break; 1316 break;
1355 default: 1317 default:
1356 return; 1318 return;
1357 } 1319 }
1358 1320
… …
1360 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1322 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1361 || (selection.end.row >= row 1323 || (selection.end.row >= row
1362 && selection.end.row <= row + num))) 1324 && selection.end.row <= row + num)))
1363 CLEAR_SELECTION (); 1325 CLEAR_SELECTION ();
1364 1326
1365 if (row >= TermWin.nrow) /* Out Of Bounds */ 1327 if (row >= nrow) /* Out Of Bounds */
1366 return; 1328 return;
1367 1329
1368 MIN_IT (num, (TermWin.nrow - row)); 1330 min_it (num, nrow - row);
1369 1331
1370 if (rstyle & (RS_RVid | RS_Uline)) 1332 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1333 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1334 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1335 {
… …
1375 CLEAR_ROWS (row, num); 1337 CLEAR_ROWS (row, num);
1376 } 1338 }
1377 else 1339 else
1378 { 1340 {
1379 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1343 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1382 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1383 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1346 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1347 }
1386 1348
1387 for (; num--; row++) 1349 for (; num--; row++)
1388 { 1350 {
1389 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
1390 screen.tlen[row + row_offset] = 0; 1352 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1392 } 1353 }
1393} 1354}
1394 1355
1395#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1396void 1357void
1397rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1398{ 1359{
1399 want_refresh = 1; 1360 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1401 1362
1402 TermWin.nscrolled = 0; 1363 top_row = 0;
1403} 1364}
1404#endif 1365#endif
1405 1366
1406/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1407/* 1368/*
1408 * Fill the screen with `E's 1369 * Fill the screen with `E's
1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1410 */ 1371 */
1411void 1372void
1412rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1413{ 1374{
1414 int i, j, k;
1415 rend_t *r1, fs; 1375 rend_t fs;
1416 1376
1417 want_refresh = 1; 1377 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
1419 1379
1420 num_scr_allow = 0; 1380 num_scr_allow = 0;
1421 selection_check (3); 1381 selection_check (3);
1422 1382
1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1383 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1384 for (int row = nrow; row--; )
1425 { 1385 {
1426 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1386 line_t &line = ROW(row);
1387
1427 fill_text (screen.text[k], 'E', TermWin.ncol); 1388 fill_text (line.t, 'E', ncol);
1428 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1389 rend_t *r1 = line.r;
1390
1391 for (int j = ncol; j--; )
1429 *r1++ = fs; 1392 *r1++ = fs;
1393
1394 line.is_longer (0);
1395 line.touch (ncol);
1430 } 1396 }
1431} 1397}
1432 1398
1433/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1434/* 1400/*
1435 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1436 */ 1402 */
1437void 1403void
1438rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1439{ 1405{
1440 int end; 1406 int end;
1441 1407
1442 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1443 1409
… …
1455 count = end; 1421 count = end;
1456 } 1422 }
1457 1423
1458 scr_do_wrap (); 1424 scr_do_wrap ();
1459 1425
1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1426 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461} 1427}
1462 1428
1463/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1464/* 1430/*
1465 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1466 */ 1432 */
1467void 1433void
1468rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1469{ 1435{
1470 int col, row; 1436 int col, row;
1471 rend_t tr; 1437 rend_t tr;
1472 text_t *stp;
1473 rend_t *srp;
1474 int16_t *slp;
1475 1438
1476 want_refresh = 1; 1439 want_refresh = 1;
1477 ZERO_SCROLLBACK (); 1440 ZERO_SCROLLBACK ();
1478 1441
1479 if (count <= 0) 1442 if (count <= 0)
1480 return; 1443 return;
1481 1444
1482 scr_do_wrap (); 1445 scr_do_wrap ();
1483 1446
1484 selection_check (1); 1447 selection_check (1);
1485 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1448 min_it (count, ncol - screen.cur.col);
1486 1449
1487 row = screen.cur.row + TermWin.saveLines;
1488
1489 stp = screen.text[row];
1490 srp = screen.rend[row]; 1450 row = screen.cur.row;
1491 slp = &screen.tlen[row]; 1451
1452 line_t *line = &ROW(row);
1453
1454 line->touch ();
1455 line->is_longer (0);
1492 1456
1493 switch (insdel) 1457 switch (insdel)
1494 { 1458 {
1495 case INSERT: 1459 case INSERT:
1496 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1497 { 1461 {
1498 stp[col] = stp[col - count]; 1462 line->t[col] = line->t[col - count];
1499 srp[col] = srp[col - count]; 1463 line->r[col] = line->r[col - count];
1500 } 1464 }
1501 1465
1502 if (*slp != -1) 1466 line->l = min (line->l + count, ncol);
1503 {
1504 *slp += count;
1505 MIN_IT (*slp, TermWin.ncol);
1506 }
1507 1467
1508 if (selection.op && current_screen == selection.screen 1468 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1470 {
1511 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
1512 || (selection.end.col + count >= TermWin.ncol)) 1472 || (selection.end.col + count >= ncol))
1513 CLEAR_SELECTION (); 1473 CLEAR_SELECTION ();
1514 else 1474 else
1515 { /* shift selection */ 1475 { /* shift selection */
1516 selection.beg.col += count; 1476 selection.beg.col += count;
1517 selection.mark.col += count; /* XXX: yes? */ 1477 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1478 selection.end.col += count;
1519 } 1479 }
1520 } 1480 }
1521 1481
1522 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1482 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 (unsigned int)count, rstyle);
1524 break; 1483 break;
1525 1484
1526 case ERASE: 1485 case ERASE:
1527 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1486 screen.cur.col += count; /* don't worry if > ncol */
1528 selection_check (1); 1487 selection_check (1);
1529 screen.cur.col -= count; 1488 screen.cur.col -= count;
1530 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1489
1531 (unsigned int)count, rstyle); 1490 line->l = max (line->l - count, 0);
1491 scr_blank_line (*line, screen.cur.col, count, rstyle);
1532 break; 1492 break;
1533 1493
1534 case DELETE: 1494 case DELETE:
1535 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1536 1496
1537 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1497 for (col = screen.cur.col; (col + count) < ncol; col++)
1538 { 1498 {
1539 stp[col] = stp[col + count]; 1499 line->t[col] = line->t[col + count];
1540 srp[col] = srp[col + count]; 1500 line->r[col] = line->r[col + count];
1541 } 1501 }
1542 1502
1543 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1503 line->l = max (line->l - count, 0);
1544 (unsigned int)count, tr); 1504 scr_blank_line (*line, ncol - count, count, tr);
1545
1546 if (*slp == -1) /* break line continuation */
1547 *slp = TermWin.ncol;
1548
1549 *slp -= count;
1550 MAX_IT (*slp, 0);
1551 1505
1552 if (selection.op && current_screen == selection.screen 1506 if (selection.op && current_screen == selection.screen
1553 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1554 { 1508 {
1555 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
1556 || (screen.cur.col >= selection.beg.col - count) 1510 || (screen.cur.col >= selection.beg.col - count)
1557 || selection.end.col >= TermWin.ncol) 1511 || selection.end.col >= ncol)
1558 CLEAR_SELECTION (); 1512 CLEAR_SELECTION ();
1559 else 1513 else
1560 { 1514 {
1561 /* shift selection */ 1515 /* shift selection */
1562 selection.beg.col -= count; 1516 selection.beg.col -= count;
… …
1573/* 1527/*
1574 * Set the scrolling region 1528 * Set the scrolling region
1575 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1576 */ 1530 */
1577void 1531void
1578rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1579{ 1533{
1580 MAX_IT (top, 0); 1534 max_it (top, 0);
1581 MIN_IT (bot, (int)TermWin.nrow - 1); 1535 min_it (bot, nrow - 1);
1582 1536
1583 if (top > bot) 1537 if (top > bot)
1584 return; 1538 return;
1585 1539
1586 screen.tscroll = top; 1540 screen.tscroll = top;
… …
1593 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1594 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1595 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1596 */ 1550 */
1597void 1551void
1598rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1599{ 1553{
1600 want_refresh = 1; 1554 want_refresh = 1;
1601 1555
1602 if (mode) 1556 if (mode)
1603 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1610 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1611 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1612 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1613 */ 1567 */
1614void 1568void
1615rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1616{ 1570{
1617 if (mode) 1571 if (mode)
1618 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1619 else 1573 else
1620 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1629 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1630 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1631 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1632 */ 1586 */
1633void 1587void
1634rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1635{ 1589{
1636 if (mode) 1590 if (mode)
1637 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1638 else 1592 else
1639 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1646 * Set insert/replace mode 1600 * Set insert/replace mode
1647 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1648 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1649 */ 1603 */
1650void 1604void
1651rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1652{ 1606{
1653 if (mode) 1607 if (mode)
1654 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1655 else 1609 else
1656 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1662 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1663 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1664 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1665 */ 1619 */
1666void 1620void
1667rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1668{ 1622{
1669 if (mode < 0) 1623 if (mode < 0)
1670 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1671 else if (screen.cur.col < TermWin.ncol) 1625 else if (screen.cur.col < ncol)
1672 tabs[screen.cur.col] = (mode ? 1 : 0); 1626 tabs [screen.cur.col] = !!mode;
1673} 1627}
1674 1628
1675/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
1676/* 1630/*
1677 * Set reverse/normal video 1631 * Set reverse/normal video
1678 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1679 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1680 */ 1634 */
1681void 1635void
1682rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1683{ 1637{
1684 XGCValues gcvalue; 1638 rvideo_mode = on;
1685 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1686 if (rvideo != mode) 1644 if (rvideo_state != on)
1687 { 1645 {
1688 rvideo = mode; 1646 rvideo_state = on;
1647
1689 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1691 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1692#endif 1651#endif
1693#if TRANSPARENT 1652#if TRANSPARENT
1694 if (! (options & Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1695#endif 1654#endif
1696 XSetWindowBackground (display->display, TermWin.vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1697 pix_colors[Color_bg]);
1698 1656
1657 XGCValues gcvalue;
1699 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1700 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1701 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1702 &gcvalue); 1661
1703 scr_clear (); 1662 scr_clear ();
1704 scr_touch (true); 1663 scr_touch (true);
1705 } 1664 }
1706} 1665}
1707 1666
… …
1709/* 1668/*
1710 * Report current cursor position 1669 * Report current cursor position
1711 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1712 */ 1671 */
1713void 1672void
1714rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1715{ 1674{
1716 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1675 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1717} 1676}
1718 1677
1719/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1722 1681
1723/* 1682/*
1724 * Set font style 1683 * Set font style
1725 */ 1684 */
1726void 1685void
1727rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1728{ 1687{
1688#if 0
1729 switch (charsets[screen.charset]) 1689 switch (charsets [screen.charset])
1730 { 1690 {
1731 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
1732 break; 1692 break;
1733 case 'A': /* United Kingdom (UK) */ 1693 case 'A': /* United Kingdom (UK) */
1734 break; 1694 break;
… …
1741 case 'C': /* Finnish character set */ 1701 case 'C': /* Finnish character set */
1742 break; 1702 break;
1743 case 'K': /* German character set */ 1703 case 'K': /* German character set */
1744 break; 1704 break;
1745 } 1705 }
1706#endif
1746} 1707}
1747 1708
1748/* ------------------------------------------------------------------------- */ 1709/* ------------------------------------------------------------------------- */
1749/* 1710/*
1750 * Choose a font 1711 * Choose a font
… …
1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1753 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1754 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1755 */ 1716 */
1756void 1717void
1757rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1758{ 1719{
1759 screen.charset = set; 1720 screen.charset = set;
1760 set_font_style (); 1721 set_font_style ();
1761} 1722}
1762 1723
… …
1768 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1769 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1770 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1771 */ 1732 */
1772void 1733void
1773rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1774{ 1735{
1775 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1776 set_font_style (); 1737 set_font_style ();
1777} 1738}
1778 1739
… …
1783 1744
1784/* 1745/*
1785 * refresh matching text. 1746 * refresh matching text.
1786 */ 1747 */
1787bool 1748bool
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789{ 1750{
1790 bool found = false; 1751 bool found = false;
1791 1752
1792 for (int i = 0; i < TermWin.nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1793 { 1754 {
1794 int col = 0; 1755 int col = 0;
1795 rend_t *drp = drawn_rend [i]; 1756 rend_t *drp = drawn_buf[i].r;
1796 1757
1797 for (; col < TermWin.ncol; col++, drp++) 1758 for (; col < ncol; col++, drp++)
1798 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1799 { 1760 {
1800 found = true; 1761 found = true;
1801 *drp = ~value; 1762 *drp = ~value;
1802 } 1763 }
… …
1813 PART_END, 1774 PART_END,
1814 RC_COUNT 1775 RC_COUNT
1815}; 1776};
1816 1777
1817void 1778void
1818rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1819{ 1780{
1820 int i; 1781 int i;
1821 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1822 1783
1823 if (drawn_text == NULL) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
1824 return; 1785 return;
1825 1786
1826#ifndef NO_SLOW_LINK_SUPPORT 1787#ifndef NO_SLOW_LINK_SUPPORT
1827 if (refresh_type == FAST_REFRESH && !display->is_local) 1788 if (refresh_type == FAST_REFRESH && !display->is_local)
1828 { 1789 {
1829 y = 0; 1790 y = 0;
1830 height = TermWin.height; 1791 eheight = height;
1831 } 1792 }
1832#endif
1833
1834#ifdef DEBUG_STRICT
1835 x = max (x, 0);
1836 x = min (x, (int)TermWin.width);
1837 y = max (y, 0);
1838 y = min (y, (int)TermWin.height);
1839#endif 1793#endif
1840 1794
1841 /* round down */ 1795 /* round down */
1842 rc[PART_BEG].col = Pixel2Col (x); 1796 rc[PART_BEG].col = Pixel2Col (x);
1843 rc[PART_BEG].row = Pixel2Row (y); 1797 rc[PART_BEG].row = Pixel2Row (y);
1844 /* round up */ 1798 /* round up */
1845 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1799 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1846 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1800 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1847 1801
1848 /* sanity checks */ 1802 /* sanity checks */
1849 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1850 { 1804 {
1851 MIN_IT (rc[i].col, TermWin.ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1852 MIN_IT (rc[i].row, TermWin.nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1853 } 1807 }
1854 1808
1855 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1856 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811
1812 num_scr_allow = 0;
1857 1813
1858 if (refresh) 1814 if (refresh)
1859 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1860} 1816}
1861 1817
1862/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1863/* 1819/*
1864 * Refresh the entire screen 1820 * Refresh the entire screen
1865 */ 1821 */
1866void 1822void
1867rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1868{ 1824{
1869 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1870} 1826}
1871 1827
1872/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1873/* 1829/*
1874 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1875 * the top of the screen 1831 * the top of the screen
1876 */ 1832 */
1877int 1833void
1878rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1879{ 1835{
1880 long p = 0; 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1881 unsigned int oldviewstart;
1882
1883 oldviewstart = TermWin.view_start;
1884
1885 if (y < len)
1886 {
1887 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1888 p -= (long) (TermWin.nrow - 1);
1889 p = max (p, 0);
1890 }
1891
1892 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1893
1894 return scr_changeview (oldviewstart);
1895} 1837}
1896 1838
1897/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1898/* 1840/*
1899 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1900 * direction should be UP or DN 1842 * direction should be UP or DN
1901 */ 1843 */
1902int 1844bool
1903rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1904{ 1846{
1905 int n; 1847 int new_view_start =
1906 unsigned int oldviewstart; 1848 direction == UP ? view_start - nlines
1849 : view_start + nlines;
1907 1850
1908 oldviewstart = TermWin.view_start;
1909
1910 if (direction == UP)
1911 {
1912 n = TermWin.view_start + nlines;
1913 TermWin.view_start = min (n, TermWin.nscrolled);
1914 }
1915 else
1916 {
1917 n = TermWin.view_start - nlines;
1918 TermWin.view_start = max (n, 0);
1919 }
1920
1921 return scr_changeview (oldviewstart); 1851 return scr_changeview (new_view_start);
1922} 1852}
1923 1853
1924int 1854bool
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1926{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1927 if (TermWin.view_start != oldviewstart) 1859 if (new_view_start == view_start)
1928 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1929 want_refresh = 1; 1864 want_refresh = 1;
1930 num_scr -= (TermWin.view_start - oldviewstart);
1931 }
1932 1865
1933 return (int) (TermWin.view_start - oldviewstart); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1934}
1935 1867
1936/* ------------------------------------------------------------------------- */ 1868 return true;
1937void 1869}
1938rxvt_term::scr_bell () 1870
1939{
1940#ifndef NO_BELL 1871#ifndef NO_BELL
1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1882rxvt_term::scr_bell () NOTHROW
1883{
1884#ifndef NO_BELL
1885
1941# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1888 if (OPTION (Opt_mapAlert))
1944# endif 1889# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1890 XMapWindow (display->display, parent[0]);
1946# endif 1891# endif
1947 if (options & Opt_visualBell) 1892
1893 if (OPTION (Opt_visualBell))
1948 { 1894 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1896 scr_rvideo_mode (rvideo_mode);
1897 display->flush ();
1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1951 } 1900 }
1952 else 1901 else
1953 XBell (display->display, 0); 1902 XBell (display->display, 0);
1903
1954#endif 1904#endif
1955} 1905}
1956 1906
1957/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1908/* ARGSUSED */
1959void 1909void
1960rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1961{ 1911{
1962#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1963 int i, r1, nrows, row_offset; 1913 int nrows, row_start;
1964 FILE *fd; 1914 FILE *fd;
1965 1915
1966 if ((fd = popen_printer ()) == NULL) 1916 if ((fd = popen_printer ()) == NULL)
1967 return; 1917 return;
1968 1918
1969 nrows = TermWin.nrow;
1970 row_offset = TermWin.saveLines;
1971
1972 if (!fullhist) 1919 if (fullhist)
1973 row_offset -= TermWin.view_start; 1920 {
1921 nrows = nrow - top_row;
1922 row_start = top_row;
1923 }
1974 else 1924 else
1975 { 1925 {
1976 nrows += TermWin.nscrolled; 1926 nrows = nrow;
1977 row_offset -= TermWin.nscrolled; 1927 row_start = view_start;
1978 } 1928 }
1979 1929
1980 wctomb (0, 0); 1930 wctomb (0, 0);
1981 1931
1982 for (r1 = 0; r1 < nrows; r1++) 1932 for (int r1 = 0; r1 < nrows; r1++)
1983 { 1933 {
1984 text_t *tp = screen.text[r1 + row_offset]; 1934 text_t *tp = ROW(r1).t;
1985 int len = screen.tlen[r1 + row_offset]; 1935 int len = ROW(r1).l;
1986 1936
1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1937 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1988 { 1938 {
1989 char mb[MB_LEN_MAX]; 1939 char mb[MB_LEN_MAX];
1990 text_t t = *tp++; 1940 text_t t = *tp++;
1991 if (t == NOCHAR) 1941 if (t == NOCHAR)
1992 continue; 1942 continue;
… …
2014 * Refresh the screen 1964 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
2017 */ 1967 */
2018void 1968void
2019rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
2020{ 1970{
2021 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
2022 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
2023 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
2024 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
2025 int i, /* tmp */ 1975 int i; /* tmp */
2026 row_offset; /* basic offset in screen structure */
2027#ifndef NO_CURSORCOLOR 1976#ifndef NO_CURSORCOLOR
2028 rend_t cc1; /* store colours at cursor position (s) */ 1977 rend_t cc1; /* store colours at cursor position (s) */
2029#endif 1978#endif
2030 rend_t *crp; // cursor rendition pointer 1979 rend_t *crp; // cursor rendition pointer
2031 1980
2032 want_refresh = 0; /* screen is current */ 1981 want_refresh = 0; /* screen is current */
2033 1982
2034 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1983 if (refresh_type == NO_REFRESH || !mapped)
2035 return; 1984 return;
2036 1985
2037 /* 1986 /*
2038 * A: set up vars 1987 * A: set up vars
2039 */ 1988 */
2040 must_clear = 0; 1989 must_clear = 0;
2041 refresh_count = 0; 1990 refresh_count = 0;
2042 1991
2043 row_offset = TermWin.saveLines - TermWin.view_start;
2044
2045#if XPM_BACKGROUND 1992#if XPM_BACKGROUND
2046 must_clear |= bgPixmap.pixmap != None; 1993 must_clear |= bgPixmap.pixmap != None;
2047#endif 1994#endif
2048#if TRANSPARENT 1995#if TRANSPARENT
2049 must_clear |= (options & Opt_transparent) && am_transparent; 1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
2050#endif 1997#endif
2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2052 1999
2053 /* 2000 /*
2054 * B: reverse any characters which are selected 2001 * B: reverse any characters which are selected
… …
2071 2018
2072 if (showcursor) 2019 if (showcursor)
2073 { 2020 {
2074 int col = screen.cur.col; 2021 int col = screen.cur.col;
2075 2022
2076 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2077 col--; 2024 col--;
2078 2025
2079 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2026 crp = &ROW(screen.cur.row).r[col];
2080 2027
2081 if (showcursor && TermWin.focus) 2028 if (showcursor && focus)
2082 { 2029 {
2083 if (options & Opt_cursorUnderline) 2030 if (OPTION (Opt_cursorUnderline))
2084 *crp ^= RS_Uline; 2031 *crp ^= RS_Uline;
2085 else 2032 else
2086 { 2033 {
2087 *crp ^= RS_RVid; 2034 *crp ^= RS_RVid;
2088 2035
… …
2090 cc1 = *crp & (RS_fgMask | RS_bgMask); 2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2091 if (ISSET_PIXCOLOR (Color_cursor)) 2038 if (ISSET_PIXCOLOR (Color_cursor))
2092 ccol1 = Color_cursor; 2039 ccol1 = Color_cursor;
2093 else 2040 else
2094#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2095 ccol1 = GET_FGCOLOR (rstyle); 2042 ccol1 = fgcolor_of (rstyle);
2096#else 2043#else
2097 ccol1 = Color_fg; 2044 ccol1 = Color_fg;
2098#endif 2045#endif
2099 if (ISSET_PIXCOLOR (Color_cursor2)) 2046 if (ISSET_PIXCOLOR (Color_cursor2))
2100 ccol2 = Color_cursor2; 2047 ccol2 = Color_cursor2;
2101 else 2048 else
2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2103 ccol2 = GET_BGCOLOR (rstyle); 2050 ccol2 = bgcolor_of (rstyle);
2104#else 2051#else
2105 ccol2 = Color_bg; 2052 ccol2 = Color_bg;
2106#endif 2053#endif
2107 *crp = SET_FGCOLOR (*crp, ccol1); 2054 *crp = SET_FGCOLOR (*crp, ccol1);
2108 *crp = SET_BGCOLOR (*crp, ccol2); 2055 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2113 2060
2114 /* make sure no outline cursor is left around */ 2061 /* make sure no outline cursor is left around */
2115 setoldcursor = 0; 2062 setoldcursor = 0;
2116 if (ocrow != -1) 2063 if (ocrow != -1)
2117 { 2064 {
2118 if (screen.cur.row + TermWin.view_start != ocrow 2065 if (screen.cur.row - view_start != ocrow
2119 || screen.cur.col != oldcursor.col) 2066 || screen.cur.col != oldcursor.col)
2120 { 2067 {
2121 if (ocrow < TermWin.nrow 2068 if (ocrow < nrow
2122 && oldcursor.col < TermWin.ncol) 2069 && oldcursor.col < ncol)
2123 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2070 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2124 2071
2125 if (TermWin.focus || !showcursor) 2072 if (focus || !showcursor)
2126 oldcursor.row = -1; 2073 oldcursor.row = -1;
2127 else 2074 else
2128 setoldcursor = 1; 2075 setoldcursor = 1;
2129 } 2076 }
2130 } 2077 }
2131 else if (!TermWin.focus) 2078 else if (!focus)
2132 setoldcursor = 1; 2079 setoldcursor = 1;
2133 2080
2134 if (setoldcursor) 2081 if (setoldcursor)
2135 { 2082 {
2136 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2083 if (screen.cur.row - view_start >= nrow)
2137 oldcursor.row = -1; 2084 oldcursor.row = -1;
2138 else 2085 else
2139 { 2086 {
2140 oldcursor.row = screen.cur.row + TermWin.view_start; 2087 oldcursor.row = screen.cur.row - view_start;
2141 oldcursor.col = screen.cur.col; 2088 oldcursor.col = screen.cur.col;
2142 } 2089 }
2143 } 2090 }
2144 } 2091 }
2145 2092
2093 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2146#if ENABLE_OVERLAY 2094#if ENABLE_OVERLAY
2147 scr_swap_overlay (); 2095 scr_swap_overlay ();
2148#endif 2096#endif
2149
2150 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2151 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2152 2097
2153#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2154 /* 2099 /*
2155 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2156 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2157 */ 2102 */
2158 i = num_scr;
2159 if (!display->is_local 2103 if (!display->is_local
2160 && refresh_type == FAST_REFRESH && num_scr_allow && i 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2161 && abs (i) < TermWin.nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2162 { 2106 {
2163 int16_t nits; 2107 int16_t nits;
2164 int j; 2108 int j;
2165 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2166 2111
2167 j = TermWin.nrow; 2112 j = nrow;
2168 wlen = len = -1; 2113 wlen = len = -1;
2169 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2170 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2171 { 2116 {
2172 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2173 { 2118 {
2174 text_t *stp = screen.text[row + row_offset]; 2119 line_t s = ROW(view_start + row);
2175 rend_t *srp = screen.rend[row + row_offset];
2176 text_t *dtp = drawn_text[row]; 2120 line_t d = drawn_buf[row];
2177 text_t *dtp2 = drawn_text[row + i]; 2121 line_t d2 = drawn_buf[row + i];
2178 rend_t *drp = drawn_rend[row];
2179 rend_t *drp2 = drawn_rend[row + i];
2180 2122
2181 for (nits = 0, col = TermWin.ncol; col--; ) 2123 for (nits = 0, col = ncol; col--; )
2182 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2124 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2183 nits--; 2125 nits--;
2184 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2126 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2185 nits++; 2127 nits++;
2186 2128
2187 if (nits > 8) /* XXX: arbitrary choice */ 2129 if (nits > 8) /* XXX: arbitrary choice */
2188 { 2130 {
2189 for (col = TermWin.ncol; col--; ) 2131 for (col = ncol; col--; )
2190 { 2132 {
2191 *dtp++ = *dtp2++; 2133 *d.t++ = *d2.t++;
2192 *drp++ = *drp2++; 2134 *d.r++ = *d2.r++;
2193 } 2135 }
2194 2136
2195 if (len == -1) 2137 if (len == -1)
2196 len = row; 2138 len = row;
2197 2139
… …
2202 2144
2203 if (len != -1) 2145 if (len != -1)
2204 { 2146 {
2205 /* also comes here at end if needed because of >= above */ 2147 /* also comes here at end if needed because of >= above */
2206 if (wlen < len) 2148 if (wlen < len)
2207 SWAP_IT (wlen, len, int); 2149 ::swap (wlen, len);
2208 2150
2209 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2151 XCopyArea (display->display, vt, vt,
2210 TermWin.gc, 0, Row2Pixel (len + i), 2152 gc, 0, Row2Pixel (len + i),
2211 (unsigned int)TermWin_TotalWidth (), 2153 (unsigned int)this->width,
2212 (unsigned int)Height2Pixel (wlen - len + 1), 2154 (unsigned int)Height2Pixel (wlen - len + 1),
2213 0, Row2Pixel (len)); 2155 0, Row2Pixel (len));
2214 len = -1; 2156 len = -1;
2215 } 2157 }
2216 } 2158 }
… …
2218#endif 2160#endif
2219 2161
2220 /* 2162 /*
2221 * E: main pass across every character 2163 * E: main pass across every character
2222 */ 2164 */
2223 for (row = 0; row < TermWin.nrow; row++) 2165 for (row = 0; row < nrow; row++)
2224 { 2166 {
2225 text_t *stp = screen.text[row + row_offset]; 2167 text_t *stp = ROW(view_start + row).t;
2226 rend_t *srp = screen.rend[row + row_offset]; 2168 rend_t *srp = ROW(view_start + row).r;
2227 text_t *dtp = drawn_text[row]; 2169 text_t *dtp = drawn_buf[row].t;
2228 rend_t *drp = drawn_rend[row]; 2170 rend_t *drp = drawn_buf[row].r;
2229 2171
2230 /* 2172 /*
2231 * E2: OK, now the real pass 2173 * E2: OK, now the real pass
2232 */ 2174 */
2233 int ypixel = (int)Row2Pixel (row); 2175 int ypixel = (int)Row2Pixel (row);
2234 2176
2235 for (col = 0; col < TermWin.ncol; col++) 2177 for (col = 0; col < ncol; col++)
2236 { 2178 {
2237 /* compare new text with old - if exactly the same then continue */ 2179 /* compare new text with old - if exactly the same then continue */
2238 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2180 if (stp[col] == dtp[col] /* Must match characters to skip. */
2239 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2181 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2240 || (stp[col] == ' ' /* space w/ no background change */ 2182 || (stp[col] == ' ' /* space w/ no background change */
… …
2254 dtp[col] = stp[col]; 2196 dtp[col] = stp[col];
2255 drp[col] = rend; 2197 drp[col] = rend;
2256 2198
2257 int xpixel = Col2Pixel (col); 2199 int xpixel = Col2Pixel (col);
2258 2200
2259 for (i = 0; ++col < TermWin.ncol; ) 2201 for (i = 0; ++col < ncol; )
2260 { 2202 {
2261 if (stp[col] == NOCHAR) 2203 if (stp[col] == NOCHAR)
2262 { 2204 {
2263 dtp[col] = stp[col]; 2205 dtp[col] = stp[col];
2264 drp[col] = rend; 2206 drp[col] = rend;
… …
2292 2234
2293 // sometimes we optimize away the trailing NOCHAR's, add them back 2235 // sometimes we optimize away the trailing NOCHAR's, add them back
2294 while (i && text[count] == NOCHAR) 2236 while (i && text[count] == NOCHAR)
2295 count++, i--; 2237 count++, i--;
2296 2238
2297#if ENABLE_STYLES
2298 // force redraw after "careful" characters to avoid pixel droppings
2299 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2300 drp[col + 1] = ~srp[col + 1];
2301
2302 // include previous careful character(s) if possible, looks nicer (best effort...)
2303 while (text > stp
2304 && srp[text - stp - 1] & RS_Careful
2305 && RS_SAME (rend, srp[text - stp - 1]))
2306 text--, count++, xpixel -= TermWin.fwidth;
2307#endif
2308
2309 /* 2239 /*
2310 * Determine the attributes for the string 2240 * Determine the attributes for the string
2311 */ 2241 */
2312 int fore = GET_FGCOLOR (rend); // desired foreground 2242 int fore = fgcolor_of (rend); // desired foreground
2313 int back = GET_BGCOLOR (rend); // desired background 2243 int back = bgcolor_of (rend); // desired background
2314 2244
2315 // only do special processing if ana attributes are set, which is rare 2245 // only do special processing if any attributes are set, which is unlikely
2316 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2317 { 2247 {
2248#if ENABLE_STYLES
2249 // force redraw after "careful" characters to avoid pixel droppings
2250 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2251 drp[col + 1] = ~srp[col + 1];
2252
2253 // include previous careful character(s) if possible, looks nicer (best effort...)
2254 while (text > stp
2255 && srp[text - stp - 1] & RS_Careful
2256 && RS_SAME (rend, srp[text - stp - 1]))
2257 text--, count++, xpixel -= fwidth;
2258#endif
2259
2318 bool invert = rend & RS_RVid; 2260 bool invert = rend & RS_RVid;
2319 2261
2320#ifndef NO_BOLD_UNDERLINE_REVERSE 2262#ifndef NO_BOLD_UNDERLINE_REVERSE
2321 if (rend & RS_Bold 2263 if (rend & RS_Bold
2322 && fore == Color_fg) 2264 && fore == Color_fg)
… …
2344 fore = Color_UL; 2286 fore = Color_UL;
2345#endif 2287#endif
2346 2288
2347 if (invert) 2289 if (invert)
2348 { 2290 {
2349 SWAP_IT (fore, back, int); 2291 ::swap (fore, back);
2350 2292
2351#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2352 if (ISSET_PIXCOLOR (Color_RV)) 2294 if (ISSET_PIXCOLOR (Color_RV))
2353 back = Color_RV; 2295 back = Color_RV;
2296
2297 if (fore == back)
2298 {
2299 fore = Color_bg;
2300 back = Color_fg;
2301 }
2354#endif 2302#endif
2355 } 2303 }
2356 2304
2357#ifdef TEXT_BLINK 2305#ifdef TEXT_BLINK
2358 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2306 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2369 } 2317 }
2370 2318
2371 /* 2319 /*
2372 * Actually do the drawing of the string here 2320 * Actually do the drawing of the string here
2373 */ 2321 */
2374 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2322 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2375 2323
2376 if (back == fore) 2324 if (back == fore)
2377 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2325 font->clear_rect (*drawable, xpixel, ypixel,
2378 TermWin.fwidth * count, TermWin.fheight, 2326 fwidth * count, fheight,
2379 back); 2327 back);
2380 else if (back == Color_bg) 2328 else if (back == Color_bg)
2381 { 2329 {
2382 if (must_clear) 2330 if (must_clear)
2383 { 2331 {
2384 CLEAR_CHARS (xpixel, ypixel, count); 2332 CLEAR_CHARS (xpixel, ypixel, count);
2385 2333
2386 for (i = 0; i < count; i++) /* don't draw empty strings */ 2334 for (i = 0; i < count; i++) /* don't draw empty strings */
2387 if (text[i] != ' ') 2335 if (text[i] != ' ')
2388 { 2336 {
2389 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2337 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2390 break; 2338 break;
2391 } 2339 }
2392 } 2340 }
2393 else 2341 else
2394 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2395 } 2343 }
2396 else 2344 else
2397 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2345 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2398 2346
2399 if (rend & RS_Uline && font->descent > 1 && fore != back) 2347 if (rend & RS_Uline && font->descent > 1 && fore != back)
2400 { 2348 {
2401#if ENABLE_FRILLS 2349#if ENABLE_FRILLS
2402 if (ISSET_PIXCOLOR (Color_underline)) 2350 if (ISSET_PIXCOLOR (Color_underline))
2403 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2351 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2404 else 2352 else
2405#endif 2353#endif
2406 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2354 XSetForeground (display->display, gc, pix_colors[fore]);
2407 2355
2408 XDrawLine (display->display, drawBuffer, TermWin.gc, 2356 XDrawLine (display->display, drawBuffer, gc,
2409 xpixel, ypixel + font->ascent + 1, 2357 xpixel, ypixel + font->ascent + 1,
2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2358 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411 } 2359 }
2412 } /* for (col....) */ 2360 } /* for (col....) */
2413 } /* for (row....) */ 2361 } /* for (row....) */
2414 2362
2415#if ENABLE_OVERLAY 2363#if ENABLE_OVERLAY
2416 scr_swap_overlay (); 2364 scr_swap_overlay ();
2417#endif 2365#endif
2366 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2418 2367
2419 /* 2368 /*
2420 * G: cleanup cursor and display outline cursor if necessary 2369 * G: cleanup cursor and display outline cursor if necessary
2421 */ 2370 */
2422 if (showcursor) 2371 if (showcursor)
2423 { 2372 {
2424 if (TermWin.focus) 2373 if (focus)
2425 { 2374 {
2426 if (options & Opt_cursorUnderline) 2375 if (OPTION (Opt_cursorUnderline))
2427 *crp ^= RS_Uline; 2376 *crp ^= RS_Uline;
2428 else 2377 else
2429 { 2378 {
2430 *crp ^= RS_RVid; 2379 *crp ^= RS_RVid;
2431#ifndef NO_CURSORCOLOR 2380#ifndef NO_CURSORCOLOR
… …
2436 else if (oldcursor.row >= 0) 2385 else if (oldcursor.row >= 0)
2437 { 2386 {
2438 int cursorwidth = 1; 2387 int cursorwidth = 1;
2439 int col = oldcursor.col; 2388 int col = oldcursor.col;
2440 2389
2441 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2390 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2442 col--; 2391 col--;
2443 2392
2444 while (col + cursorwidth < TermWin.ncol 2393 while (col + cursorwidth < ncol
2445 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) 2394 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2446 cursorwidth++; 2395 cursorwidth++;
2447 2396
2448#ifndef NO_CURSORCOLOR 2397#ifndef NO_CURSORCOLOR
2449 if (ISSET_PIXCOLOR (Color_cursor)) 2398 if (ISSET_PIXCOLOR (Color_cursor))
2450 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2399 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2451#endif 2400#endif
2452 2401
2453 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2402 XDrawRectangle (display->display, drawBuffer, gc,
2454 Col2Pixel (col), 2403 Col2Pixel (col),
2455 Row2Pixel (oldcursor.row), 2404 Row2Pixel (oldcursor.row),
2456 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2405 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2457 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2406 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2458 } 2407 }
2459 } 2408 }
2460 2409
2461 /* 2410 /*
2462 * H: cleanup selection 2411 * H: cleanup selection
2463 */ 2412 */
2464 scr_reverse_selection (); 2413 scr_reverse_selection ();
2465 2414
2466 if (refresh_type & SMOOTH_REFRESH)
2467 XFlush (display->display);
2468
2469 num_scr = 0; 2415 num_scr = 0;
2470 num_scr_allow = 1; 2416 num_scr_allow = 1;
2471} 2417}
2472 2418
2473void 2419void
2474rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2420rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2475{ 2421{
2476 if (!rp || !tp) 2422 if (!l.t)
2477 return; 2423 return;
2478 2424
2479 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2425 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2426
2427 for (int i = ncol; i--; )
2480 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2428 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2481} 2429}
2482 2430
2483void 2431void
2484rxvt_term::scr_remap_chars () 2432rxvt_term::scr_remap_chars () NOTHROW
2485{ 2433{
2486 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2434 for (int i = total_rows; i--; )
2487 scr_remap_chars (screen.text[i], screen.rend[i]); 2435 scr_remap_chars (row_buf [i]);
2488 2436
2489 for (int i = TermWin.nrow; i--; ) 2437 for (int i = nrow; i--; )
2490 {
2491 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2492 scr_remap_chars (swap.text[i], swap.rend[i]);
2493 } 2438 {
2439 scr_remap_chars (drawn_buf [i]);
2440 scr_remap_chars (swap_buf [i]);
2441 }
2494} 2442}
2495 2443
2496void 2444void
2497rxvt_term::scr_recolour () 2445rxvt_term::scr_recolour () NOTHROW
2498{ 2446{
2499 if (1 2447 if (1
2500#if TRANSPARENT 2448#if TRANSPARENT
2501 && !am_transparent 2449 && !am_transparent
2502#endif 2450#endif
2503#if XPM_BACKGROUND 2451#if XPM_BACKGROUND
2504 && !bgPixmap.pixmap 2452 && !bgPixmap.pixmap
2505#endif 2453#endif
2506 ) 2454 )
2507 { 2455 {
2508 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2456 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2509 XClearWindow (display->display, TermWin.parent[0]); 2457 XClearWindow (display->display, parent[0]);
2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2458 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2511#if HAVE_SCROLLBARS 2459#if HAVE_SCROLLBARS
2512 if (scrollBar.win) 2460 if (scrollBar.win)
2513 { 2461 {
2514 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2462 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.setIdle (); 2463 scrollBar.setIdle ();
… …
2523 want_refresh = 1; 2471 want_refresh = 1;
2524} 2472}
2525 2473
2526/* ------------------------------------------------------------------------- */ 2474/* ------------------------------------------------------------------------- */
2527void 2475void
2528rxvt_term::scr_clear (bool really) 2476rxvt_term::scr_clear (bool really) NOTHROW
2529{ 2477{
2530 if (!TermWin.mapped) 2478 if (!mapped)
2531 return; 2479 return;
2532 2480
2533 num_scr_allow = 0; 2481 num_scr_allow = 0;
2534 want_refresh = 1; 2482 want_refresh = 1;
2535 2483
2536#if TRANSPARENT
2537 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2538 {
2539 int i;
2540
2541 if (!(options & Opt_transparent_all))
2542 i = 0;
2543 else
2544 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2545
2546 while (i--)
2547 if (TermWin.parent[i] != None)
2548 XClearWindow (display->display, TermWin.parent[i]);
2549 }
2550#endif
2551
2552 if (really) 2484 if (really)
2553 XClearWindow (display->display, TermWin.vt); 2485 XClearWindow (display->display, vt);
2554} 2486}
2555 2487
2556/* ------------------------------------------------------------------------- */
2557void 2488void
2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2490{
2491 int view_end = view_start + nrow;
2492 int row, col;
2493
2494 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2495 {
2496 text_t *stp = ROW(row).t;
2497 rend_t *srp = ROW(row).r;
2498
2499 for (col = beg_col; col < end_col; col++)
2500 srp[col] ^= rstyle1;
2501
2502 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2503 srp[col] ^= rstyle2;
2504
2505 if (++col < end_col)
2506 srp[col] ^= rstyle2;
2507 }
2508}
2509
2510void
2511rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2512{
2513 int view_end = view_start + nrow;
2514 int row, col;
2515
2516 if (beg_row >= view_start)
2517 {
2518 col = beg_col;
2519 row = beg_row;
2520 }
2521 else
2522 {
2523 col = 0;
2524 row = view_start;
2525 }
2526
2527 for (; row < min (end_row, view_end); row++, col = 0)
2528 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2529 srp[col] ^= rstyle;
2530
2531 if (row == end_row)
2532 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2533 srp[col] ^= rstyle;
2534}
2535
2536/* ------------------------------------------------------------------------- */
2537void
2558rxvt_term::scr_reverse_selection () 2538rxvt_term::scr_reverse_selection () NOTHROW
2559{ 2539{
2540 if (selection.op
2560 if (selection.op && current_screen == selection.screen) 2541 && current_screen == selection.screen
2542 && selection.end.row >= view_start)
2561 { 2543 {
2562 int end_row = TermWin.saveLines - TermWin.view_start;
2563 int i = selection.beg.row + TermWin.saveLines;
2564 int col, row = selection.end.row + TermWin.saveLines;
2565 rend_t *srp;
2566
2567#if ENABLE_FRILLS 2544#if ENABLE_FRILLS
2568 if (selection.rect) 2545 if (selection.rect)
2569 { 2546 scr_xor_rect (selection.beg.row, selection.beg.col,
2570 end_row += TermWin.nrow; 2547 selection.end.row, selection.end.col,
2571 2548 RS_RVid, RS_RVid | RS_Uline);
2572 for (; i <= row && i <= end_row; i++)
2573 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2574 srp[col] ^= RS_RVid;
2575 }
2576 else 2549 else
2577#endif 2550#endif
2578 { 2551 scr_xor_span (selection.beg.row, selection.beg.col,
2579 if (i >= end_row) 2552 selection.end.row, selection.end.col,
2580 col = selection.beg.col; 2553 RS_RVid);
2581 else
2582 {
2583 col = 0;
2584 i = end_row;
2585 }
2586
2587 end_row += TermWin.nrow;
2588
2589 for (; i < row && i < end_row; i++, col = 0)
2590 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2591 srp[col] ^= RS_RVid;
2592
2593 if (i == row && i < end_row)
2594 for (srp = screen.rend[i]; col < selection.end.col; col++)
2595 srp[col] ^= RS_RVid;
2596 }
2597 } 2554 }
2598} 2555}
2599 2556
2600/* ------------------------------------------------------------------------- */ 2557/* ------------------------------------------------------------------------- */
2601/* 2558/*
2602 * Dump the whole scrollback and screen to the passed filedescriptor. The 2559 * Dump the whole scrollback and screen to the passed filedescriptor. The
2603 * invoking routine must close the fd. 2560 * invoking routine must close the fd.
2604 */ 2561 */
2605#if 0 2562#if 0
2606void 2563void
2607rxvt_term::scr_dump (int fd) 2564rxvt_term::scr_dump (int fd) NOTHROW
2608{ 2565{
2609 int row, wrote; 2566 int row, wrote;
2610 unsigned int width, towrite; 2567 unsigned int width, towrite;
2611 char r1[] = "\n"; 2568 char r1[] = "\n";
2612 2569
2613 for (row = TermWin.saveLines - TermWin.nscrolled; 2570 for (row = saveLines - nsaved;
2614 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2571 row < saveLines + nrow - 1; row++)
2615 { 2572 {
2616 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2573 width = row_buf[row].l >= 0 ? row_buf[row].l
2617 : TermWin.ncol; 2574 : ncol;
2618 for (towrite = width; towrite; towrite -= wrote) 2575 for (towrite = width; towrite; towrite -= wrote)
2619 { 2576 {
2620 wrote = write (fd, & (screen.text[row][width - towrite]), 2577 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2621 towrite); 2578 towrite);
2622 if (wrote < 0) 2579 if (wrote < 0)
2623 return; /* XXX: death, no report */ 2580 return; /* XXX: death, no report */
2624 } 2581 }
2625 if (screen.tlen[row] >= 0) 2582 if (row_buf[row].l >= 0)
2626 if (write (fd, r1, 1) <= 0) 2583 if (write (fd, r1, 1) <= 0)
2627 return; /* XXX: death, no report */ 2584 return; /* XXX: death, no report */
2628 } 2585 }
2629} 2586}
2630#endif 2587#endif
2631 2588
2632/* ------------------------------------------------------------------------- * 2589/* ------------------------------------------------------------------------- *
2633 * CHARACTER SELECTION * 2590 * CHARACTER SELECTION *
2634 * ------------------------------------------------------------------------- */ 2591 * ------------------------------------------------------------------------- */
2635
2636/*
2637 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2638 */
2639void 2592void
2640rxvt_term::selection_check (int check_more) 2593rxvt_term::selection_check (int check_more) NOTHROW
2641{ 2594{
2642 row_col_t pos; 2595 row_col_t pos;
2643 2596
2644 if (!selection.op) 2597 if (!selection.op)
2645 return; 2598 return;
2646 2599
2647 pos.row = pos.col = 0; 2600 pos.row = pos.col = 0;
2648 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2601 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2649 || (selection.beg.row >= TermWin.nrow) 2602 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2650 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2603 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2651 || (selection.mark.row >= TermWin.nrow)
2652 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2653 || (selection.end.row >= TermWin.nrow)
2654 || (check_more == 1 2604 || (check_more == 1
2655 && current_screen == selection.screen 2605 && current_screen == selection.screen
2656 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2606 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2657 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2607 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2658 || (check_more == 2 2608 || (check_more == 2
… …
2660 && ROWCOL_IS_AFTER (selection.end, pos)) 2610 && ROWCOL_IS_AFTER (selection.end, pos))
2661 || (check_more == 3 2611 || (check_more == 3
2662 && ROWCOL_IS_AFTER (selection.end, pos)) 2612 && ROWCOL_IS_AFTER (selection.end, pos))
2663 || (check_more == 4 /* screen width change */ 2613 || (check_more == 4 /* screen width change */
2664 && (selection.beg.row != selection.end.row 2614 && (selection.beg.row != selection.end.row
2665 || selection.end.col > TermWin.ncol))) 2615 || selection.end.col > ncol)))
2666 CLEAR_SELECTION (); 2616 CLEAR_SELECTION ();
2667} 2617}
2668 2618
2669/* ------------------------------------------------------------------------- */ 2619/* ------------------------------------------------------------------------- */
2670/* 2620/*
2671 * Paste a selection direct to the command fd 2621 * Paste a selection direct to the command fd
2672 */ 2622 */
2673void 2623void
2674rxvt_term::paste (unsigned char *data, unsigned int len) 2624rxvt_term::paste (char *data, unsigned int len) NOTHROW
2675{ 2625{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2626 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2627 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2628 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2629 data[i] = C0_CR;
… …
2685/* 2635/*
2686 * Respond to a notification that a primary selection has been sent 2636 * Respond to a notification that a primary selection has been sent
2687 * EXT: SelectionNotify 2637 * EXT: SelectionNotify
2688 */ 2638 */
2689void 2639void
2690rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2640rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2691{ 2641{
2692 if (prop == None) /* check for failed XConvertSelection */ 2642 if (prop == None) /* check for failed XConvertSelection */
2693 { 2643 {
2694 if ((selection_type & Sel_CompoundText)) 2644 if ((selection_type & Sel_CompoundText))
2695 { 2645 {
… …
2823 { 2773 {
2824 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2774 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2825 char *s = rxvt_wcstombs (w); 2775 char *s = rxvt_wcstombs (w);
2826 free (w); 2776 free (w);
2827 // TODO: strlen == only the first element will be converted. well... 2777 // TODO: strlen == only the first element will be converted. well...
2828 paste ((unsigned char *)s, strlen (s)); 2778 paste (s, strlen (s));
2829 free (s); 2779 free (s);
2830 } 2780 }
2831 else 2781 else
2832#endif 2782#endif
2833 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2783 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2834 && cl) 2784 && cl)
2835 { 2785 {
2836 for (int i = 0; i < cr; i++) 2786 for (int i = 0; i < cr; i++)
2837 paste ((unsigned char *)cl[i], strlen (cl[i])); 2787 paste (cl[i], strlen (cl[i]));
2838 2788
2839 XFreeStringList (cl); 2789 XFreeStringList (cl);
2840 } 2790 }
2841 else 2791 else
2842 paste (ct.value, ct.nitems); // paste raw 2792 paste ((char *)ct.value, ct.nitems); // paste raw
2843 2793
2844bailout: 2794bailout:
2845 XFree (ct.value); 2795 XFree (ct.value);
2846 2796
2847 if (selection_wait == Sel_normal) 2797 if (selection_wait == Sel_normal)
2848 selection_wait = Sel_none; 2798 selection_wait = Sel_none;
2849} 2799}
2850 2800
2851void 2801void
2852rxvt_term::incr_cb (time_watcher &w) 2802rxvt_term::incr_cb (time_watcher &w) NOTHROW
2853{ 2803{
2854 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2855 2805
2856 incr_buf_size = 0; 2806 incr_buf_size = 0;
2857 free (incr_buf); 2807 free (incr_buf);
2858 2808
2859 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2809 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2860} 2810}
2861 2811
2862void 2812void
2863rxvt_term::selection_property (Window win, Atom prop) 2813rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2864{ 2814{
2865 if (prop == None || selection_wait != Sel_incr) 2815 if (prop == None || selection_wait != Sel_incr)
2866 return; 2816 return;
2867 2817
2868 selection_paste (win, prop, true); 2818 selection_paste (win, prop, true);
… …
2877 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2827 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2878 * will auto fallback to CUT_BUFFER0 2828 * will auto fallback to CUT_BUFFER0
2879 * EXT: button 2 release 2829 * EXT: button 2 release
2880 */ 2830 */
2881void 2831void
2882rxvt_term::selection_request (Time tm, int x, int y) 2832rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2883{ 2833{
2884 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2834 if (selection.text && selnum == Sel_Primary)
2885 return; /* outside window */
2886
2887 if (selection.text)
2888 { /* internal selection */ 2835 { /* internal selection */
2889 char *str = rxvt_wcstombs (selection.text, selection.len); 2836 char *str = rxvt_wcstombs (selection.text, selection.len);
2890 paste ((unsigned char *)str, strlen (str)); 2837 paste (str, strlen (str));
2891 free (str); 2838 free (str);
2892 return; 2839 return;
2893 } 2840 }
2894 else 2841 else
2895 { 2842 {
2896 int i;
2897
2898 selection_request_time = tm; 2843 selection_request_time = tm;
2899 selection_wait = Sel_normal; 2844 selection_wait = Sel_normal;
2900 2845
2901 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2902 {
2903#if X_HAVE_UTF8_STRING 2846#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String; 2847 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2848 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return; 2849 return;
2907#else 2850#else
2908 selection_type = Sel_CompoundText; 2851 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return; 2853 return;
2911#endif 2854#endif
2912 }
2913 } 2855 }
2914 2856
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2857 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false); 2858 selection_paste (display->root, XA_CUT_BUFFER0, false);
2917} 2859}
2918 2860
2919int 2861int
2920rxvt_term::selection_request_other (Atom target, int selnum) 2862rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2921{ 2863{
2922 Atom sel; 2864 Atom sel;
2923 2865
2924 selection_type |= selnum; 2866 selection_type |= selnum;
2925 2867
… …
2931 sel = xa[XA_CLIPBOARD]; 2873 sel = xa[XA_CLIPBOARD];
2932 2874
2933 if (XGetSelectionOwner (display->display, sel) != None) 2875 if (XGetSelectionOwner (display->display, sel) != None)
2934 { 2876 {
2935 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2877 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2936 TermWin.vt, selection_request_time); 2878 vt, selection_request_time);
2937 return 1; 2879 return 1;
2938 } 2880 }
2939 2881
2940 return 0; 2882 return 0;
2941} 2883}
… …
2944/* 2886/*
2945 * Clear all selected text 2887 * Clear all selected text
2946 * EXT: SelectionClear 2888 * EXT: SelectionClear
2947 */ 2889 */
2948void 2890void
2949rxvt_term::selection_clear () 2891rxvt_term::selection_clear () NOTHROW
2950{ 2892{
2951 want_refresh = 1; 2893 want_refresh = 1;
2952 free (selection.text); 2894 free (selection.text);
2953 selection.text = NULL; 2895 selection.text = NULL;
2954 selection.len = 0; 2896 selection.len = 0;
… …
2964 * EXT: button 1 or 3 release 2906 * EXT: button 1 or 3 release
2965 */ 2907 */
2966void 2908void
2967rxvt_term::selection_make (Time tm) 2909rxvt_term::selection_make (Time tm)
2968{ 2910{
2969 int i, col, end_col, row, end_row; 2911 int i;
2970 wchar_t *new_selection_text; 2912 wchar_t *new_selection_text;
2971 text_t *t; 2913 text_t *t;
2972 2914
2973 switch (selection.op) 2915 switch (selection.op)
2974 { 2916 {
… …
2987 selection.op = SELECTION_DONE; 2929 selection.op = SELECTION_DONE;
2988 2930
2989 if (selection.clicks == 4) 2931 if (selection.clicks == 4)
2990 return; /* nothing selected, go away */ 2932 return; /* nothing selected, go away */
2991 2933
2934 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2935 return;
2936
2992 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2937 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2993 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2938 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2994 2939
2995 col = selection.beg.col;
2996 row = selection.beg.row + TermWin.saveLines;
2997 end_row = selection.end.row + TermWin.saveLines;
2998 int ofs = 0; 2940 int ofs = 0;
2999 int extra = 0; 2941 int extra = 0;
3000 2942
2943 int col = selection.beg.col;
2944 int row = selection.beg.row;
2945
2946 int end_col;
2947
3001 for (; row <= end_row; row++, col = 0) 2948 for (; row <= selection.end.row; row++, col = 0)
3002 { 2949 {
3003 end_col = screen.tlen[row];
3004
3005#if ENABLE_FRILLS 2950#if ENABLE_FRILLS
3006 if (selection.rect) 2951 if (selection.rect)
3007 { 2952 {
3008 col = selection.beg.col; 2953 col = selection.beg.col;
3009 end_col = TermWin.ncol + 1; 2954 end_col = ncol + 1;
2955 }
2956 else
2957#endif
2958 end_col = ROW(row).l;
2959
2960 col = max (col, 0);
2961
2962 if (row == selection.end.row
2963#if ENABLE_FRILLS
2964 || selection.rect
2965#endif
3010 } 2966 )
3011#endif
3012
3013 MAX_IT (col, 0);
3014
3015 if (end_col == -1)
3016 end_col = TermWin.ncol;
3017
3018 if (row == end_row || selection.rect)
3019 MIN_IT (end_col, selection.end.col); 2967 min_it (end_col, selection.end.col);
3020 2968
3021 t = &screen.text[row][col]; 2969 t = ROW(row).t + col;
2970
3022 for (; col < end_col; col++) 2971 for (; col < end_col; col++)
3023 { 2972 {
3024 if (*t == NOCHAR) 2973 if (*t == NOCHAR)
3025 t++; 2974 t++;
3026#if ENABLE_COMBINING 2975#if ENABLE_COMBINING
… …
3042#endif 2991#endif
3043 else 2992 else
3044 new_selection_text[ofs++] = *t++; 2993 new_selection_text[ofs++] = *t++;
3045 } 2994 }
3046 2995
3047 if (screen.tlen[row] != -1 && row != end_row) 2996#if ENABLE_FRILLS
2997 if (selection.rect)
2998 {
2999 while (ofs
3000 && new_selection_text[ofs - 1] != C0_LF
3001 && unicode::is_space (new_selection_text[ofs - 1]))
3002 --ofs;
3003
3048 new_selection_text[ofs++] = C0_LF; 3004 new_selection_text[ofs++] = C0_LF;
3005 }
3006 else
3007#endif
3008 if (!ROW(row).is_longer () && row != selection.end.row)
3009 new_selection_text[ofs++] = C0_LF;
3049 } 3010 }
3050 3011
3051 if (end_col != selection.end.col) 3012 if (end_col != selection.end.col)
3052 new_selection_text[ofs++] = C0_LF; 3013 new_selection_text[ofs++] = C0_LF;
3053 3014
… …
3063 3024
3064 // we usually allocate much more than necessary, so realloc it smaller again 3025 // we usually allocate much more than necessary, so realloc it smaller again
3065 selection.len = ofs; 3026 selection.len = ofs;
3066 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3027 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3067 3028
3029 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3030 return;
3031
3032 selection_grab (tm);
3033}
3034
3035bool
3036rxvt_term::selection_grab (Time tm) NOTHROW
3037{
3038 selection_time = tm;
3039
3068 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3069 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3042 {
3070 display->set_selection_owner (this); 3043 display->set_selection_owner (this);
3044 return true;
3045 }
3071 else 3046 else
3072 rxvt_warn ("can't get primary selection, ignoring.\n"); 3047 {
3048 selection_clear ();
3049 return false;
3050 }
3073 3051
3074#if 0 3052#if 0
3075 XTextProperty ct; 3053 XTextProperty ct;
3076 3054
3077 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3055 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3078 { 3056 {
3079 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3057 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3080 XFree (ct.value); 3058 XFree (ct.value);
3081 } 3059 }
3082#endif 3060#endif
3083
3084 selection_time = tm;
3085} 3061}
3086 3062
3087/* ------------------------------------------------------------------------- */ 3063/* ------------------------------------------------------------------------- */
3088/* 3064/*
3089 * Mark or select text based upon number of clicks: 1, 2, or 3 3065 * Mark or select text based upon number of clicks: 1, 2, or 3
3090 * EXT: button 1 press 3066 * EXT: button 1 press
3091 */ 3067 */
3092void 3068void
3093rxvt_term::selection_click (int clicks, int x, int y) 3069rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3094{ 3070{
3095 clicks = ((clicks - 1) % 3) + 1; 3071 clicks = ((clicks - 1) % 3) + 1;
3096 selection.clicks = clicks; /* save clicks so extend will work */ 3072 selection.clicks = clicks; /* save clicks so extend will work */
3097 3073
3074 if (clicks == 2 && !selection.rect
3075 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3076 {
3077 MEvent.clicks = 1; // what a mess
3078 selection.screen = current_screen;
3079 selection.op = SELECTION_CONT;
3080 return;
3081 }
3082
3098 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3083 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3099 3084
3100 if (clicks == 2 || clicks == 3) 3085 if (clicks == 2 || clicks == 3)
3101 selection_extend_colrow (selection.mark.col, 3086 selection_extend_colrow (selection.mark.col,
3102 selection.mark.row + TermWin.view_start, 3087 selection.mark.row - view_start,
3103 0, /* button 3 */ 3088 0, /* button 3 */
3104 1, /* button press */ 3089 1, /* button press */
3105 0); /* click change */ 3090 0); /* click change */
3106} 3091}
3107 3092
3108/* ------------------------------------------------------------------------- */ 3093/* ------------------------------------------------------------------------- */
3109/* 3094/*
3110 * Mark a selection at the specified col/row 3095 * Mark a selection at the specified col/row
3111 */ 3096 */
3112void 3097void
3113rxvt_term::selection_start_colrow (int col, int row) 3098rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3114{ 3099{
3115 want_refresh = 1; 3100 want_refresh = 1;
3101
3102 selection.mark.row = row + view_start;
3116 selection.mark.col = col; 3103 selection.mark.col = col;
3117 selection.mark.row = row - TermWin.view_start;
3118 3104
3119 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3105 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3120 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3106 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3121 MAX_IT (selection.mark.col, 0);
3122 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3123 3107
3124 while (selection.mark.col > 0 3108 while (selection.mark.col > 0
3125 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3109 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3126 --selection.mark.col; 3110 --selection.mark.col;
3127 3111
3128 if (selection.op) 3112 if (selection.op)
3129 { /* clear the old selection */ 3113 { /* clear the old selection */
3130 selection.beg.row = selection.end.row = selection.mark.row; 3114 selection.beg.row = selection.end.row = selection.mark.row;
… …
3145#define DELIMIT_TEXT(x) \ 3129#define DELIMIT_TEXT(x) \
3146 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3130 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3147#define DELIMIT_REND(x) 1 3131#define DELIMIT_REND(x) 1
3148 3132
3149void 3133void
3150rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3134rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3151{ 3135{
3152 int col, row, dirnadd, tcol, trow, w1, w2; 3136 int col, row, dirnadd, tcol, trow, w1, w2;
3153 row_col_t bound; 3137 row_col_t bound;
3154 text_t *stp; 3138 text_t *stp;
3155 rend_t *srp; 3139 rend_t *srp;
3156 3140
3157 if (dirn == UP) 3141 if (dirn == UP)
3158 { 3142 {
3159 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3143 bound.row = top_row - 1;
3160 bound.col = 0; 3144 bound.col = 0;
3161 dirnadd = -1; 3145 dirnadd = -1;
3162 } 3146 }
3163 else 3147 else
3164 { 3148 {
3165 bound.row = TermWin.saveLines + TermWin.nrow; 3149 bound.row = nrow;
3166 bound.col = TermWin.ncol - 1; 3150 bound.col = ncol - 1;
3167 dirnadd = 1; 3151 dirnadd = 1;
3168 } 3152 }
3169 3153
3170 row = mark->row + TermWin.saveLines; 3154 row = mark->row;
3171 col = mark->col; 3155 col = max (mark->col, 0);
3172 MAX_IT (col, 0); 3156
3173 /* find the edge of a word */ 3157 /* find the edge of a word */
3174 stp = &screen.text[row][col]; 3158 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3175 w1 = DELIMIT_TEXT (*stp); 3159 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3176
3177 srp = &screen.rend[row][col];
3178 w2 = DELIMIT_REND (*srp);
3179 3160
3180 for (;;) 3161 for (;;)
3181 { 3162 {
3182 for (; col != bound.col; col += dirnadd) 3163 for (; col != bound.col; col += dirnadd)
3183 { 3164 {
… …
3193 break; 3174 break;
3194 } 3175 }
3195 3176
3196 if ((col == bound.col) && (row != bound.row)) 3177 if ((col == bound.col) && (row != bound.row))
3197 { 3178 {
3198 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3179 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3199 { 3180 {
3200 trow = row + dirnadd; 3181 trow = row + dirnadd;
3201 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3182 tcol = dirn == UP ? ncol - 1 : 0;
3202 3183
3203 if (screen.text[trow] == NULL) 3184 if (!ROW(trow).t)
3204 break; 3185 break;
3205 3186
3206 stp = & (screen.text[trow][tcol]); 3187 stp = ROW(trow).t + tcol;
3207 srp = & (screen.rend[trow][tcol]); 3188 srp = ROW(trow).r + tcol;
3208 3189
3209 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3190 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3210 break; 3191 break;
3211 3192
3212 row = trow; 3193 row = trow;
… …
3215 } 3196 }
3216 } 3197 }
3217 break; 3198 break;
3218 } 3199 }
3219 3200
3220Old_Word_Selection_You_Die:
3221 if (dirn == DN) 3201 if (dirn == DN)
3222 col++; /* put us on one past the end */ 3202 col++; /* put us on one past the end */
3223 3203
3224 /* Poke the values back in */ 3204 /* Poke the values back in */
3225 ret->row = row - TermWin.saveLines; 3205 ret->row = row;
3226 ret->col = col; 3206 ret->col = col;
3227} 3207}
3228 3208
3229/* ------------------------------------------------------------------------- */ 3209/* ------------------------------------------------------------------------- */
3230/* 3210/*
… …
3233 * flag == 0 ==> button 1 3213 * flag == 0 ==> button 1
3234 * flag == 1 ==> button 3 press 3214 * flag == 1 ==> button 3 press
3235 * flag == 2 ==> button 3 motion 3215 * flag == 2 ==> button 3 motion
3236 */ 3216 */
3237void 3217void
3238rxvt_term::selection_extend (int x, int y, int flag) 3218rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3239{ 3219{
3240 int col, row; 3220 int col = clamp (Pixel2Col (x), 0, ncol);
3241 3221 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3242 col = Pixel2Col (x);
3243 row = Pixel2Row (y);
3244 MAX_IT (row, 0);
3245 MIN_IT (row, (int)TermWin.nrow - 1);
3246 MAX_IT (col, 0);
3247 MIN_IT (col, (int)TermWin.ncol);
3248 3222
3249 /* 3223 /*
3250 * If we're selecting characters (single click) then we must check first 3224 * If we're selecting characters (single click) then we must check first
3251 * if we are at the same place as the original mark. If we are then 3225 * if we are at the same place as the original mark. If we are then
3252 * select nothing. Otherwise, if we're to the right of the mark, you have to 3226 * select nothing. Otherwise, if we're to the right of the mark, you have to
3253 * be _past_ a character for it to be selected. 3227 * be _past_ a character for it to be selected.
3254 */ 3228 */
3255 if (((selection.clicks % 3) == 1) && !flag 3229 if (((selection.clicks % 3) == 1) && !flag
3256 && (col == selection.mark.col 3230 && (col == selection.mark.col
3257 && (row == selection.mark.row + TermWin.view_start))) 3231 && (row == selection.mark.row - view_start)))
3258 { 3232 {
3259 /* select nothing */ 3233 /* select nothing */
3260 selection.beg.row = selection.end.row = 0; 3234 selection.beg.row = selection.end.row = 0;
3261 selection.beg.col = selection.end.col = 0; 3235 selection.beg.col = selection.end.col = 0;
3262 selection.clicks = 4; 3236 selection.clicks = 4;
… …
3275/* ------------------------------------------------------------------------- */ 3249/* ------------------------------------------------------------------------- */
3276/* 3250/*
3277 * Extend the selection to the specified col/row 3251 * Extend the selection to the specified col/row
3278 */ 3252 */
3279void 3253void
3280rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3254rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3281{ 3255{
3282 int16_t ncol = TermWin.ncol;
3283 int end_col;
3284 row_col_t pos; 3256 row_col_t pos;
3285 enum { 3257 enum {
3286 LEFT, RIGHT 3258 LEFT, RIGHT
3287 } closeto = RIGHT; 3259 } closeto = RIGHT;
3288 3260
… …
3319 selection.beg.col = selection.end.col = selection.mark.col; 3291 selection.beg.col = selection.end.col = selection.mark.col;
3320 selection.beg.row = selection.end.row = selection.mark.row; 3292 selection.beg.row = selection.end.row = selection.mark.row;
3321 } 3293 }
3322 3294
3323 pos.col = col; 3295 pos.col = col;
3324 pos.row = row; 3296 pos.row = view_start + row;
3325
3326 pos.row -= TermWin.view_start; /* adjust for scroll */
3327 3297
3328 /* 3298 /*
3329 * This is mainly xterm style selection with a couple of differences, mainly 3299 * This is mainly xterm style selection with a couple of differences, mainly
3330 * in the way button3 drag extension works. 3300 * in the way button3 drag extension works.
3331 * We're either doing: button1 drag; button3 press; or button3 drag 3301 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3390 } 3360 }
3391 } 3361 }
3392 3362
3393 if (selection.clicks == 1) 3363 if (selection.clicks == 1)
3394 { 3364 {
3395 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3365 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3396 3366 && !ROW(selection.beg.row).is_longer ()
3397 if (selection.beg.col > end_col
3398 && end_col != -1
3399#if ENABLE_FRILLS 3367#if ENABLE_FRILLS
3400 && !selection.rect 3368 && !selection.rect
3401#endif 3369#endif
3402 ) 3370 )
3403 selection.beg.col = ncol; 3371 selection.beg.col = ncol;
3404 3372
3405 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3406
3407 if ( 3373 if (
3408 selection.end.col > end_col 3374 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3409 && end_col != -1 3375 && !ROW(selection.end.row).is_longer ()
3410#if ENABLE_FRILLS 3376#if ENABLE_FRILLS
3411 && !selection.rect 3377 && !selection.rect
3412#endif 3378#endif
3413 ) 3379 )
3414 selection.end.col = ncol; 3380 selection.end.col = ncol;
… …
3422 selection_delimit_word (DN, &selection.end, &selection.end); 3388 selection_delimit_word (DN, &selection.end, &selection.end);
3423 } 3389 }
3424 else if (selection.clicks == 3) 3390 else if (selection.clicks == 3)
3425 { 3391 {
3426#if ENABLE_FRILLS 3392#if ENABLE_FRILLS
3427 if (options & Opt_tripleclickwords) 3393 if (OPTION (Opt_tripleclickwords))
3428 { 3394 {
3429 int end_row;
3430
3431 selection_delimit_word (UP, &selection.beg, &selection.beg); 3395 selection_delimit_word (UP, &selection.beg, &selection.beg);
3432 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3433 3396
3434 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3397 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3435 { 3398 {
3436 end_col = screen.tlen[end_row + TermWin.saveLines]; 3399 if (!ROW(end_row).is_longer ())
3437
3438 if (end_col != -1)
3439 { 3400 {
3440 selection.end.row = end_row; 3401 selection.end.row = end_row;
3441 selection.end.col = end_col; 3402 selection.end.col = ROW(end_row).l;
3442 selection_remove_trailing_spaces (); 3403 selection_remove_trailing_spaces ();
3443 break; 3404 break;
3444 } 3405 }
3445 } 3406 }
3446 } 3407 }
… …
3452 3413
3453 selection.beg.col = 0; 3414 selection.beg.col = 0;
3454 selection.end.col = ncol; 3415 selection.end.col = ncol;
3455 3416
3456 // select a complete logical line 3417 // select a complete logical line
3457 while (selection.beg.row > -TermWin.saveLines 3418 while (selection.beg.row > -saveLines
3458 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3419 && ROW(selection.beg.row - 1).is_longer ())
3459 selection.beg.row--; 3420 selection.beg.row--;
3460 3421
3461 while (selection.end.row < TermWin.nrow 3422 while (selection.end.row < nrow
3462 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3423 && ROW(selection.end.row).is_longer ())
3463 selection.end.row++; 3424 selection.end.row++;
3464 } 3425 }
3465 } 3426 }
3466 3427
3467 if (button3 && buttonpress) 3428 if (button3 && buttonpress)
… …
3478 } 3439 }
3479 } 3440 }
3480 3441
3481#if ENABLE_FRILLS 3442#if ENABLE_FRILLS
3482 if (selection.rect && selection.beg.col > selection.end.col) 3443 if (selection.rect && selection.beg.col > selection.end.col)
3483 SWAP_IT (selection.beg.col, selection.end.col, int); 3444 ::swap (selection.beg.col, selection.end.col);
3484#endif 3445#endif
3485} 3446}
3486 3447
3487#if ENABLE_FRILLS 3448#if ENABLE_FRILLS
3488void 3449void
3489rxvt_term::selection_remove_trailing_spaces () 3450rxvt_term::selection_remove_trailing_spaces () NOTHROW
3490{ 3451{
3491 int32_t end_col, end_row; 3452 int32_t end_col, end_row;
3492 text_t *stp; 3453 text_t *stp;
3493 3454
3494 end_col = selection.end.col; 3455 end_col = selection.end.col;
3495 end_row = selection.end.row; 3456 end_row = selection.end.row;
3496 3457
3497 for ( ; end_row >= selection.beg.row; ) 3458 for (; end_row >= selection.beg.row; )
3498 { 3459 {
3499 stp = screen.text[end_row + TermWin.saveLines]; 3460 stp = ROW(end_row).t;
3500 3461
3501 while (--end_col >= 0) 3462 while (--end_col >= 0)
3502 { 3463 {
3503 if (stp[end_col] != ' ' 3464 if (stp[end_col] != NOCHAR
3504 && stp[end_col] != '\t' 3465 && !unicode::is_space (stp[end_col]))
3505 && stp[end_col] != NOCHAR)
3506 break; 3466 break;
3507 } 3467 }
3508 3468
3509 if (end_col >= 0 3469 if (end_col >= 0
3510 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3470 || !ROW(end_row - 1).is_longer ())
3511 { 3471 {
3512 selection.end.col = end_col + 1; 3472 selection.end.col = end_col + 1;
3513 selection.end.row = end_row; 3473 selection.end.row = end_row;
3514 break; 3474 break;
3515 } 3475 }
3516 3476
3517 end_row--; 3477 end_row--;
3518 end_col = TermWin.ncol; 3478 end_col = ncol;
3519 } 3479 }
3520 3480
3521 if (selection.mark.row > selection.end.row) 3481 if (selection.mark.row > selection.end.row)
3522 { 3482 {
3523 selection.mark.row = selection.end.row; 3483 selection.mark.row = selection.end.row;
… …
3533/* 3493/*
3534 * Double click on button 3 when already selected 3494 * Double click on button 3 when already selected
3535 * EXT: button 3 double click 3495 * EXT: button 3 double click
3536 */ 3496 */
3537void 3497void
3538rxvt_term::selection_rotate (int x, int y) 3498rxvt_term::selection_rotate (int x, int y) NOTHROW
3539{ 3499{
3540 selection.clicks = selection.clicks % 3 + 1; 3500 selection.clicks = selection.clicks % 3 + 1;
3541 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3501 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3542} 3502}
3543 3503
… …
3545/* 3505/*
3546 * Respond to a request for our current selection 3506 * Respond to a request for our current selection
3547 * EXT: SelectionRequest 3507 * EXT: SelectionRequest
3548 */ 3508 */
3549void 3509void
3550rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3551{ 3511{
3552 XSelectionEvent ev; 3512 XSelectionEvent ev;
3553 dDisp; 3513 dDisp;
3554 3514
3555 ev.type = SelectionNotify; 3515 ev.type = SelectionNotify;
… …
3683 3643
3684/* 3644/*
3685 * return col/row values corresponding to x/y pixel values 3645 * return col/row values corresponding to x/y pixel values
3686 */ 3646 */
3687void 3647void
3688rxvt_term::pixel_position (int *x, int *y) 3648rxvt_term::pixel_position (int *x, int *y) NOTHROW
3689{ 3649{
3690 *x = Pixel2Col (*x); 3650 *x = Pixel2Col (*x);
3691 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3651 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3692 *y = Pixel2Row (*y); 3652 *y = Pixel2Row (*y);
3693 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3653 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3694} 3654}
3695 3655
3696/* ------------------------------------------------------------------------- */ 3656/* ------------------------------------------------------------------------- */
3697#ifdef USE_XIM 3657#ifdef USE_XIM
3698void 3658void
3699rxvt_term::im_set_position (XPoint &pos) 3659rxvt_term::im_set_position (XPoint &pos) NOTHROW
3700{ 3660{
3701 XWindowAttributes xwa; 3661 XWindowAttributes xwa;
3702 3662
3703 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3663 XGetWindowAttributes (display->display, vt, &xwa);
3704 3664
3705 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3665 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3706 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3666 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3707} 3667}
3708#endif 3668#endif
3709 3669
3710#if ENABLE_OVERLAY 3670#if ENABLE_OVERLAY
3711void 3671void
3712rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3672rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3713{ 3673{
3714 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3674 if (nrow < 1 || ncol < 1)
3715 return; 3675 return;
3716 3676
3717 want_refresh = 1; 3677 want_refresh = 1;
3718 3678
3719 scr_overlay_off (); 3679 scr_overlay_off ();
3720 3680
3721 if (x < 0) x = TermWin.ncol - w; 3681 if (x < 0) x = ncol - w;
3722 if (y < 0) y = TermWin.nrow - h; 3682 if (y < 0) y = nrow - h;
3723 3683
3724 // make space for border 3684 // make space for border
3725 w += 2; MIN_IT (w, TermWin.ncol); 3685 w += 2; min_it (w, ncol);
3726 h += 2; MIN_IT (h, TermWin.nrow); 3686 h += 2; min_it (h, nrow);
3727 3687
3728 x -= 1; MAX_IT (x, 0); 3688 x -= 1; clamp_it (x, 0, ncol - w);
3729 y -= 1; MAX_IT (y, 0); 3689 y -= 1; clamp_it (y, 0, nrow - h);
3730
3731 MIN_IT (x, TermWin.ncol - w);
3732 MIN_IT (y, TermWin.nrow - h);
3733 3690
3734 ov_x = x; ov_y = y; 3691 ov_x = x; ov_y = y;
3735 ov_w = w; ov_h = h; 3692 ov_w = w; ov_h = h;
3736 3693
3737 ov_text = new text_t *[h]; 3694 ov_text = new text_t *[h];
… …
3765 *rp = r; 3722 *rp = r;
3766 } 3723 }
3767} 3724}
3768 3725
3769void 3726void
3770rxvt_term::scr_overlay_off () 3727rxvt_term::scr_overlay_off () NOTHROW
3771{ 3728{
3772 if (!ov_text) 3729 if (!ov_text)
3773 return; 3730 return;
3774 3731
3775 want_refresh = 1; 3732 want_refresh = 1;
… …
3783 delete [] ov_text; ov_text = 0; 3740 delete [] ov_text; ov_text = 0;
3784 delete [] ov_rend; ov_rend = 0; 3741 delete [] ov_rend; ov_rend = 0;
3785} 3742}
3786 3743
3787void 3744void
3788rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3745rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3789{ 3746{
3790 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3747 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3791 return; 3748 return;
3792 3749
3793 x++, y++; 3750 x++, y++;
… …
3795 ov_text[y][x] = text; 3752 ov_text[y][x] = text;
3796 ov_rend[y][x] = rend; 3753 ov_rend[y][x] = rend;
3797} 3754}
3798 3755
3799void 3756void
3800rxvt_term::scr_overlay_set (int x, int y, const char *s) 3757rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3801{ 3758{
3802 while (*s) 3759 while (*s)
3803 scr_overlay_set (x++, y, *s++); 3760 scr_overlay_set (x++, y, *s++);
3804} 3761}
3805 3762
3806void 3763void
3807rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3808{ 3765{
3809 while (*s) 3766 while (*s)
3810 { 3767 {
3811 text_t t = *s++; 3768 text_t t = *s++;
3812 int width = wcwidth (t); 3769 int width = wcwidth (t);
… …
3818 } 3775 }
3819 } 3776 }
3820} 3777}
3821 3778
3822void 3779void
3823rxvt_term::scr_swap_overlay () 3780rxvt_term::scr_swap_overlay () NOTHROW
3824{ 3781{
3825 if (!ov_text) 3782 if (!ov_text)
3826 return; 3783 return;
3827 3784
3828 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3829
3830 // swap screen mem with overlay 3785 // swap screen mem with overlay
3831 for (int y = ov_h; y--; ) 3786 for (int y = ov_h; y--; )
3832 { 3787 {
3833 text_t *t1 = ov_text[y]; 3788 text_t *t1 = ov_text[y];
3834 rend_t *r1 = ov_rend[y]; 3789 rend_t *r1 = ov_rend[y];
3835 3790
3836 text_t *t2 = screen.text[y + row_offset] + ov_x; 3791 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3837 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3792 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3838 3793
3839 for (int x = ov_w; x--; ) 3794 for (int x = ov_w; x--; )
3840 { 3795 {
3841 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3796 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3842 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3797 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3844 } 3799 }
3845} 3800}
3846 3801
3847#endif 3802#endif
3848/* ------------------------------------------------------------------------- */ 3803/* ------------------------------------------------------------------------- */
3804

Diff Legend

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