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

Diff Legend

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