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

Diff Legend

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