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.173 by root, Mon Dec 19 02:16:24 2005 UTC vs.
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC

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

Diff Legend

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