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.177 by root, Tue Dec 20 21:49:55 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);
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);
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{
536 if (scrn == current_screen)
537 return;
538
543 want_refresh = 1; 539 want_refresh = 1;
544 view_start = 0; 540 view_start = 0;
545 541
546 if (current_screen == scrn)
547 return scrn;
548
549 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
550 543
551 SWAP_IT (scrn, current_screen, int); 544 int i = current_screen; current_screen = scrn; scrn = i;
552
553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
555 MAX_IT (screen.cur.row, 0);
556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
557 MAX_IT (screen.cur.col, 0);
558 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
559 545
560#if NSCREENS 546#if NSCREENS
561 if (options & Opt_secondaryScreen) 547 if (OPTION (Opt_secondaryScreen))
562 { 548 {
563 num_scr = 0; 549 num_scr = 0;
564 550
565 for (int i = nrow; i--; ) 551 scr_swap_screen ();
566 SWAP_IT (ROW(i), swap_save[i], line_t);
567 552
568 SWAP_IT (screen.charset, swap.charset, int16_t); 553 ::swap (screen.charset, swap.charset);
569 SWAP_IT (screen.flags, swap.flags, int); 554 ::swap (screen.flags, swap.flags);
570 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
571 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
572 } 557 }
573 else 558 else
574#endif 559#endif
575 if (options & Opt_secondaryScroll) 560 if (OPTION (Opt_secondaryScroll))
576 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
577
578 return scrn;
579} 562}
580 563
581// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
582void 565void
583rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
584{ 567{
585 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
586 return; 569 return;
587 570
588 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
598/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
599/* 582/*
600 * Change the colour for following text 583 * Change the colour for following text
601 */ 584 */
602void 585void
603rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
604{ 587{
605 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
606 color = fgbg; 589 color = fgbg;
607 590
608 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
609 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
610 else 593 else
… …
614/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
615/* 598/*
616 * Change the rendition style for following text 599 * Change the rendition style for following text
617 */ 600 */
618void 601void
619rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
620 { 603 {
621 if (set) 604 if (set)
622 rstyle |= style; 605 rstyle |= style;
623 else if (style == ~RS_None) 606 else if (style == ~RS_None)
624 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
631 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
632 * count positive ==> scroll up 615 * count positive ==> scroll up
633 * count negative ==> scroll down 616 * count negative ==> scroll down
634 */ 617 */
635int 618int
636rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
637{ 620{
638 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
639 return 0; 622 return 0;
640 623
641 want_refresh = 1; 624 want_refresh = 1;
642 num_scr += count; 625 num_scr += count;
643 626
644 if (count > 0 627 if (count > 0
645 && row1 == 0 628 && row1 == 0
646 && row2 == nrow - 1
647 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
648 { 630 {
649 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
650 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
651 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
652 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
653 { 661 {
654 selection.beg.row -= count; 662 selection.beg.row -= count;
655 selection.end.row -= count; 663 selection.end.row -= count;
656 selection.mark.row -= count; 664 selection.mark.row -= count;
657 665
658 selection_check (0); 666 if (selection.beg.row < top_row
659 } 667 || selection.end.row < top_row
660 668 || selection.mark.row < top_row)
661 for (int i = count; i--; )
662 scr_blank_screen_mem (ROW(row2 - i), rstyle);
663
664 if ((options & Opt_scrollWithBuffer)
665 && view_start != 0
666 && view_start != saveLines)
667 scr_page (UP, count);
668 }
669 else
670 {
671 if (selection.op && current_screen == selection.screen)
672 {
673 int i = selection.beg.row;
674 int j = selection.end.row;
675
676 if ((i < row1 && j > row1)
677 || (i < row2 && j > row2)
678 || (i - count < row1 && i >= row1)
679 || (i - count > row2 && i <= row2)
680 || (j - count < row1 && j >= row1)
681 || (j - count > row2 && j <= row2))
682 { 669 {
683 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
684 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
685 } 672 }
686 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)
687 { 699 {
688 /* move selected region too */ 700 /* move selected region too */
689 selection.beg.row -= count; 701 selection.beg.row -= count;
690 selection.end.row -= count; 702 selection.end.row -= count;
691 selection.mark.row -= count; 703 selection.mark.row -= count;
… …
697 // use a simple and robust scrolling algorithm, this 709 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical. 710 // part of scr_scroll_text is not time-critical.
699 711
700 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
701 713
714 min_it (count, rows);
715
716 line_t *temp_buf = row_buf + total_rows;
717
702 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
703 { 719 {
704 buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
705 721
706 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
707 scr_blank_screen_mem (buf [row], rstyle); 723 scr_blank_screen_mem (temp_buf [row], rstyle);
708 } 724 }
709 725
710 for (int row = 0; row < rows; row++) 726 for (int row = 0; row < rows; row++)
711 ROW(row1 + row) = buf [row]; 727 ROW(row1 + row) = temp_buf [row];
712 } 728 }
713 729
714 return count; 730 return count;
715} 731}
716 732
717/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
718/* 734/*
719 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
720 */ 736 */
721void 737void
722rxvt_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
723{ 739{
724 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
725 return; 741 return;
726 742
727 unsigned char checksel; 743 unsigned char checksel;
728 unicode_t c; 744 unicode_t c;
729 int row, last_col; 745 int ncol = this->ncol;
730 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
731 747
732 want_refresh = 1; 748 want_refresh = 1;
733 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
734 last_col = ncol;
735 750
736 if (nlines > 0) 751 if (minlines > 0)
737 { 752 {
738 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754 min_it (minlines, screen.cur.row - top_row);
755
739 if ((nlines > 0) 756 if (minlines > 0
740 && (screen.tscroll == 0) 757 && screen.tscroll == 0
741 && (screen.bscroll == (nrow - 1))) 758 && screen.bscroll == nrow - 1)
742 { 759 {
743 /* _at least_ this many lines need to be scrolled */ 760 /* _at least_ this many lines need to be scrolled */
744 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 761 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
745 screen.cur.row -= nlines; 762 screen.cur.row -= minlines;
746 } 763 }
747 } 764 }
748 765
749#ifdef DEBUG_STRICT 766#ifdef DEBUG_STRICT
750 assert (screen.cur.col < last_col); 767 assert (screen.cur.col < ncol);
751 assert ((screen.cur.row < nrow) 768 assert (screen.cur.row < nrow
752 && (screen.cur.row >= - (int32_t)nsaved)); 769 && screen.cur.row >= top_row);
753#else /* drive with your eyes closed */
754 MIN_IT (screen.cur.col, last_col - 1);
755 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
756 MAX_IT (screen.cur.row, - (int32_t)nsaved);
757#endif 770#endif
758 row = screen.cur.row; 771 int row = screen.cur.row;
759 772
760 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 773 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
761 774
762 line_t *line = &ROW(row); 775 line_t *line = &ROW(row);
763 776
764 while (str < strend) 777 while (str < strend)
765 { 778 {
766 c = *str++; 779 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
767 780
768 if (c < 0x20) 781 if (c < 0x20)
769 if (c == C0_LF) 782 if (c == C0_LF)
770 { 783 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 MAX_IT (line->l, screen.cur.col); 784 max_it (line->l, screen.cur.col);
773 785
774 screen.flags &= ~Screen_WrapNext; 786 screen.flags &= ~Screen_WrapNext;
775 787
776 if (screen.cur.row == screen.bscroll) 788 if (screen.cur.row == screen.bscroll)
777 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 789 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
781 line = &ROW(row); /* _must_ refresh */ 793 line = &ROW(row); /* _must_ refresh */
782 continue; 794 continue;
783 } 795 }
784 else if (c == C0_CR) 796 else if (c == C0_CR)
785 { 797 {
786 if (!line->is_longer ()) /* XXX: think about this */
787 MAX_IT (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
788 799
789 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
790 screen.cur.col = 0; 801 screen.cur.col = 0;
791 continue; 802 continue;
792 } 803 }
… …
809 CLEAR_SELECTION (); 820 CLEAR_SELECTION ();
810 } 821 }
811 822
812 if (screen.flags & Screen_WrapNext) 823 if (screen.flags & Screen_WrapNext)
813 { 824 {
814 line->set_is_longer ();
815
816 scr_do_wrap (); 825 scr_do_wrap ();
817 826
827 line->l = ncol;
828 line->is_longer (1);
829
818 row = screen.cur.row; 830 row = screen.cur.row;
819 line = &ROW(row); /* _must_ refresh */ 831 line = &ROW(row); /* _must_ refresh */
820 } 832 }
821 833
822 // some utf-8 decoders "decode" surrogate characters: let's fix this. 834 // some utf-8 decoders "decode" surrogate characters: let's fix this.
823 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 835 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
824 c = 0xfffd; 836 c = 0xfffd;
825 837
826 // 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
827 // do wcwidth before further replacements, as wcwidth might return -1 839 // further replacements, as wcwidth might return -1 for the line
828 // 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
829 // locale. 841 // locale.
830 int width = c < 0x100 ? 1 : wcwidth (c); 842 int width = WCWIDTH (c);
831 843
832 if (charsets[screen.charset] == '0') // DEC SPECIAL 844 if (charsets [screen.charset] == '0') // DEC SPECIAL
833 { 845 {
834 // vt100 special graphics and line drawing 846 // vt100 special graphics and line drawing
835 // 5f-7e standard vt100 847 // 5f-7e standard vt100
836 // 40-5e rxvt extension for extra curses acs chars 848 // 40-5e rxvt extension for extra curses acs chars
837 static uint16_t vt100_0[62] = { // 41 .. 7e 849 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
889 } 901 }
890 902
891 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
892 904
893 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
894 if (screen.cur.col > last_col - width && last_col >= width) 906 if (screen.cur.col > ncol - width && ncol >= width)
895 { 907 {
896 // ...output spaces 908 // ...output spaces
897 c = ' '; 909 c = ' ';
898 // and try the same character next loop iteration 910 // and try the same character next loop iteration
899 --str; 911 --str;
900 } 912 }
901 913
914 line->touch ();
915
902 do 916 do
903 { 917 {
904 line->t[screen.cur.col] = c; 918 line->t[screen.cur.col] = c;
905 line->r[screen.cur.col] = rend; 919 line->r[screen.cur.col] = rend;
906 920
907 if (screen.cur.col < last_col - 1) 921 if (screen.cur.col < ncol - 1)
908 screen.cur.col++; 922 screen.cur.col++;
909 else 923 else
910 { 924 {
911 line->l = last_col; 925 line->l = ncol;
912 if (screen.flags & Screen_Autowrap) 926 if (screen.flags & Screen_Autowrap)
913 screen.flags |= Screen_WrapNext; 927 screen.flags |= Screen_WrapNext;
914 break; 928 break;
915 } 929 }
916 930
… …
918 } 932 }
919 while (--width > 0); 933 while (--width > 0);
920 934
921 // pad with spaces when overwriting wide character with smaller one 935 // pad with spaces when overwriting wide character with smaller one
922 if (!width) 936 if (!width)
937 {
938 line->touch ();
939
923 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++)
924 { 941 {
925 line->t[c] = ' '; 942 line->t[c] = ' ';
926 line->r[c] = rend; 943 line->r[c] = rend;
927 } 944 }
945 }
928 } 946 }
929 else // width == 0 947 else // width == 0
930 { 948 {
931#if ENABLE_COMBINING 949#if ENABLE_COMBINING
932 // handle combining characters 950 // handle combining characters
933 // we just tag the accent on the previous on-screen character. 951 // we just tag the accent on the previous on-screen character.
934 // this is arguably not correct, but also arguably not wrong. 952 // this is arguably not correct, but also arguably not wrong.
935 // we don't handle double-width characters nicely yet. 953 // we don't handle double-width characters nicely yet.
954 line_t *linep;
936 text_t *tp; 955 text_t *tp;
937 rend_t *rp; 956 rend_t *rp;
938 957
939 if (screen.cur.col > 0) 958 if (screen.cur.col > 0)
940 { 959 {
960 linep = line;
941 tp = line->t + screen.cur.col - 1; 961 tp = line->t + screen.cur.col - 1;
942 rp = line->r + screen.cur.col - 1; 962 rp = line->r + screen.cur.col - 1;
943
944 while (*tp == NOCHAR && tp > line->t)
945 tp--, rp--;
946 } 963 }
947 else if (screen.cur.row > 0 964 else if (screen.cur.row > 0
948 && ROW(screen.cur.row - 1).is_longer ()) 965 && ROW(screen.cur.row - 1).is_longer ())
949 { 966 {
950 line_t *line = &ROW(screen.cur.row - 1); 967 linep = &ROW(screen.cur.row - 1);
951
952 tp = line->t + last_col - 1; 968 tp = line->t + ncol - 1;
953 rp = line->r + last_col - 1; 969 rp = line->r + ncol - 1;
954
955 while (*tp == NOCHAR && tp > line->t)
956 tp--, rp--;
957 } 970 }
958 else 971 else
959 continue; 972 continue;
973
974 linep->touch ();
975
976 while (*tp == NOCHAR && tp > linep->t)
977 tp--, rp--;
960 978
961 // first try to find a precomposed character 979 // first try to find a precomposed character
962 unicode_t n = rxvt_compose (*tp, c); 980 unicode_t n = rxvt_compose (*tp, c);
963 if (n == NOCHAR) 981 if (n == NOCHAR)
964 n = rxvt_composite.compose (*tp, c); 982 n = rxvt_composite.compose (*tp, c);
… …
967 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 985 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
968#endif 986#endif
969 } 987 }
970 } 988 }
971 989
972 if (!line->is_longer ()) /* XXX: think about this */
973 MAX_IT (line->l, screen.cur.col); 990 max_it (line->l, screen.cur.col);
974 991
975#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
976 assert (screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
977#else /* drive with your eyes closed */
978 MAX_IT (screen.cur.row, 0);
979#endif 994#endif
980} 995}
981 996
982/* ------------------------------------------------------------------------- */ 997/* ------------------------------------------------------------------------- */
983/* 998/*
984 * 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
985 * XTERM_SEQ: CTRL-H 1000 * XTERM_SEQ: CTRL-H
986 */ 1001 */
987void 1002void
988rxvt_term::scr_backspace () 1003rxvt_term::scr_backspace () NOTHROW
989{ 1004{
990 want_refresh = 1; 1005 want_refresh = 1;
991 1006
992 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
993 { 1008 {
… …
1011 * Process Horizontal Tab 1026 * Process Horizontal Tab
1012 * count: +ve = forward; -ve = backwards 1027 * count: +ve = forward; -ve = backwards
1013 * XTERM_SEQ: CTRL-I 1028 * XTERM_SEQ: CTRL-I
1014 */ 1029 */
1015void 1030void
1016rxvt_term::scr_tab (int count, bool ht) 1031rxvt_term::scr_tab (int count, bool ht) NOTHROW
1017{ 1032{
1018 int i, x; 1033 int i, x;
1019 1034
1020 want_refresh = 1; 1035 want_refresh = 1;
1021 i = x = screen.cur.col; 1036 i = x = screen.cur.col;
1022 1037
1023 if (count == 0) 1038 if (count == 0)
1024 return; 1039 return;
1025 else if (count > 0) 1040 else if (count > 0)
1026 { 1041 {
1027 int row = screen.cur.row;
1028
1029 line_t &l = ROW(row); 1042 line_t &l = ROW(screen.cur.row);
1030 rend_t base_rend = l.r[i]; 1043 rend_t base_rend = l.r[i];
1031 ht &= l.t[i] == ' '; 1044 ht &= l.t[i] == ' ';
1032 1045
1033 for (; ++i < ncol; ) 1046 for (; ++i < ncol; )
1034 if (tabs[i]) 1047 if (tabs[i])
1035 { 1048 {
1036 x = i; 1049 x = i;
1050
1037 if (!--count) 1051 if (!--count)
1038 break; 1052 break;
1039 } 1053 }
1040 else 1054 else
1041 ht &= l.t[i] == ' ' 1055 ht &= l.t[i] == ' '
… …
1044 if (count) 1058 if (count)
1045 x = ncol - 1; 1059 x = ncol - 1;
1046 1060
1047 // store horizontal tab commands as characters inside the text 1061 // store horizontal tab commands as characters inside the text
1048 // buffer so they can be selected and pasted. 1062 // buffer so they can be selected and pasted.
1049 if (ht && options & Opt_pastableTabs) 1063 if (ht && OPTION (Opt_pastableTabs))
1050 { 1064 {
1051 base_rend = SET_FONT (base_rend, 0); 1065 base_rend = SET_FONT (base_rend, 0);
1052 1066
1053 if (!l.is_longer ()) /* XXX: think about this */ 1067 l.touch (x);
1054 MAX_IT (l.l, x);
1055 1068
1056 i = screen.cur.col; 1069 i = screen.cur.col;
1057 1070
1058 l.t[i] = '\t'; 1071 l.t[i] = '\t';
1059 l.r[i] = base_rend; 1072 l.r[i] = base_rend;
… …
1090 * 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
1091 * in that row right. Clear left column. 1104 * in that row right. Clear left column.
1092 */ 1105 */
1093#if ENABLE_FRILLS 1106#if ENABLE_FRILLS
1094void 1107void
1095rxvt_term::scr_backindex () 1108rxvt_term::scr_backindex () NOTHROW
1096{ 1109{
1097 if (screen.cur.col > 0) 1110 if (screen.cur.col > 0)
1098 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1099 else 1112 else
1100 scr_insdel_chars (1, INSERT); 1113 scr_insdel_chars (1, INSERT);
… …
1107 * 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
1108 * in that row left. Clear right column. 1121 * in that row left. Clear right column.
1109 */ 1122 */
1110#if ENABLE_FRILLS 1123#if ENABLE_FRILLS
1111void 1124void
1112rxvt_term::scr_forwardindex () 1125rxvt_term::scr_forwardindex () NOTHROW
1113{ 1126{
1114 int row;
1115
1116 if (screen.cur.col < ncol - 1) 1127 if (screen.cur.col < ncol - 1)
1117 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1118 else 1129 else
1119 { 1130 {
1120 row = screen.cur.row; 1131 line_t &l = ROW(screen.cur.row);
1121 1132
1122 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1133 l.touch ();
1123 ROW(row).l = ncol; 1134 l.is_longer (0);
1124 1135
1125 scr_gotorc (0, 0, R_RELATIVE); 1136 scr_gotorc (0, 0, R_RELATIVE);
1126 scr_insdel_chars (1, DELETE); 1137 scr_insdel_chars (1, DELETE);
1127 scr_gotorc (0, ncol - 1, R_RELATIVE); 1138 scr_gotorc (0, ncol - 1, R_RELATIVE);
1128 } 1139 }
… …
1132/* ------------------------------------------------------------------------- */ 1143/* ------------------------------------------------------------------------- */
1133/* 1144/*
1134 * Goto Row/Column 1145 * Goto Row/Column
1135 */ 1146 */
1136void 1147void
1137rxvt_term::scr_gotorc (int row, int col, int relative) 1148rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1138{ 1149{
1139 want_refresh = 1; 1150 want_refresh = 1;
1140 ZERO_SCROLLBACK (); 1151 ZERO_SCROLLBACK ();
1141 1152
1142 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1153 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1143 MAX_IT (screen.cur.col, 0); 1154 clamp_it (screen.cur.col, 0, ncol - 1);
1144 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1145 1155
1146 screen.flags &= ~Screen_WrapNext; 1156 screen.flags &= ~Screen_WrapNext;
1147 1157
1148 if (relative & R_RELATIVE) 1158 if (relative & R_RELATIVE)
1149 { 1159 {
… …
1167 else 1177 else
1168 { 1178 {
1169 if (screen.flags & Screen_Relative) 1179 if (screen.flags & Screen_Relative)
1170 { /* relative origin mode */ 1180 { /* relative origin mode */
1171 screen.cur.row = row + screen.tscroll; 1181 screen.cur.row = row + screen.tscroll;
1172 MIN_IT (screen.cur.row, screen.bscroll); 1182 min_it (screen.cur.row, screen.bscroll);
1173 } 1183 }
1174 else 1184 else
1175 screen.cur.row = row; 1185 screen.cur.row = row;
1176 } 1186 }
1177 1187
1178 MAX_IT (screen.cur.row, 0); 1188 clamp_it (screen.cur.row, 0, nrow - 1);
1179 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1180} 1189}
1181 1190
1182/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1183/* 1192/*
1184 * direction should be UP or DN 1193 * direction should be UP or DN
1185 */ 1194 */
1186void 1195void
1187rxvt_term::scr_index (enum page_dirn direction) 1196rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1188{ 1197{
1189 int dirn; 1198 int dirn;
1190 1199
1191 want_refresh = 1; 1200 want_refresh = 1;
1192 ZERO_SCROLLBACK (); 1201 ZERO_SCROLLBACK ();
… …
1199 || (screen.cur.row == screen.tscroll && direction == DN)) 1208 || (screen.cur.row == screen.tscroll && direction == DN))
1200 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1209 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1201 else 1210 else
1202 screen.cur.row += dirn; 1211 screen.cur.row += dirn;
1203 1212
1204 MAX_IT (screen.cur.row, 0); 1213 clamp_it (screen.cur.row, 0, nrow - 1);
1205 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1206 selection_check (0); 1214 selection_check (0);
1207} 1215}
1208 1216
1209/* ------------------------------------------------------------------------- */ 1217/* ------------------------------------------------------------------------- */
1210/* 1218/*
… …
1212 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1213 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1214 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1215 */ 1223 */
1216void 1224void
1217rxvt_term::scr_erase_line (int mode) 1225rxvt_term::scr_erase_line (int mode) NOTHROW
1218{ 1226{
1219 unsigned int row, col, num; 1227 unsigned int col, num;
1220 1228
1221 want_refresh = 1; 1229 want_refresh = 1;
1222 ZERO_SCROLLBACK (); 1230 ZERO_SCROLLBACK ();
1223 1231
1224 selection_check (1); 1232 selection_check (1);
1225 1233
1226 row = screen.cur.row; 1234 line_t &line = ROW(screen.cur.row);
1235
1236 line.touch ();
1237 line.is_longer (0);
1227 1238
1228 switch (mode) 1239 switch (mode)
1229 { 1240 {
1230 case 0: /* erase to end of line */ 1241 case 0: /* erase to end of line */
1231 col = screen.cur.col; 1242 col = screen.cur.col;
1232 num = ncol - col; 1243 num = ncol - col;
1233 MIN_IT (ROW(row).l, (int16_t)col); 1244 min_it (line.l, col);
1234 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1245 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1235 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1246 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1236 CLEAR_SELECTION (); 1247 CLEAR_SELECTION ();
1237 break; 1248 break;
1238 case 1: /* erase to beginning of line */ 1249 case 1: /* erase to beginning of line */
… …
1243 CLEAR_SELECTION (); 1254 CLEAR_SELECTION ();
1244 break; 1255 break;
1245 case 2: /* erase whole line */ 1256 case 2: /* erase whole line */
1246 col = 0; 1257 col = 0;
1247 num = ncol; 1258 num = ncol;
1248 ROW(row).l = 0; 1259 line.l = 0;
1249 if (selection.beg.row <= screen.cur.row 1260 if (selection.beg.row <= screen.cur.row
1250 && selection.end.row >= screen.cur.row) 1261 && selection.end.row >= screen.cur.row)
1251 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1252 break; 1263 break;
1253 default: 1264 default:
1254 return; 1265 return;
1255 } 1266 }
1256 1267
1257 scr_blank_line (ROW(row), col, num, rstyle); 1268 scr_blank_line (line, col, num, rstyle);
1258} 1269}
1259 1270
1260/* ------------------------------------------------------------------------- */ 1271/* ------------------------------------------------------------------------- */
1261/* 1272/*
1262 * Erase part of whole of the screen 1273 * Erase part of whole of the screen
1263 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1274 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1264 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1275 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1265 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1276 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1266 */ 1277 */
1267void 1278void
1268rxvt_term::scr_erase_screen (int mode) 1279rxvt_term::scr_erase_screen (int mode) NOTHROW
1269{ 1280{
1270 int num; 1281 int num;
1271 int32_t row; 1282 int32_t row;
1272 rend_t ren; 1283 rend_t ren;
1273 XGCValues gcvalue; 1284 XGCValues gcvalue;
… …
1305 CLEAR_SELECTION (); 1316 CLEAR_SELECTION ();
1306 1317
1307 if (row >= nrow) /* Out Of Bounds */ 1318 if (row >= nrow) /* Out Of Bounds */
1308 return; 1319 return;
1309 1320
1310 MIN_IT (num, (nrow - row)); 1321 min_it (num, nrow - row);
1311 1322
1312 if (rstyle & (RS_RVid | RS_Uline)) 1323 if (rstyle & (RS_RVid | RS_Uline))
1313 ren = (rend_t) ~RS_None; 1324 ren = (rend_t) ~RS_None;
1314 else if (GET_BASEBG (rstyle) == Color_bg) 1325 else if (GET_BASEBG (rstyle) == Color_bg)
1315 { 1326 {
… …
1317 CLEAR_ROWS (row, num); 1328 CLEAR_ROWS (row, num);
1318 } 1329 }
1319 else 1330 else
1320 { 1331 {
1321 ren = rstyle & (RS_fgMask | RS_bgMask); 1332 ren = rstyle & (RS_fgMask | RS_bgMask);
1322 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1323 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1324 ERASE_ROWS (row, num); 1335 ERASE_ROWS (row, num);
1325 gcvalue.foreground = pix_colors[Color_fg]; 1336 gcvalue.foreground = pix_colors[Color_fg];
1326 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1327 } 1338 }
1328 1339
1329 for (; num--; row++) 1340 for (; num--; row++)
1330 { 1341 {
1331 scr_blank_screen_mem (ROW (row), rstyle); 1342 scr_blank_screen_mem (ROW(row), rstyle);
1332 ROW (row).l = 0;
1333 scr_blank_line (drawn[row], 0, ncol, ren); 1343 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1334 } 1344 }
1335} 1345}
1336 1346
1337#if ENABLE_FRILLS 1347#if ENABLE_FRILLS
1338void 1348void
1339rxvt_term::scr_erase_savelines () 1349rxvt_term::scr_erase_savelines () NOTHROW
1340{ 1350{
1341 want_refresh = 1; 1351 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1352 ZERO_SCROLLBACK ();
1343 1353
1344 nsaved = 0; 1354 top_row = 0;
1345} 1355}
1346#endif 1356#endif
1347 1357
1348/* ------------------------------------------------------------------------- */ 1358/* ------------------------------------------------------------------------- */
1349/* 1359/*
1350 * Fill the screen with `E's 1360 * Fill the screen with `E's
1351 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1361 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1352 */ 1362 */
1353void 1363void
1354rxvt_term::scr_E () 1364rxvt_term::scr_E () NOTHROW
1355{ 1365{
1356 rend_t fs; 1366 rend_t fs;
1357 1367
1358 want_refresh = 1; 1368 want_refresh = 1;
1359 ZERO_SCROLLBACK (); 1369 ZERO_SCROLLBACK ();
… …
1370 rend_t *r1 = line.r; 1380 rend_t *r1 = line.r;
1371 1381
1372 for (int j = ncol; j--; ) 1382 for (int j = ncol; j--; )
1373 *r1++ = fs; 1383 *r1++ = fs;
1374 1384
1375 line.l = ncol; /* make the `E's selectable */ 1385 line.is_longer (0);
1386 line.touch (ncol);
1376 } 1387 }
1377} 1388}
1378 1389
1379/* ------------------------------------------------------------------------- */ 1390/* ------------------------------------------------------------------------- */
1380/* 1391/*
1381 * Insert/Delete <count> lines 1392 * Insert/Delete <count> lines
1382 */ 1393 */
1383void 1394void
1384rxvt_term::scr_insdel_lines (int count, int insdel) 1395rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1385{ 1396{
1386 int end; 1397 int end;
1387 1398
1388 ZERO_SCROLLBACK (); 1399 ZERO_SCROLLBACK ();
1389 1400
… …
1409/* ------------------------------------------------------------------------- */ 1420/* ------------------------------------------------------------------------- */
1410/* 1421/*
1411 * Insert/Delete <count> characters from the current position 1422 * Insert/Delete <count> characters from the current position
1412 */ 1423 */
1413void 1424void
1414rxvt_term::scr_insdel_chars (int count, int insdel) 1425rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1415{ 1426{
1416 int col, row; 1427 int col, row;
1417 rend_t tr; 1428 rend_t tr;
1418 1429
1419 want_refresh = 1; 1430 want_refresh = 1;
… …
1423 return; 1434 return;
1424 1435
1425 scr_do_wrap (); 1436 scr_do_wrap ();
1426 1437
1427 selection_check (1); 1438 selection_check (1);
1428 MIN_IT (count, (ncol - screen.cur.col)); 1439 min_it (count, ncol - screen.cur.col);
1429 1440
1430 row = screen.cur.row; 1441 row = screen.cur.row;
1431 1442
1432 line_t *line = &ROW(row); 1443 line_t *line = &ROW(row);
1444
1445 line->touch ();
1446 line->is_longer (0);
1433 1447
1434 switch (insdel) 1448 switch (insdel)
1435 { 1449 {
1436 case INSERT: 1450 case INSERT:
1437 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1451 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1438 { 1452 {
1439 line->t[col] = line->t[col - count]; 1453 line->t[col] = line->t[col - count];
1440 line->r[col] = line->r[col - count]; 1454 line->r[col] = line->r[col - count];
1441 } 1455 }
1442 1456
1443 if (!line->is_longer ()) 1457 line->l = min (line->l + count, ncol);
1444 {
1445 line->l += count;
1446 MIN_IT (line->l, ncol);
1447 }
1448 1458
1449 if (selection.op && current_screen == selection.screen 1459 if (selection.op && current_screen == selection.screen
1450 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1460 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1451 { 1461 {
1452 if (selection.end.row != screen.cur.row 1462 if (selection.end.row != screen.cur.row
… …
1465 1475
1466 case ERASE: 1476 case ERASE:
1467 screen.cur.col += count; /* don't worry if > ncol */ 1477 screen.cur.col += count; /* don't worry if > ncol */
1468 selection_check (1); 1478 selection_check (1);
1469 screen.cur.col -= count; 1479 screen.cur.col -= count;
1480
1481 line->l = max (line->l - count, 0);
1470 scr_blank_line (*line, screen.cur.col, count, rstyle); 1482 scr_blank_line (*line, screen.cur.col, count, rstyle);
1471 break; 1483 break;
1472 1484
1473 case DELETE: 1485 case DELETE:
1474 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1486 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1477 { 1489 {
1478 line->t[col] = line->t[col + count]; 1490 line->t[col] = line->t[col + count];
1479 line->r[col] = line->r[col + count]; 1491 line->r[col] = line->r[col + count];
1480 } 1492 }
1481 1493
1494 line->l = max (line->l - count, 0);
1482 scr_blank_line (*line, ncol - count, count, tr); 1495 scr_blank_line (*line, ncol - count, count, tr);
1483
1484 if (line->is_longer ()) /* break line continuation */
1485 line->l = ncol;
1486
1487 line->l = max (line->l - count, 0);
1488 1496
1489 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1490 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1491 { 1499 {
1492 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
… …
1510/* 1518/*
1511 * Set the scrolling region 1519 * Set the scrolling region
1512 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1520 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1513 */ 1521 */
1514void 1522void
1515rxvt_term::scr_scroll_region (int top, int bot) 1523rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1516{ 1524{
1517 MAX_IT (top, 0); 1525 max_it (top, 0);
1518 MIN_IT (bot, (int)nrow - 1); 1526 min_it (bot, nrow - 1);
1519 1527
1520 if (top > bot) 1528 if (top > bot)
1521 return; 1529 return;
1522 1530
1523 screen.tscroll = top; 1531 screen.tscroll = top;
… …
1530 * Make the cursor visible/invisible 1538 * Make the cursor visible/invisible
1531 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1539 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1532 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1540 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1533 */ 1541 */
1534void 1542void
1535rxvt_term::scr_cursor_visible (int mode) 1543rxvt_term::scr_cursor_visible (int mode) NOTHROW
1536{ 1544{
1537 want_refresh = 1; 1545 want_refresh = 1;
1538 1546
1539 if (mode) 1547 if (mode)
1540 screen.flags |= Screen_VisibleCursor; 1548 screen.flags |= Screen_VisibleCursor;
… …
1547 * Set/unset automatic wrapping 1555 * Set/unset automatic wrapping
1548 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1556 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1549 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1557 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1550 */ 1558 */
1551void 1559void
1552rxvt_term::scr_autowrap (int mode) 1560rxvt_term::scr_autowrap (int mode) NOTHROW
1553{ 1561{
1554 if (mode) 1562 if (mode)
1555 screen.flags |= Screen_Autowrap; 1563 screen.flags |= Screen_Autowrap;
1556 else 1564 else
1557 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1565 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1566 * and the cursor cannot be moved outside. 1574 * and the cursor cannot be moved outside.
1567 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1575 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1568 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1576 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1569 */ 1577 */
1570void 1578void
1571rxvt_term::scr_relative_origin (int mode) 1579rxvt_term::scr_relative_origin (int mode) NOTHROW
1572{ 1580{
1573 if (mode) 1581 if (mode)
1574 screen.flags |= Screen_Relative; 1582 screen.flags |= Screen_Relative;
1575 else 1583 else
1576 screen.flags &= ~Screen_Relative; 1584 screen.flags &= ~Screen_Relative;
… …
1583 * Set insert/replace mode 1591 * Set insert/replace mode
1584 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1592 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1585 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1593 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1586 */ 1594 */
1587void 1595void
1588rxvt_term::scr_insert_mode (int mode) 1596rxvt_term::scr_insert_mode (int mode) NOTHROW
1589{ 1597{
1590 if (mode) 1598 if (mode)
1591 screen.flags |= Screen_Insert; 1599 screen.flags |= Screen_Insert;
1592 else 1600 else
1593 screen.flags &= ~Screen_Insert; 1601 screen.flags &= ~Screen_Insert;
… …
1599 * XTERM_SEQ: Set tab at current column : ESC H 1607 * XTERM_SEQ: Set tab at current column : ESC H
1600 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1608 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1601 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1609 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1602 */ 1610 */
1603void 1611void
1604rxvt_term::scr_set_tab (int mode) 1612rxvt_term::scr_set_tab (int mode) NOTHROW
1605{ 1613{
1606 if (mode < 0) 1614 if (mode < 0)
1607 memset (tabs, 0, ncol * sizeof (char)); 1615 memset (tabs, 0, ncol * sizeof (char));
1608 else if (screen.cur.col < ncol) 1616 else if (screen.cur.col < ncol)
1609 tabs[screen.cur.col] = (mode ? 1 : 0); 1617 tabs [screen.cur.col] = !!mode;
1610} 1618}
1611 1619
1612/* ------------------------------------------------------------------------- */ 1620/* ------------------------------------------------------------------------- */
1613/* 1621/*
1614 * Set reverse/normal video 1622 * Set reverse/normal video
1615 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1623 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1616 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1624 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1617 */ 1625 */
1618void 1626void
1619rxvt_term::scr_rvideo_mode (int mode) 1627rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1620{ 1628{
1621 XGCValues gcvalue; 1629 rvideo_mode = on;
1622 1630
1631#ifndef NO_BELL
1632 on ^= rvideo_bell;
1633#endif
1634
1623 if (rvideo != mode) 1635 if (rvideo_state != on)
1624 { 1636 {
1625 rvideo = mode; 1637 rvideo_state = on;
1638
1626 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1627#if XPM_BACKGROUND 1640#if XPM_BACKGROUND
1628 if (bgPixmap.pixmap == None) 1641 if (bgPixmap.pixmap == None)
1629#endif 1642#endif
1630#if TRANSPARENT 1643#if TRANSPARENT
1631 if (! (options & Opt_transparent) || am_transparent == 0) 1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1632#endif 1645#endif
1633 XSetWindowBackground (display->display, vt, 1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1634 pix_colors[Color_bg]);
1635 1647
1648 XGCValues gcvalue;
1636 gcvalue.foreground = pix_colors[Color_fg]; 1649 gcvalue.foreground = pix_colors[Color_fg];
1637 gcvalue.background = pix_colors[Color_bg]; 1650 gcvalue.background = pix_colors[Color_bg];
1638 XChangeGC (display->display, gc, GCBackground | GCForeground, 1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1639 &gcvalue); 1652
1640 scr_clear (); 1653 scr_clear ();
1641 scr_touch (true); 1654 scr_touch (true);
1642 } 1655 }
1643} 1656}
1644 1657
… …
1646/* 1659/*
1647 * Report current cursor position 1660 * Report current cursor position
1648 * XTERM_SEQ: Report position: ESC [ 6 n 1661 * XTERM_SEQ: Report position: ESC [ 6 n
1649 */ 1662 */
1650void 1663void
1651rxvt_term::scr_report_position () 1664rxvt_term::scr_report_position () NOTHROW
1652{ 1665{
1653 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);
1654} 1667}
1655 1668
1656/* ------------------------------------------------------------------------- * 1669/* ------------------------------------------------------------------------- *
… …
1659 1672
1660/* 1673/*
1661 * Set font style 1674 * Set font style
1662 */ 1675 */
1663void 1676void
1664rxvt_term::set_font_style () 1677rxvt_term::set_font_style () NOTHROW
1665{ 1678{
1679#if 0
1666 switch (charsets[screen.charset]) 1680 switch (charsets [screen.charset])
1667 { 1681 {
1668 case '0': /* DEC Special Character & Line Drawing Set */ 1682 case '0': /* DEC Special Character & Line Drawing Set */
1669 break; 1683 break;
1670 case 'A': /* United Kingdom (UK) */ 1684 case 'A': /* United Kingdom (UK) */
1671 break; 1685 break;
… …
1678 case 'C': /* Finnish character set */ 1692 case 'C': /* Finnish character set */
1679 break; 1693 break;
1680 case 'K': /* German character set */ 1694 case 'K': /* German character set */
1681 break; 1695 break;
1682 } 1696 }
1697#endif
1683} 1698}
1684 1699
1685/* ------------------------------------------------------------------------- */ 1700/* ------------------------------------------------------------------------- */
1686/* 1701/*
1687 * Choose a font 1702 * Choose a font
… …
1689 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1704 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1690 * XTERM_SEQ: Invoke G2 character set: ESC N 1705 * XTERM_SEQ: Invoke G2 character set: ESC N
1691 * XTERM_SEQ: Invoke G3 character set: ESC O 1706 * XTERM_SEQ: Invoke G3 character set: ESC O
1692 */ 1707 */
1693void 1708void
1694rxvt_term::scr_charset_choose (int set) 1709rxvt_term::scr_charset_choose (int set) NOTHROW
1695{ 1710{
1696 screen.charset = set; 1711 screen.charset = set;
1697 set_font_style (); 1712 set_font_style ();
1698} 1713}
1699 1714
… …
1705 * XTERM_SEQ: Set G2 character set: ESC * <C> 1720 * XTERM_SEQ: Set G2 character set: ESC * <C>
1706 * XTERM_SEQ: Set G3 character set: ESC + <C> 1721 * XTERM_SEQ: Set G3 character set: ESC + <C>
1707 * See set_font_style for possible values for <C> 1722 * See set_font_style for possible values for <C>
1708 */ 1723 */
1709void 1724void
1710rxvt_term::scr_charset_set (int set, unsigned int ch) 1725rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1711{ 1726{
1712 charsets[set] = (unsigned char)ch; 1727 charsets[set] = (unsigned char)ch;
1713 set_font_style (); 1728 set_font_style ();
1714} 1729}
1715 1730
… …
1720 1735
1721/* 1736/*
1722 * refresh matching text. 1737 * refresh matching text.
1723 */ 1738 */
1724bool 1739bool
1725rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1740rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1726{ 1741{
1727 bool found = false; 1742 bool found = false;
1728 1743
1729 for (int i = 0; i < nrow; i++) 1744 for (int i = 0; i < nrow; i++)
1730 { 1745 {
1731 int col = 0; 1746 int col = 0;
1732 rend_t *drp = drawn[i].r; 1747 rend_t *drp = drawn_buf[i].r;
1733 1748
1734 for (; col < ncol; col++, drp++) 1749 for (; col < ncol; col++, drp++)
1735 if ((*drp & mask) == value) 1750 if ((*drp & mask) == value)
1736 { 1751 {
1737 found = true; 1752 found = true;
… …
1750 PART_END, 1765 PART_END,
1751 RC_COUNT 1766 RC_COUNT
1752}; 1767};
1753 1768
1754void 1769void
1755rxvt_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
1756{ 1771{
1757 int i; 1772 int i;
1758 row_col_t rc[RC_COUNT]; 1773 row_col_t rc[RC_COUNT];
1759 1774
1760 if (!drawn) /* sanity check */ 1775 if (!drawn_buf) /* sanity check */
1761 return; 1776 return;
1762 1777
1763#ifndef NO_SLOW_LINK_SUPPORT 1778#ifndef NO_SLOW_LINK_SUPPORT
1764 if (refresh_type == FAST_REFRESH && !display->is_local) 1779 if (refresh_type == FAST_REFRESH && !display->is_local)
1765 { 1780 {
1766 y = 0; 1781 y = 0;
1767 eheight = height; 1782 eheight = height;
1768 } 1783 }
1769#endif
1770
1771#ifdef DEBUG_STRICT
1772 x = max (x, 0);
1773 x = min (x, (int)width);
1774 y = max (y, 0);
1775 y = min (y, (int)height);
1776#endif 1784#endif
1777 1785
1778 /* round down */ 1786 /* round down */
1779 rc[PART_BEG].col = Pixel2Col (x); 1787 rc[PART_BEG].col = Pixel2Col (x);
1780 rc[PART_BEG].row = Pixel2Row (y); 1788 rc[PART_BEG].row = Pixel2Row (y);
… …
1783 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1791 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1784 1792
1785 /* sanity checks */ 1793 /* sanity checks */
1786 for (i = PART_BEG; i < RC_COUNT; i++) 1794 for (i = PART_BEG; i < RC_COUNT; i++)
1787 { 1795 {
1788 MIN_IT (rc[i].col, ncol - 1); 1796 min_it (rc[i].col, ncol - 1);
1789 MIN_IT (rc[i].row, nrow - 1); 1797 min_it (rc[i].row, nrow - 1);
1790 } 1798 }
1791 1799
1792 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++)
1793 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;
1794 1804
1795 if (refresh) 1805 if (refresh)
1796 scr_refresh (SLOW_REFRESH); 1806 scr_refresh ();
1797} 1807}
1798 1808
1799/* ------------------------------------------------------------------------- */ 1809/* ------------------------------------------------------------------------- */
1800/* 1810/*
1801 * Refresh the entire screen 1811 * Refresh the entire screen
1802 */ 1812 */
1803void 1813void
1804rxvt_term::scr_touch (bool refresh) 1814rxvt_term::scr_touch (bool refresh) NOTHROW
1805{ 1815{
1806 scr_expose (0, 0, width, height, refresh); 1816 scr_expose (0, 0, width, height, refresh);
1807} 1817}
1808 1818
1809/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1810/* 1820/*
1811 * 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
1812 * the top of the screen 1822 * the top of the screen
1813 */ 1823 */
1814int 1824void
1815rxvt_term::scr_move_to (int y, int len) 1825rxvt_term::scr_move_to (int y, int len) NOTHROW
1816{ 1826{
1817 long p = 0; 1827 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1818 unsigned int oldviewstart;
1819
1820 oldviewstart = view_start;
1821
1822 if (y < len)
1823 {
1824 p = (nrow + nsaved) * (len - y) / len;
1825 p -= (long) (nrow - 1);
1826 p = max (p, 0);
1827 }
1828
1829 view_start = (unsigned int)min (p, nsaved);
1830
1831 return scr_changeview (oldviewstart);
1832} 1828}
1833 1829
1834/* ------------------------------------------------------------------------- */ 1830/* ------------------------------------------------------------------------- */
1835/* 1831/*
1836 * Page the screen up/down nlines 1832 * Page the screen up/down nlines
1837 * direction should be UP or DN 1833 * direction should be UP or DN
1838 */ 1834 */
1839int 1835bool
1840rxvt_term::scr_page (enum page_dirn direction, int nlines) 1836rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1841{ 1837{
1842 int n; 1838 int new_view_start =
1843 unsigned int oldviewstart;
1844
1845 oldviewstart = view_start;
1846
1847 if (direction == UP)
1848 {
1849 n = view_start + nlines;
1850 view_start = min (n, nsaved);
1851 }
1852 else
1853 {
1854 n = view_start - nlines; 1839 direction == UP ? view_start - nlines
1855 view_start = max (n, 0); 1840 : view_start + nlines;
1856 }
1857 1841
1858 return scr_changeview (oldviewstart); 1842 return scr_changeview (new_view_start);
1859} 1843}
1860 1844
1861int 1845bool
1862rxvt_term::scr_changeview (unsigned int oldviewstart) 1846rxvt_term::scr_changeview (int new_view_start) NOTHROW
1863{ 1847{
1848 clamp_it (new_view_start, top_row, 0);
1849
1864 if (view_start != oldviewstart) 1850 if (new_view_start == view_start)
1865 { 1851 return false;
1852
1853 num_scr += new_view_start - view_start;
1854 view_start = new_view_start;
1866 want_refresh = 1; 1855 want_refresh = 1;
1867 num_scr -= (view_start - oldviewstart);
1868 }
1869 1856
1870 return (int) (view_start - oldviewstart); 1857 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1871}
1872 1858
1873/* ------------------------------------------------------------------------- */ 1859 return true;
1860}
1861
1862#ifndef NO_BELL
1874void 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
1875rxvt_term::scr_bell () 1873rxvt_term::scr_bell () NOTHROW
1876{ 1874{
1877#ifndef NO_BELL 1875#ifndef NO_BELL
1878 1876
1879# ifndef NO_MAPALERT 1877# ifndef NO_MAPALERT
1880# ifdef MAPALERT_OPTION 1878# ifdef MAPALERT_OPTION
1881 if (options & Opt_mapAlert) 1879 if (OPTION (Opt_mapAlert))
1882# endif 1880# endif
1883 XMapWindow (display->display, parent[0]); 1881 XMapWindow (xdisp, parent[0]);
1884# endif 1882# endif
1885 1883
1886 if (options & Opt_visualBell) 1884 if (OPTION (Opt_visualBell))
1887 { 1885 {
1888 scr_rvideo_mode (!rvideo); /* refresh also done */ 1886 rvideo_bell = true;
1889 rxvt_usleep (VISUAL_BELL_DURATION); 1887 scr_rvideo_mode (rvideo_mode);
1890 scr_rvideo_mode (!rvideo); /* refresh also done */ 1888 display->flush ();
1889
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1891 } 1891 }
1892 else 1892 else
1893 XBell (display->display, 0); 1893 XBell (xdisp, 0);
1894 1894
1895#endif 1895#endif
1896} 1896}
1897 1897
1898/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1899/* ARGSUSED */ 1899/* ARGSUSED */
1900void 1900void
1901rxvt_term::scr_printscreen (int fullhist) 1901rxvt_term::scr_printscreen (int fullhist) NOTHROW
1902{ 1902{
1903#ifdef PRINTPIPE 1903#ifdef PRINTPIPE
1904 int nrows, row_start; 1904 int nrows, row_start;
1905 FILE *fd; 1905 FILE *fd;
1906 1906
1907 if ((fd = popen_printer ()) == NULL) 1907 if ((fd = popen_printer ()) == NULL)
1908 return; 1908 return;
1909 1909
1910 if (fullhist) 1910 if (fullhist)
1911 { 1911 {
1912 nrows = nrow + nsaved; 1912 nrows = nrow - top_row;
1913 row_start = -nsaved; 1913 row_start = top_row;
1914 } 1914 }
1915 else 1915 else
1916 { 1916 {
1917 nrows = nrow; 1917 nrows = nrow;
1918 row_start = -view_start; 1918 row_start = view_start;
1919 } 1919 }
1920 1920
1921 wctomb (0, 0); 1921 wctomb (0, 0);
1922 1922
1923 for (int r1 = 0; r1 < nrows; r1++) 1923 for (int r1 = 0; r1 < nrows; r1++)
… …
1955 * Refresh the screen 1955 * Refresh the screen
1956 * drawn_text/drawn_rend contain the screen information before the update. 1956 * drawn_text/drawn_rend contain the screen information before the update.
1957 * screen.text/screen.rend contain what the screen will change to. 1957 * screen.text/screen.rend contain what the screen will change to.
1958 */ 1958 */
1959void 1959void
1960rxvt_term::scr_refresh (unsigned char refresh_type) 1960rxvt_term::scr_refresh () NOTHROW
1961{ 1961{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1962 unsigned char must_clear, /* use draw_string not draw_image_string */
1963 showcursor; /* show the cursor */ 1963 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1964 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1965 ocrow; /* old cursor row */
1966 int i, /* tmp */ 1966 int i; /* tmp */
1967 row_offset; /* basic offset in screen structure */
1968#ifndef NO_CURSORCOLOR 1967#ifndef NO_CURSORCOLOR
1969 rend_t cc1; /* store colours at cursor position (s) */ 1968 rend_t cc1; /* store colours at cursor position (s) */
1970#endif 1969#endif
1971 rend_t *crp; // cursor rendition pointer 1970 rend_t *crp; // cursor rendition pointer
1972 1971
… …
1979 * A: set up vars 1978 * A: set up vars
1980 */ 1979 */
1981 must_clear = 0; 1980 must_clear = 0;
1982 refresh_count = 0; 1981 refresh_count = 0;
1983 1982
1984 row_offset = term_start - view_start;
1985
1986#if XPM_BACKGROUND 1983#if XPM_BACKGROUND
1987 must_clear |= bgPixmap.pixmap != None; 1984 must_clear |= bgPixmap.pixmap != None;
1988#endif 1985#endif
1989#if TRANSPARENT 1986#if TRANSPARENT
1990 must_clear |= (options & Opt_transparent) && am_transparent; 1987 must_clear |= OPTION (Opt_transparent) && am_transparent;
1991#endif 1988#endif
1992 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1993 1990
1994 /* 1991 /*
1995 * B: reverse any characters which are selected 1992 * B: reverse any characters which are selected
… …
2019 2016
2020 crp = &ROW(screen.cur.row).r[col]; 2017 crp = &ROW(screen.cur.row).r[col];
2021 2018
2022 if (showcursor && focus) 2019 if (showcursor && focus)
2023 { 2020 {
2024 if (options & Opt_cursorUnderline) 2021 if (OPTION (Opt_cursorUnderline))
2025 *crp ^= RS_Uline; 2022 *crp ^= RS_Uline;
2026 else 2023 else
2027 { 2024 {
2028 *crp ^= RS_RVid; 2025 *crp ^= RS_RVid;
2029 2026
… …
2031 cc1 = *crp & (RS_fgMask | RS_bgMask); 2028 cc1 = *crp & (RS_fgMask | RS_bgMask);
2032 if (ISSET_PIXCOLOR (Color_cursor)) 2029 if (ISSET_PIXCOLOR (Color_cursor))
2033 ccol1 = Color_cursor; 2030 ccol1 = Color_cursor;
2034 else 2031 else
2035#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2032#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2036 ccol1 = GET_FGCOLOR (rstyle); 2033 ccol1 = fgcolor_of (rstyle);
2037#else 2034#else
2038 ccol1 = Color_fg; 2035 ccol1 = Color_fg;
2039#endif 2036#endif
2040 if (ISSET_PIXCOLOR (Color_cursor2)) 2037 if (ISSET_PIXCOLOR (Color_cursor2))
2041 ccol2 = Color_cursor2; 2038 ccol2 = Color_cursor2;
2042 else 2039 else
2043#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2044 ccol2 = GET_BGCOLOR (rstyle); 2041 ccol2 = bgcolor_of (rstyle);
2045#else 2042#else
2046 ccol2 = Color_bg; 2043 ccol2 = Color_bg;
2047#endif 2044#endif
2048 *crp = SET_FGCOLOR (*crp, ccol1); 2045 *crp = SET_FGCOLOR (*crp, ccol1);
2049 *crp = SET_BGCOLOR (*crp, ccol2); 2046 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2054 2051
2055 /* make sure no outline cursor is left around */ 2052 /* make sure no outline cursor is left around */
2056 setoldcursor = 0; 2053 setoldcursor = 0;
2057 if (ocrow != -1) 2054 if (ocrow != -1)
2058 { 2055 {
2059 if (screen.cur.row + view_start != ocrow 2056 if (screen.cur.row - view_start != ocrow
2060 || screen.cur.col != oldcursor.col) 2057 || screen.cur.col != oldcursor.col)
2061 { 2058 {
2062 if (ocrow < nrow 2059 if (ocrow < nrow
2063 && oldcursor.col < ncol) 2060 && oldcursor.col < ncol)
2064 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2061 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2065 2062
2066 if (focus || !showcursor) 2063 if (focus || !showcursor)
2067 oldcursor.row = -1; 2064 oldcursor.row = -1;
2068 else 2065 else
2069 setoldcursor = 1; 2066 setoldcursor = 1;
… …
2072 else if (!focus) 2069 else if (!focus)
2073 setoldcursor = 1; 2070 setoldcursor = 1;
2074 2071
2075 if (setoldcursor) 2072 if (setoldcursor)
2076 { 2073 {
2077 if (screen.cur.row + view_start >= nrow) 2074 if (screen.cur.row - view_start >= nrow)
2078 oldcursor.row = -1; 2075 oldcursor.row = -1;
2079 else 2076 else
2080 { 2077 {
2081 oldcursor.row = screen.cur.row + view_start; 2078 oldcursor.row = screen.cur.row - view_start;
2082 oldcursor.col = screen.cur.col; 2079 oldcursor.col = screen.cur.col;
2083 } 2080 }
2084 } 2081 }
2085 } 2082 }
2086 2083
2084 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2087#if ENABLE_OVERLAY 2085#if ENABLE_OVERLAY
2088 scr_swap_overlay (); 2086 scr_swap_overlay ();
2089#endif 2087#endif
2090 2088
2091#ifndef NO_SLOW_LINK_SUPPORT 2089#ifndef NO_SLOW_LINK_SUPPORT
2092 /* 2090 /*
2093 * D: CopyArea pass - very useful for slower links 2091 * D: CopyArea pass - very useful for slower links
2094 * This has been deliberately kept simple. 2092 * This has been deliberately kept simple.
2095 */ 2093 */
2096 i = num_scr;
2097 if (!display->is_local 2094 if (!display->is_local
2098 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2099 && abs (num_scr) < nrow && !must_clear) 2096 && abs (num_scr) < nrow && !must_clear)
2100 { 2097 {
2101 int16_t nits; 2098 int16_t nits;
2102 int j; 2099 int j;
2103 int len, wlen; 2100 int len, wlen;
2101 dLocal (int, num_scr);
2104 2102
2105 j = nrow; 2103 j = nrow;
2106 wlen = len = -1; 2104 wlen = len = -1;
2107 row = i > 0 ? 0 : j - 1; 2105 row = i > 0 ? 0 : j - 1;
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2107 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2109 {
2112 line_t s = save[(row + row_offset) % total_rows]; 2110 line_t s = ROW(view_start + row);
2113 line_t d = drawn[row]; 2111 line_t d = drawn_buf[row];
2114 line_t d2 = drawn[row + i]; 2112 line_t d2 = drawn_buf[row + i];
2115 2113
2116 for (nits = 0, col = ncol; col--; ) 2114 for (nits = 0, col = ncol; col--; )
2117 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])
2118 nits--; 2116 nits--;
2119 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])
… …
2137 2135
2138 if (len != -1) 2136 if (len != -1)
2139 { 2137 {
2140 /* also comes here at end if needed because of >= above */ 2138 /* also comes here at end if needed because of >= above */
2141 if (wlen < len) 2139 if (wlen < len)
2142 SWAP_IT (wlen, len, int); 2140 ::swap (wlen, len);
2143 2141
2144 XCopyArea (display->display, vt, vt, 2142 XCopyArea (xdisp, vt, vt,
2145 gc, 0, Row2Pixel (len + i), 2143 gc, 0, Row2Pixel (len + i),
2146 (unsigned int)TermWin_TotalWidth (), 2144 (unsigned int)this->width,
2147 (unsigned int)Height2Pixel (wlen - len + 1), 2145 (unsigned int)Height2Pixel (wlen - len + 1),
2148 0, Row2Pixel (len)); 2146 0, Row2Pixel (len));
2149 len = -1; 2147 len = -1;
2150 } 2148 }
2151 } 2149 }
… …
2155 /* 2153 /*
2156 * E: main pass across every character 2154 * E: main pass across every character
2157 */ 2155 */
2158 for (row = 0; row < nrow; row++) 2156 for (row = 0; row < nrow; row++)
2159 { 2157 {
2160 text_t *stp = save[(row + row_offset) % total_rows].t; 2158 text_t *stp = ROW(view_start + row).t;
2161 rend_t *srp = save[(row + row_offset) % total_rows].r; 2159 rend_t *srp = ROW(view_start + row).r;
2162 text_t *dtp = drawn[row].t; 2160 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn[row].r; 2161 rend_t *drp = drawn_buf[row].r;
2164 2162
2165 /* 2163 /*
2166 * E2: OK, now the real pass 2164 * E2: OK, now the real pass
2167 */ 2165 */
2168 int ypixel = (int)Row2Pixel (row); 2166 int ypixel = (int)Row2Pixel (row);
… …
2230 count++, i--; 2228 count++, i--;
2231 2229
2232 /* 2230 /*
2233 * Determine the attributes for the string 2231 * Determine the attributes for the string
2234 */ 2232 */
2235 int fore = GET_FGCOLOR (rend); // desired foreground 2233 int fore = fgcolor_of (rend); // desired foreground
2236 int back = GET_BGCOLOR (rend); // desired background 2234 int back = bgcolor_of (rend); // desired background
2237 2235
2238 // 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
2239 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))
2240 { 2238 {
2241#if ENABLE_STYLES 2239#if ENABLE_STYLES
2242 // force redraw after "careful" characters to avoid pixel droppings 2240 // "careful" (too wide) character handling
2243 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2244 drp[col + 1] = ~srp[col + 1];
2245 2241
2246 // include previous careful character(s) if possible, looks nicer (best effort...) 2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2247 while (text > stp 2243 while (text > stp
2248 && srp[text - stp - 1] & RS_Careful 2244 && srp[text - stp - 1] & RS_Careful
2249 && RS_SAME (rend, srp[text - stp - 1])) 2245 && RS_SAME (rend, srp[text - stp - 1]))
2250 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];
2251#endif 2255#endif
2252 2256
2253 bool invert = rend & RS_RVid; 2257 bool invert = rend & RS_RVid;
2254 2258
2255#ifndef NO_BOLD_UNDERLINE_REVERSE 2259#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2279 fore = Color_UL; 2283 fore = Color_UL;
2280#endif 2284#endif
2281 2285
2282 if (invert) 2286 if (invert)
2283 { 2287 {
2284 SWAP_IT (fore, back, int); 2288 ::swap (fore, back);
2285 2289
2286#ifndef NO_BOLD_UNDERLINE_REVERSE 2290#ifndef NO_BOLD_UNDERLINE_REVERSE
2287 if (ISSET_PIXCOLOR (Color_RV)) 2291 if (ISSET_PIXCOLOR (Color_RV))
2288 back = Color_RV; 2292 back = Color_RV;
2289 2293
… …
2339 2343
2340 if (rend & RS_Uline && font->descent > 1 && fore != back) 2344 if (rend & RS_Uline && font->descent > 1 && fore != back)
2341 { 2345 {
2342#if ENABLE_FRILLS 2346#if ENABLE_FRILLS
2343 if (ISSET_PIXCOLOR (Color_underline)) 2347 if (ISSET_PIXCOLOR (Color_underline))
2344 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2345 else 2349 else
2346#endif 2350#endif
2347 XSetForeground (display->display, gc, pix_colors[fore]); 2351 XSetForeground (xdisp, gc, pix_colors[fore]);
2348 2352
2349 XDrawLine (display->display, drawBuffer, gc, 2353 XDrawLine (xdisp, drawBuffer, gc,
2350 xpixel, ypixel + font->ascent + 1, 2354 xpixel, ypixel + font->ascent + 1,
2351 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2352 } 2356 }
2353 } /* for (col....) */ 2357 } /* for (col....) */
2354 } /* for (row....) */ 2358 } /* for (row....) */
2355 2359
2356#if ENABLE_OVERLAY 2360#if ENABLE_OVERLAY
2357 scr_swap_overlay (); 2361 scr_swap_overlay ();
2358#endif 2362#endif
2363 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2359 2364
2360 /* 2365 /*
2361 * G: cleanup cursor and display outline cursor if necessary 2366 * G: cleanup cursor and display outline cursor if necessary
2362 */ 2367 */
2363 if (showcursor) 2368 if (showcursor)
2364 { 2369 {
2365 if (focus) 2370 if (focus)
2366 { 2371 {
2367 if (options & Opt_cursorUnderline) 2372 if (OPTION (Opt_cursorUnderline))
2368 *crp ^= RS_Uline; 2373 *crp ^= RS_Uline;
2369 else 2374 else
2370 { 2375 {
2371 *crp ^= RS_RVid; 2376 *crp ^= RS_RVid;
2372#ifndef NO_CURSORCOLOR 2377#ifndef NO_CURSORCOLOR
… …
2381 2386
2382 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2387 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2383 col--; 2388 col--;
2384 2389
2385 while (col + cursorwidth < ncol 2390 while (col + cursorwidth < ncol
2386 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2387 cursorwidth++; 2392 cursorwidth++;
2388 2393
2389#ifndef NO_CURSORCOLOR 2394#ifndef NO_CURSORCOLOR
2390 if (ISSET_PIXCOLOR (Color_cursor)) 2395 if (ISSET_PIXCOLOR (Color_cursor))
2391 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2392#endif 2397#endif
2393 2398
2394 XDrawRectangle (display->display, drawBuffer, gc, 2399 XDrawRectangle (xdisp, drawBuffer, gc,
2395 Col2Pixel (col), 2400 Col2Pixel (col),
2396 Row2Pixel (oldcursor.row), 2401 Row2Pixel (oldcursor.row),
2397 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2402 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2398 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2399 } 2404 }
… …
2402 /* 2407 /*
2403 * H: cleanup selection 2408 * H: cleanup selection
2404 */ 2409 */
2405 scr_reverse_selection (); 2410 scr_reverse_selection ();
2406 2411
2407 if (refresh_type & SMOOTH_REFRESH)
2408 XFlush (display->display);
2409
2410 num_scr = 0; 2412 num_scr = 0;
2411 num_scr_allow = 1; 2413 num_scr_allow = 1;
2412} 2414}
2413 2415
2414void 2416void
2415rxvt_term::scr_remap_chars (const line_t &l) 2417rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2416{ 2418{
2417 if (!l.t) 2419 if (!l.t)
2418 return; 2420 return;
2419 2421
2422 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2423
2420 for (int i = ncol; i--; ) 2424 for (int i = ncol; i--; )
2421 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]));
2422} 2426}
2423 2427
2424void 2428void
2425rxvt_term::scr_remap_chars () 2429rxvt_term::scr_remap_chars () NOTHROW
2426{ 2430{
2427 for (int i = total_rows; i--; ) 2431 for (int i = total_rows; i--; )
2428 scr_remap_chars (save[i]); 2432 scr_remap_chars (row_buf [i]);
2429 2433
2430 for (int i = nrow; i--; ) 2434 for (int i = nrow; i--; )
2431 { 2435 {
2432 scr_remap_chars (drawn[i]); 2436 scr_remap_chars (drawn_buf [i]);
2433 scr_remap_chars (swap_save[i]); 2437 scr_remap_chars (swap_buf [i]);
2434 } 2438 }
2435} 2439}
2436 2440
2437void 2441void
2438rxvt_term::scr_recolour () 2442rxvt_term::scr_recolour () NOTHROW
2439{ 2443{
2440 if (1 2444 if (1
2441#if TRANSPARENT 2445#if TRANSPARENT
2442 && !am_transparent 2446 && !am_transparent
2443#endif 2447#endif
2444#if XPM_BACKGROUND 2448#if XPM_BACKGROUND
2445 && !bgPixmap.pixmap 2449 && !bgPixmap.pixmap
2446#endif 2450#endif
2447 ) 2451 )
2448 { 2452 {
2449 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2450 XClearWindow (display->display, parent[0]); 2454 XClearWindow (xdisp, parent[0]);
2451 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2452#if HAVE_SCROLLBARS 2456#if HAVE_SCROLLBARS
2453 if (scrollBar.win) 2457 if (scrollBar.win)
2454 { 2458 {
2455 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2456 scrollBar.setIdle (); 2460 scrollBar.setIdle ();
2457 scrollbar_show (0); 2461 scrollbar_show (0);
2458 } 2462 }
2459#endif 2463#endif
2460 } 2464 }
… …
2464 want_refresh = 1; 2468 want_refresh = 1;
2465} 2469}
2466 2470
2467/* ------------------------------------------------------------------------- */ 2471/* ------------------------------------------------------------------------- */
2468void 2472void
2469rxvt_term::scr_clear (bool really) 2473rxvt_term::scr_clear (bool really) NOTHROW
2470{ 2474{
2471 if (!mapped) 2475 if (!mapped)
2472 return; 2476 return;
2473 2477
2474 num_scr_allow = 0; 2478 num_scr_allow = 0;
2475 want_refresh = 1; 2479 want_refresh = 1;
2476 2480
2477 if (really) 2481 if (really)
2478 XClearWindow (display->display, vt); 2482 XClearWindow (xdisp, vt);
2479} 2483}
2480 2484
2481/* ------------------------------------------------------------------------- */
2482void 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
2483rxvt_term::scr_reverse_selection () 2535rxvt_term::scr_reverse_selection () NOTHROW
2484{ 2536{
2485 if (selection.op 2537 if (selection.op
2486 && current_screen == selection.screen 2538 && current_screen == selection.screen
2487 && selection.end.row >= -view_start) 2539 && selection.end.row >= view_start)
2488 { 2540 {
2489 int view_end = -view_start + nrow;
2490 int row, col;
2491
2492#if ENABLE_FRILLS 2541#if ENABLE_FRILLS
2493 if (selection.rect) 2542 if (selection.rect)
2494 { 2543 scr_xor_rect (selection.beg.row, selection.beg.col,
2495 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2544 selection.end.row, selection.end.col,
2496 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2545 RS_RVid, RS_RVid | RS_Uline);
2497 srp[col] ^= RS_RVid;
2498 }
2499 else 2546 else
2500#endif 2547#endif
2501 { 2548 scr_xor_span (selection.beg.row, selection.beg.col,
2502 if (selection.beg.row >= -view_start) 2549 selection.end.row, selection.end.col,
2503 { 2550 RS_RVid);
2504 col = selection.beg.col;
2505 row = selection.beg.row;
2506 }
2507 else
2508 {
2509 col = 0;
2510 row = view_start;
2511 }
2512
2513 for (; row < min (selection.end.row, view_end); row++, col = 0)
2514 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2515 srp[col] ^= RS_RVid;
2516
2517 if (row == selection.end.row)
2518 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2519 srp[col] ^= RS_RVid;
2520 }
2521 } 2551 }
2522} 2552}
2523 2553
2524/* ------------------------------------------------------------------------- */ 2554/* ------------------------------------------------------------------------- */
2525/* 2555/*
2526 * Dump the whole scrollback and screen to the passed filedescriptor. The 2556 * Dump the whole scrollback and screen to the passed filedescriptor. The
2527 * invoking routine must close the fd. 2557 * invoking routine must close the fd.
2528 */ 2558 */
2529#if 0 2559#if 0
2530void 2560void
2531rxvt_term::scr_dump (int fd) 2561rxvt_term::scr_dump (int fd) NOTHROW
2532{ 2562{
2533 int row, wrote; 2563 int row, wrote;
2534 unsigned int width, towrite; 2564 unsigned int width, towrite;
2535 char r1[] = "\n"; 2565 char r1[] = "\n";
2536 2566
2537 for (row = saveLines - nsaved; 2567 for (row = saveLines - nsaved;
2538 row < saveLines + nrow - 1; row++) 2568 row < saveLines + nrow - 1; row++)
2539 { 2569 {
2540 width = save[row].l >= 0 ? save[row].l 2570 width = row_buf[row].l >= 0 ? row_buf[row].l
2541 : ncol; 2571 : ncol;
2542 for (towrite = width; towrite; towrite -= wrote) 2572 for (towrite = width; towrite; towrite -= wrote)
2543 { 2573 {
2544 wrote = write (fd, & (save[row].t[width - towrite]), 2574 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2545 towrite); 2575 towrite);
2546 if (wrote < 0) 2576 if (wrote < 0)
2547 return; /* XXX: death, no report */ 2577 return; /* XXX: death, no report */
2548 } 2578 }
2549 if (save[row].l >= 0) 2579 if (row_buf[row].l >= 0)
2550 if (write (fd, r1, 1) <= 0) 2580 if (write (fd, r1, 1) <= 0)
2551 return; /* XXX: death, no report */ 2581 return; /* XXX: death, no report */
2552 } 2582 }
2553} 2583}
2554#endif 2584#endif
2555 2585
2556/* ------------------------------------------------------------------------- * 2586/* ------------------------------------------------------------------------- *
2557 * CHARACTER SELECTION * 2587 * CHARACTER SELECTION *
2558 * ------------------------------------------------------------------------- */ 2588 * ------------------------------------------------------------------------- */
2559void 2589void
2560rxvt_term::selection_check (int check_more) 2590rxvt_term::selection_check (int check_more) NOTHROW
2561{ 2591{
2562 row_col_t pos; 2592 row_col_t pos;
2563 2593
2564 if (!selection.op) 2594 if (!selection.op)
2565 return; 2595 return;
2566 2596
2567 pos.row = pos.col = 0; 2597 pos.row = pos.col = 0;
2568 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2598 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2569 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2599 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2570 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2600 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2571 || (check_more == 1 2601 || (check_more == 1
2572 && current_screen == selection.screen 2602 && current_screen == selection.screen
2573 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2603 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2574 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2604 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2575 || (check_more == 2 2605 || (check_more == 2
… …
2586/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2587/* 2617/*
2588 * Paste a selection direct to the command fd 2618 * Paste a selection direct to the command fd
2589 */ 2619 */
2590void 2620void
2591rxvt_term::paste (unsigned char *data, unsigned int len) 2621rxvt_term::paste (char *data, unsigned int len) NOTHROW
2592{ 2622{
2593 /* convert normal newline chars into common keyboard Return key sequence */ 2623 /* convert normal newline chars into common keyboard Return key sequence */
2594 for (unsigned int i = 0; i < len; i++) 2624 for (unsigned int i = 0; i < len; i++)
2595 if (data[i] == C0_LF) 2625 if (data[i] == C0_LF)
2596 data[i] = C0_CR; 2626 data[i] = C0_CR;
… …
2602/* 2632/*
2603 * Respond to a notification that a primary selection has been sent 2633 * Respond to a notification that a primary selection has been sent
2604 * EXT: SelectionNotify 2634 * EXT: SelectionNotify
2605 */ 2635 */
2606void 2636void
2607rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2637rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2608{ 2638{
2609 if (prop == None) /* check for failed XConvertSelection */ 2639 if (prop == None) /* check for failed XConvertSelection */
2610 { 2640 {
2611 if ((selection_type & Sel_CompoundText)) 2641 if ((selection_type & Sel_CompoundText))
2612 { 2642 {
… …
2632 } 2662 }
2633 2663
2634 unsigned long bytes_after; 2664 unsigned long bytes_after;
2635 XTextProperty ct; 2665 XTextProperty ct;
2636 2666
2637 if (XGetWindowProperty (display->display, win, prop, 2667 if (XGetWindowProperty (xdisp, win, prop,
2638 0, PROP_SIZE / 4, 2668 0, PROP_SIZE / 4,
2639 delete_prop, AnyPropertyType, 2669 delete_prop, AnyPropertyType,
2640 &ct.encoding, &ct.format, 2670 &ct.encoding, &ct.format,
2641 &ct.nitems, &bytes_after, 2671 &ct.nitems, &bytes_after,
2642 &ct.value) != Success) 2672 &ct.value) != Success)
… …
2651 if (bytes_after) 2681 if (bytes_after)
2652 { 2682 {
2653 // fetch and append remaining data 2683 // fetch and append remaining data
2654 XTextProperty ct2; 2684 XTextProperty ct2;
2655 2685
2656 if (XGetWindowProperty (display->display, win, prop, 2686 if (XGetWindowProperty (xdisp, win, prop,
2657 ct.nitems / 4, (bytes_after + 3) / 4, 2687 ct.nitems / 4, (bytes_after + 3) / 4,
2658 delete_prop, AnyPropertyType, 2688 delete_prop, AnyPropertyType,
2659 &ct2.encoding, &ct2.format, 2689 &ct2.encoding, &ct2.format,
2660 &ct2.nitems, &bytes_after, 2690 &ct2.nitems, &bytes_after,
2661 &ct2.value) != Success) 2691 &ct2.value) != Success)
… …
2674 2704
2675 if (ct.encoding == xa[XA_INCR]) 2705 if (ct.encoding == xa[XA_INCR])
2676 { 2706 {
2677 // INCR selection, start handshake 2707 // INCR selection, start handshake
2678 if (!delete_prop) 2708 if (!delete_prop)
2679 XDeleteProperty (display->display, win, prop); 2709 XDeleteProperty (xdisp, win, prop);
2680 2710
2681 selection_wait = Sel_incr; 2711 selection_wait = Sel_incr;
2682 incr_buf_fill = 0; 2712 incr_buf_fill = 0;
2683 incr_ev.start (NOW + 10); 2713 incr_ev.start (NOW + 10);
2684 2714
… …
2740 { 2770 {
2741 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2742 char *s = rxvt_wcstombs (w); 2772 char *s = rxvt_wcstombs (w);
2743 free (w); 2773 free (w);
2744 // TODO: strlen == only the first element will be converted. well... 2774 // TODO: strlen == only the first element will be converted. well...
2745 paste ((unsigned char *)s, strlen (s)); 2775 paste (s, strlen (s));
2746 free (s); 2776 free (s);
2747 } 2777 }
2748 else 2778 else
2749#endif 2779#endif
2750 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2751 && cl) 2781 && cl)
2752 { 2782 {
2753 for (int i = 0; i < cr; i++) 2783 for (int i = 0; i < cr; i++)
2754 paste ((unsigned char *)cl[i], strlen (cl[i])); 2784 paste (cl[i], strlen (cl[i]));
2755 2785
2756 XFreeStringList (cl); 2786 XFreeStringList (cl);
2757 } 2787 }
2758 else 2788 else
2759 paste (ct.value, ct.nitems); // paste raw 2789 paste ((char *)ct.value, ct.nitems); // paste raw
2760 2790
2761bailout: 2791bailout:
2762 XFree (ct.value); 2792 XFree (ct.value);
2763 2793
2764 if (selection_wait == Sel_normal) 2794 if (selection_wait == Sel_normal)
2765 selection_wait = Sel_none; 2795 selection_wait = Sel_none;
2766} 2796}
2767 2797
2768void 2798void
2769rxvt_term::incr_cb (time_watcher &w) 2799rxvt_term::incr_cb (time_watcher &w) NOTHROW
2770{ 2800{
2771 selection_wait = Sel_none; 2801 selection_wait = Sel_none;
2772 2802
2773 incr_buf_size = 0; 2803 incr_buf_size = 0;
2774 free (incr_buf); 2804 free (incr_buf);
2775 2805
2776 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2806 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2777} 2807}
2778 2808
2779void 2809void
2780rxvt_term::selection_property (Window win, Atom prop) 2810rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2781{ 2811{
2782 if (prop == None || selection_wait != Sel_incr) 2812 if (prop == None || selection_wait != Sel_incr)
2783 return; 2813 return;
2784 2814
2785 selection_paste (win, prop, true); 2815 selection_paste (win, prop, true);
… …
2794 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2795 * will auto fallback to CUT_BUFFER0 2825 * will auto fallback to CUT_BUFFER0
2796 * EXT: button 2 release 2826 * EXT: button 2 release
2797 */ 2827 */
2798void 2828void
2799rxvt_term::selection_request (Time tm, int x, int y) 2829rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2800{ 2830{
2801 if (x < 0 || x >= width || y < 0 || y >= height) 2831 if (selection.text && selnum == Sel_Primary)
2802 return; /* outside window */
2803
2804 if (selection.text)
2805 { /* internal selection */ 2832 { /* internal selection */
2806 char *str = rxvt_wcstombs (selection.text, selection.len); 2833 char *str = rxvt_wcstombs (selection.text, selection.len);
2807 paste ((unsigned char *)str, strlen (str)); 2834 paste (str, strlen (str));
2808 free (str); 2835 free (str);
2809 return; 2836 return;
2810 } 2837 }
2811 else 2838 else
2812 { 2839 {
2813 int i;
2814
2815 selection_request_time = tm; 2840 selection_request_time = tm;
2816 selection_wait = Sel_normal; 2841 selection_wait = Sel_normal;
2817 2842
2818 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2819 {
2820#if X_HAVE_UTF8_STRING 2843#if X_HAVE_UTF8_STRING
2821 selection_type = Sel_UTF8String; 2844 selection_type = Sel_UTF8String;
2822 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2845 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2823 return; 2846 return;
2824#else 2847#else
2825 selection_type = Sel_CompoundText; 2848 selection_type = Sel_CompoundText;
2826 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2849 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2827 return; 2850 return;
2828#endif 2851#endif
2829 }
2830 } 2852 }
2831 2853
2832 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2854 selection_wait = Sel_none; /* don't loop in selection_paste () */
2833 selection_paste (display->root, XA_CUT_BUFFER0, false); 2855 selection_paste (display->root, XA_CUT_BUFFER0, false);
2834} 2856}
2835 2857
2836int 2858int
2837rxvt_term::selection_request_other (Atom target, int selnum) 2859rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2838{ 2860{
2839 Atom sel; 2861 Atom sel;
2840 2862
2841 selection_type |= selnum; 2863 selection_type |= selnum;
2842 2864
… …
2845 else if (selnum == Sel_Secondary) 2867 else if (selnum == Sel_Secondary)
2846 sel = XA_SECONDARY; 2868 sel = XA_SECONDARY;
2847 else 2869 else
2848 sel = xa[XA_CLIPBOARD]; 2870 sel = xa[XA_CLIPBOARD];
2849 2871
2850 if (XGetSelectionOwner (display->display, sel) != None) 2872 if (XGetSelectionOwner (xdisp, sel) != None)
2851 { 2873 {
2852 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2853 vt, selection_request_time); 2875 vt, selection_request_time);
2854 return 1; 2876 return 1;
2855 } 2877 }
2856 2878
2857 return 0; 2879 return 0;
… …
2861/* 2883/*
2862 * Clear all selected text 2884 * Clear all selected text
2863 * EXT: SelectionClear 2885 * EXT: SelectionClear
2864 */ 2886 */
2865void 2887void
2866rxvt_term::selection_clear () 2888rxvt_term::selection_clear () NOTHROW
2867{ 2889{
2868 want_refresh = 1; 2890 want_refresh = 1;
2869 free (selection.text); 2891 free (selection.text);
2870 selection.text = NULL; 2892 selection.text = NULL;
2871 selection.len = 0; 2893 selection.len = 0;
… …
2904 selection.op = SELECTION_DONE; 2926 selection.op = SELECTION_DONE;
2905 2927
2906 if (selection.clicks == 4) 2928 if (selection.clicks == 4)
2907 return; /* nothing selected, go away */ 2929 return; /* nothing selected, go away */
2908 2930
2931 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2932 return;
2933
2909 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2934 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2910 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));
2911 2936
2912 int ofs = 0; 2937 int ofs = 0;
2913 int extra = 0; 2938 int extra = 0;
… …
2925 col = selection.beg.col; 2950 col = selection.beg.col;
2926 end_col = ncol + 1; 2951 end_col = ncol + 1;
2927 } 2952 }
2928 else 2953 else
2929#endif 2954#endif
2930 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2955 end_col = ROW(row).l;
2931 2956
2932 col = max (col, 0); 2957 col = max (col, 0);
2933 2958
2934 if (row == selection.end.row || selection.rect) 2959 if (row == selection.end.row
2960#if ENABLE_FRILLS
2961 || selection.rect
2962#endif
2963 )
2935 end_col = min (end_col, selection.end.col); 2964 min_it (end_col, selection.end.col);
2936 2965
2937 t = ROW(row).t + col; 2966 t = ROW(row).t + col;
2967
2938 for (; col < end_col; col++) 2968 for (; col < end_col; col++)
2939 { 2969 {
2940 if (*t == NOCHAR) 2970 if (*t == NOCHAR)
2941 t++; 2971 t++;
2942#if ENABLE_COMBINING 2972#if ENABLE_COMBINING
… …
2958#endif 2988#endif
2959 else 2989 else
2960 new_selection_text[ofs++] = *t++; 2990 new_selection_text[ofs++] = *t++;
2961 } 2991 }
2962 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
2963 if (!ROW(row).is_longer () && row != selection.end.row) 3005 if (!ROW(row).is_longer () && row != selection.end.row)
2964 new_selection_text[ofs++] = C0_LF; 3006 new_selection_text[ofs++] = C0_LF;
2965 } 3007 }
2966 3008
2967 if (end_col != selection.end.col) 3009 if (end_col != selection.end.col)
2968 new_selection_text[ofs++] = C0_LF; 3010 new_selection_text[ofs++] = C0_LF;
2969 3011
… …
2979 3021
2980 // 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
2981 selection.len = ofs; 3023 selection.len = ofs;
2982 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));
2983 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
2984 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
2985 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3039 {
2986 display->set_selection_owner (this); 3040 display->set_selection_owner (this);
3041 return true;
3042 }
2987 else 3043 else
2988 rxvt_warn ("can't get primary selection, ignoring.\n"); 3044 {
3045 selection_clear ();
3046 return false;
3047 }
2989 3048
2990#if 0 3049#if 0
2991 XTextProperty ct; 3050 XTextProperty ct;
2992 3051
2993 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
2994 { 3053 {
2995 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2996 XFree (ct.value); 3055 XFree (ct.value);
2997 } 3056 }
2998#endif 3057#endif
2999
3000 selection_time = tm;
3001} 3058}
3002 3059
3003/* ------------------------------------------------------------------------- */ 3060/* ------------------------------------------------------------------------- */
3004/* 3061/*
3005 * 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
3006 * EXT: button 1 press 3063 * EXT: button 1 press
3007 */ 3064 */
3008void 3065void
3009rxvt_term::selection_click (int clicks, int x, int y) 3066rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3010{ 3067{
3011 clicks = ((clicks - 1) % 3) + 1; 3068 clicks = ((clicks - 1) % 3) + 1;
3012 selection.clicks = clicks; /* save clicks so extend will work */ 3069 selection.clicks = clicks; /* save clicks so extend will work */
3013 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
3014 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3080 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3015 3081
3016 if (clicks == 2 || clicks == 3) 3082 if (clicks == 2 || clicks == 3)
3017 selection_extend_colrow (selection.mark.col, 3083 selection_extend_colrow (selection.mark.col,
3018 selection.mark.row + view_start, 3084 selection.mark.row - view_start,
3019 0, /* button 3 */ 3085 0, /* button 3 */
3020 1, /* button press */ 3086 1, /* button press */
3021 0); /* click change */ 3087 0); /* click change */
3022} 3088}
3023 3089
3024/* ------------------------------------------------------------------------- */ 3090/* ------------------------------------------------------------------------- */
3025/* 3091/*
3026 * Mark a selection at the specified col/row 3092 * Mark a selection at the specified col/row
3027 */ 3093 */
3028void 3094void
3029rxvt_term::selection_start_colrow (int col, int row) 3095rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3030{ 3096{
3031 want_refresh = 1; 3097 want_refresh = 1;
3032 3098
3033 selection.mark.row = row - view_start; 3099 selection.mark.row = row + view_start;
3034 selection.mark.col = col; 3100 selection.mark.col = col;
3035 3101
3036 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3102 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3037 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3103 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3038 3104
3039 while (selection.mark.col > 0 3105 while (selection.mark.col > 0
3040 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3106 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3041 --selection.mark.col; 3107 --selection.mark.col;
3042 3108
… …
3060#define DELIMIT_TEXT(x) \ 3126#define DELIMIT_TEXT(x) \
3061 (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)))
3062#define DELIMIT_REND(x) 1 3128#define DELIMIT_REND(x) 1
3063 3129
3064void 3130void
3065rxvt_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
3066{ 3132{
3067 int col, row, dirnadd, tcol, trow, w1, w2; 3133 int col, row, dirnadd, tcol, trow, w1, w2;
3068 row_col_t bound; 3134 row_col_t bound;
3069 text_t *stp; 3135 text_t *stp;
3070 rend_t *srp; 3136 rend_t *srp;
3071 3137
3072 if (dirn == UP) 3138 if (dirn == UP)
3073 { 3139 {
3074 bound.row = - nsaved - 1; 3140 bound.row = top_row - 1;
3075 bound.col = 0; 3141 bound.col = 0;
3076 dirnadd = -1; 3142 dirnadd = -1;
3077 } 3143 }
3078 else 3144 else
3079 { 3145 {
… …
3127 } 3193 }
3128 } 3194 }
3129 break; 3195 break;
3130 } 3196 }
3131 3197
3132Old_Word_Selection_You_Die:
3133 if (dirn == DN) 3198 if (dirn == DN)
3134 col++; /* put us on one past the end */ 3199 col++; /* put us on one past the end */
3135 3200
3136 /* Poke the values back in */ 3201 /* Poke the values back in */
3137 ret->row = row; 3202 ret->row = row;
… …
3145 * flag == 0 ==> button 1 3210 * flag == 0 ==> button 1
3146 * flag == 1 ==> button 3 press 3211 * flag == 1 ==> button 3 press
3147 * flag == 2 ==> button 3 motion 3212 * flag == 2 ==> button 3 motion
3148 */ 3213 */
3149void 3214void
3150rxvt_term::selection_extend (int x, int y, int flag) 3215rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3151{ 3216{
3152 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3217 int col = clamp (Pixel2Col (x), 0, ncol);
3153 int row = min (max (Pixel2Row (y), 0), ncol); 3218 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3154 3219
3155 /* 3220 /*
3156 * 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
3157 * 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
3158 * 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
3159 * be _past_ a character for it to be selected. 3224 * be _past_ a character for it to be selected.
3160 */ 3225 */
3161 if (((selection.clicks % 3) == 1) && !flag 3226 if (((selection.clicks % 3) == 1) && !flag
3162 && (col == selection.mark.col 3227 && (col == selection.mark.col
3163 && (row == selection.mark.row + view_start))) 3228 && (row == selection.mark.row - view_start)))
3164 { 3229 {
3165 /* select nothing */ 3230 /* select nothing */
3166 selection.beg.row = selection.end.row = 0; 3231 selection.beg.row = selection.end.row = 0;
3167 selection.beg.col = selection.end.col = 0; 3232 selection.beg.col = selection.end.col = 0;
3168 selection.clicks = 4; 3233 selection.clicks = 4;
… …
3181/* ------------------------------------------------------------------------- */ 3246/* ------------------------------------------------------------------------- */
3182/* 3247/*
3183 * Extend the selection to the specified col/row 3248 * Extend the selection to the specified col/row
3184 */ 3249 */
3185void 3250void
3186rxvt_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
3187{ 3252{
3188 row_col_t pos; 3253 row_col_t pos;
3189 enum { 3254 enum {
3190 LEFT, RIGHT 3255 LEFT, RIGHT
3191 } closeto = RIGHT; 3256 } closeto = RIGHT;
… …
3223 selection.beg.col = selection.end.col = selection.mark.col; 3288 selection.beg.col = selection.end.col = selection.mark.col;
3224 selection.beg.row = selection.end.row = selection.mark.row; 3289 selection.beg.row = selection.end.row = selection.mark.row;
3225 } 3290 }
3226 3291
3227 pos.col = col; 3292 pos.col = col;
3228 pos.row = row - view_start; 3293 pos.row = view_start + row;
3229 3294
3230 /* 3295 /*
3231 * 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
3232 * in the way button3 drag extension works. 3297 * in the way button3 drag extension works.
3233 * We're either doing: button1 drag; button3 press; or button3 drag 3298 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3320 selection_delimit_word (DN, &selection.end, &selection.end); 3385 selection_delimit_word (DN, &selection.end, &selection.end);
3321 } 3386 }
3322 else if (selection.clicks == 3) 3387 else if (selection.clicks == 3)
3323 { 3388 {
3324#if ENABLE_FRILLS 3389#if ENABLE_FRILLS
3325 if (options & Opt_tripleclickwords) 3390 if (OPTION (Opt_tripleclickwords))
3326 { 3391 {
3327 selection_delimit_word (UP, &selection.beg, &selection.beg); 3392 selection_delimit_word (UP, &selection.beg, &selection.beg);
3328 3393
3329 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++)
3330 { 3395 {
… …
3371 } 3436 }
3372 } 3437 }
3373 3438
3374#if ENABLE_FRILLS 3439#if ENABLE_FRILLS
3375 if (selection.rect && selection.beg.col > selection.end.col) 3440 if (selection.rect && selection.beg.col > selection.end.col)
3376 SWAP_IT (selection.beg.col, selection.end.col, int); 3441 ::swap (selection.beg.col, selection.end.col);
3377#endif 3442#endif
3378} 3443}
3379 3444
3380#if ENABLE_FRILLS 3445#if ENABLE_FRILLS
3381void 3446void
3382rxvt_term::selection_remove_trailing_spaces () 3447rxvt_term::selection_remove_trailing_spaces () NOTHROW
3383{ 3448{
3384 int32_t end_col, end_row; 3449 int32_t end_col, end_row;
3385 text_t *stp; 3450 text_t *stp;
3386 3451
3387 end_col = selection.end.col; 3452 end_col = selection.end.col;
… …
3391 { 3456 {
3392 stp = ROW(end_row).t; 3457 stp = ROW(end_row).t;
3393 3458
3394 while (--end_col >= 0) 3459 while (--end_col >= 0)
3395 { 3460 {
3396 if (stp[end_col] != ' ' 3461 if (stp[end_col] != NOCHAR
3397 && stp[end_col] != '\t' 3462 && !unicode::is_space (stp[end_col]))
3398 && stp[end_col] != NOCHAR)
3399 break; 3463 break;
3400 } 3464 }
3401 3465
3402 if (end_col >= 0 3466 if (end_col >= 0
3403 || !ROW(end_row - 1).is_longer ()) 3467 || !ROW(end_row - 1).is_longer ())
… …
3426/* 3490/*
3427 * Double click on button 3 when already selected 3491 * Double click on button 3 when already selected
3428 * EXT: button 3 double click 3492 * EXT: button 3 double click
3429 */ 3493 */
3430void 3494void
3431rxvt_term::selection_rotate (int x, int y) 3495rxvt_term::selection_rotate (int x, int y) NOTHROW
3432{ 3496{
3433 selection.clicks = selection.clicks % 3 + 1; 3497 selection.clicks = selection.clicks % 3 + 1;
3434 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3498 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3435} 3499}
3436 3500
… …
3438/* 3502/*
3439 * Respond to a request for our current selection 3503 * Respond to a request for our current selection
3440 * EXT: SelectionRequest 3504 * EXT: SelectionRequest
3441 */ 3505 */
3442void 3506void
3443rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3507rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3444{ 3508{
3445 XSelectionEvent ev; 3509 XSelectionEvent ev;
3446 dDisp;
3447 3510
3448 ev.type = SelectionNotify; 3511 ev.type = SelectionNotify;
3449 ev.property = None; 3512 ev.property = None;
3450 ev.display = rq.display; 3513 ev.display = rq.display;
3451 ev.requestor = rq.requestor; 3514 ev.requestor = rq.requestor;
… …
3465 *target++ = xa[XA_COMPOUND_TEXT]; 3528 *target++ = xa[XA_COMPOUND_TEXT];
3466#if X_HAVE_UTF8_STRING 3529#if X_HAVE_UTF8_STRING
3467 *target++ = xa[XA_UTF8_STRING]; 3530 *target++ = xa[XA_UTF8_STRING];
3468#endif 3531#endif
3469 3532
3470 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3471 32, PropModeReplace, 3534 32, PropModeReplace,
3472 (unsigned char *)target_list, target - target_list); 3535 (unsigned char *)target_list, target - target_list);
3473 ev.property = rq.property; 3536 ev.property = rq.property;
3474 } 3537 }
3475#if TODO // TODO 3538#if TODO // TODO
… …
3478 /* TODO: Handle MULTIPLE */ 3541 /* TODO: Handle MULTIPLE */
3479 } 3542 }
3480#endif 3543#endif
3481 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3482 { 3545 {
3483 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3484 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3547 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3485 ev.property = rq.property; 3548 ev.property = rq.property;
3486 } 3549 }
3487 else if (rq.target == XA_STRING 3550 else if (rq.target == XA_STRING
3488 || rq.target == xa[XA_TEXT] 3551 || rq.target == xa[XA_TEXT]
… …
3546 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3547 ct.nitems = strlen ((char *)ct.value); 3610 ct.nitems = strlen ((char *)ct.value);
3548 } 3611 }
3549 else 3612 else
3550#endif 3613#endif
3551 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3552 freect = 1; 3615 freect = 1;
3553 else 3616 else
3554 { 3617 {
3555 /* if we failed to convert then send it raw */ 3618 /* if we failed to convert then send it raw */
3556 ct.value = (unsigned char *)cl; 3619 ct.value = (unsigned char *)cl;
3557 ct.nitems = selectlen; 3620 ct.nitems = selectlen;
3558 ct.encoding = target; 3621 ct.encoding = target;
3559 } 3622 }
3560 3623
3561 XChangeProperty (disp, rq.requestor, rq.property, 3624 XChangeProperty (xdisp, rq.requestor, rq.property,
3562 ct.encoding, 8, PropModeReplace, 3625 ct.encoding, 8, PropModeReplace,
3563 ct.value, (int)ct.nitems); 3626 ct.value, (int)ct.nitems);
3564 ev.property = rq.property; 3627 ev.property = rq.property;
3565 3628
3566 if (freect) 3629 if (freect)
3567 XFree (ct.value); 3630 XFree (ct.value);
3568 } 3631 }
3569 3632
3570 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3571} 3634}
3572 3635
3573/* ------------------------------------------------------------------------- * 3636/* ------------------------------------------------------------------------- *
3574 * MOUSE ROUTINES * 3637 * MOUSE ROUTINES *
3575 * ------------------------------------------------------------------------- */ 3638 * ------------------------------------------------------------------------- */
3576 3639
3577/* 3640/*
3578 * return col/row values corresponding to x/y pixel values 3641 * return col/row values corresponding to x/y pixel values
3579 */ 3642 */
3580void 3643void
3581rxvt_term::pixel_position (int *x, int *y) 3644rxvt_term::pixel_position (int *x, int *y) NOTHROW
3582{ 3645{
3583 *x = Pixel2Col (*x); 3646 *x = Pixel2Col (*x);
3584 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3647 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3585 *y = Pixel2Row (*y); 3648 *y = Pixel2Row (*y);
3586 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3649 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3587} 3650}
3588 3651
3589/* ------------------------------------------------------------------------- */ 3652/* ------------------------------------------------------------------------- */
3590#ifdef USE_XIM 3653#ifdef USE_XIM
3591void 3654void
3592rxvt_term::im_set_position (XPoint &pos) 3655rxvt_term::im_set_position (XPoint &pos) NOTHROW
3593{ 3656{
3594 XWindowAttributes xwa; 3657 XWindowAttributes xwa;
3595 3658
3596 XGetWindowAttributes (display->display, vt, &xwa); 3659 XGetWindowAttributes (xdisp, vt, &xwa);
3597 3660
3598 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3661 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3599 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3600} 3663}
3601#endif 3664#endif
3602 3665
3603#if ENABLE_OVERLAY 3666#if ENABLE_OVERLAY
3604void 3667void
3605rxvt_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
3606{ 3669{
3607 if (nrow < 3 || ncol < 3) 3670 if (nrow < 1 || ncol < 1)
3608 return; 3671 return;
3609 3672
3610 want_refresh = 1; 3673 want_refresh = 1;
3611 3674
3612 scr_overlay_off (); 3675 scr_overlay_off ();
3613 3676
3614 if (x < 0) x = ncol - w; 3677 if (x < 0) x = ncol - w;
3615 if (y < 0) y = nrow - h; 3678 if (y < 0) y = nrow - h;
3616 3679
3617 // make space for border 3680 // make space for border
3618 w += 2; MIN_IT (w, ncol); 3681 w += 2; min_it (w, ncol);
3619 h += 2; MIN_IT (h, nrow); 3682 h += 2; min_it (h, nrow);
3620 3683
3621 x -= 1; MAX_IT (x, 0); 3684 x -= 1; clamp_it (x, 0, ncol - w);
3622 y -= 1; MAX_IT (y, 0); 3685 y -= 1; clamp_it (y, 0, nrow - h);
3623
3624 MIN_IT (x, ncol - w);
3625 MIN_IT (y, nrow - h);
3626 3686
3627 ov_x = x; ov_y = y; 3687 ov_x = x; ov_y = y;
3628 ov_w = w; ov_h = h; 3688 ov_w = w; ov_h = h;
3629 3689
3630 ov_text = new text_t *[h]; 3690 ov_text = new text_t *[h];
… …
3658 *rp = r; 3718 *rp = r;
3659 } 3719 }
3660} 3720}
3661 3721
3662void 3722void
3663rxvt_term::scr_overlay_off () 3723rxvt_term::scr_overlay_off () NOTHROW
3664{ 3724{
3665 if (!ov_text) 3725 if (!ov_text)
3666 return; 3726 return;
3667 3727
3668 want_refresh = 1; 3728 want_refresh = 1;
… …
3676 delete [] ov_text; ov_text = 0; 3736 delete [] ov_text; ov_text = 0;
3677 delete [] ov_rend; ov_rend = 0; 3737 delete [] ov_rend; ov_rend = 0;
3678} 3738}
3679 3739
3680void 3740void
3681rxvt_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
3682{ 3742{
3683 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3684 return; 3744 return;
3685 3745
3686 x++, y++; 3746 x++, y++;
… …
3688 ov_text[y][x] = text; 3748 ov_text[y][x] = text;
3689 ov_rend[y][x] = rend; 3749 ov_rend[y][x] = rend;
3690} 3750}
3691 3751
3692void 3752void
3693rxvt_term::scr_overlay_set (int x, int y, const char *s) 3753rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3694{ 3754{
3695 while (*s) 3755 while (*s)
3696 scr_overlay_set (x++, y, *s++); 3756 scr_overlay_set (x++, y, *s++);
3697} 3757}
3698 3758
3699void 3759void
3700rxvt_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
3701{ 3761{
3702 while (*s) 3762 while (*s)
3703 { 3763 {
3704 text_t t = *s++; 3764 text_t t = *s++;
3705 int width = wcwidth (t); 3765 int width = WCWIDTH (t);
3706 3766
3707 while (width--) 3767 while (width--)
3708 { 3768 {
3709 scr_overlay_set (x++, y, t); 3769 scr_overlay_set (x++, y, t);
3710 t = NOCHAR; 3770 t = NOCHAR;
3711 } 3771 }
3712 } 3772 }
3713} 3773}
3714 3774
3715void 3775void
3716rxvt_term::scr_swap_overlay () 3776rxvt_term::scr_swap_overlay () NOTHROW
3717{ 3777{
3718 if (!ov_text) 3778 if (!ov_text)
3719 return; 3779 return;
3720 3780
3721 // swap screen mem with overlay 3781 // swap screen mem with overlay
3722 for (int y = ov_h; y--; ) 3782 for (int y = ov_h; y--; )
3723 { 3783 {
3724 text_t *t1 = ov_text[y]; 3784 text_t *t1 = ov_text[y];
3725 rend_t *r1 = ov_rend[y]; 3785 rend_t *r1 = ov_rend[y];
3726 3786
3727 text_t *t2 = ROW(y - view_start).t + ov_x; 3787 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3728 rend_t *r2 = ROW(y - view_start).r + ov_x; 3788 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3729 3789
3730 for (int x = ov_w; x--; ) 3790 for (int x = ov_w; x--; )
3731 { 3791 {
3732 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3792 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3733 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