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

Diff Legend

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