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

Diff Legend

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