ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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