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.421 by sf-exg, Sun Jun 10 13:07:56 2012 UTC

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

Diff Legend

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