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

Diff Legend

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