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

Diff Legend

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