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.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

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

Diff Legend

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