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