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.257 by root, Tue Jan 31 00:25:16 2006 UTC vs.
Revision 1.416 by root, Mon May 28 14:26:11 2012 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
36
37inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
38{ 35{
39 while (len--) 36 while (len--)
40 *start++ = value; 37 *start++ = value;
41} 38}
42 39
43/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
47 42
48/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 46#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 47 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 48 view_start = 0
54#define CLEAR_SELECTION() \ 49#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 50 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 51 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 52#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 81#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 83
89/* 84/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 85 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 86 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (xdisp, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 87#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 88 if (mapped) \
104 XClearArea (xdisp, drawBuffer, x, y, \ 89 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 90 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 91 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (xdisp, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 92
114/* ------------------------------------------------------------------------- * 93/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 94 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 95 * ------------------------------------------------------------------------- */
117 96
118/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
119void 98void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 100{
122 if (!l.t) 101 if (!l.valid ())
123 { 102 {
124 lalloc (l); 103 l.alloc ();
125 col = 0; 104 col = 0;
126 width = ncol; 105 width = ncol;
127 } 106 }
128 107
129 l.touch (); 108 l.touch ();
… …
148{ 127{
149 scr_blank_line (l, 0, ncol, efs); 128 scr_blank_line (l, 0, ncol, efs);
150 129
151 l.l = 0; 130 l.l = 0;
152 l.f = 0; 131 l.f = 0;
132}
133
134// nuke a single wide character at the given column
135void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
137{
138 // find begin
139 while (col > 0 && l.t[col] == NOCHAR)
140 col--;
141
142 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
146
147 // found start, nuke
148 do {
149 l.t[col] = ' ';
150 l.r[col] = rend;
151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR);
153} 153}
154 154
155/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158 158
159void 159void
160rxvt_term::scr_alloc ()
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for tetx_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void
160rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
161{ 195{
162#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
163 scr_overlay_off (); 197 scr_overlay_off ();
164#endif 198#endif
… …
172 if (nrow == 0) 206 if (nrow == 0)
173 nrow = 24; 207 nrow = 24;
174 208
175 if (ncol == prev_ncol && nrow == prev_nrow) 209 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 210 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 211
181 // we need at least two lines for wrapping to work correctly 212 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 213 while (nrow + saveLines < 2)
183 { 214 {
184 //TODO//FIXME 215 //TODO//FIXME
… …
193 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
194 225
195 screen.tscroll = 0; 226 screen.tscroll = 0;
196 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
197 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
198 if (!row_buf) 238 if (!prev_row_buf)
199 { 239 {
200 /* 240 /*
201 * first time called so just malloc everything: don't rely on realloc 241 * first time called so just malloc everything: don't rely on realloc
202 */ 242 */
203 top_row = 0; 243 top_row = 0;
204 term_start = 0; 244 term_start = 0;
205
206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
208
209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
212
213 for (int row = nrow; row--; )
214 {
215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
217 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
218 }
219 245
220 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
221 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
237 selection.text = NULL; 263 selection.text = NULL;
238 selection.len = 0; 264 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 265 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 266 selection.screen = PRIMARY;
241 selection.clicks = 0; 267 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 268 selection.clip_text = NULL;
269 selection.clip_len = 0;
243 } 270 }
244 else 271 else
245 { 272 {
246 /* 273 /*
247 * add or delete rows as appropriate 274 * add or delete rows as appropriate
248 */ 275 */
249 276
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
268 { 278 {
269 lresize (drawn_buf[row]);
270 lresize (swap_buf [row]);
271 }
272
273 for (int row = prev_nrow; row < nrow; row++)
274 {
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
277 } 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
278 281
279 line_t *old_buf = row_buf; 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
281 286 }
287
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
285 291
286 if (top_row) 292 if (top_row)
287 { 293 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 294 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 295 // to come up with a lean and mean algorithm.
296 // TODO: maybe optimise when width didn't change
290 297
291 row_col_t ocur = screen.cur; 298 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 300
294 do 301 do
295 { 302 {
296 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 305 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
302 307
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 309 {
305 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
306 311
307 plines++; 312 plines++;
308 llen += prev_ncol; 313 llen += prev_ncol;
… …
321 326
322 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
323 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
324 { 329 {
325 qline = row_buf + qrow; 330 qline = row_buf + qrow;
326 lalloc (*qline); 331 qline->alloc (); // redundant with next line
327 qline->l = ncol; 332 qline->l = ncol;
328 qline->is_longer (1); 333 qline->is_longer (1);
329 334
330 int qcol = 0; 335 int qcol = 0;
331 336
332 // see below for cursor adjustment rationale 337 // see below for cursor adjustment rationale
333 if (p == ocur.row) 338 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 339 screen.cur.row = q - (total_rows - nrow);
335 340
336 // fill a single destination line 341 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 342 while (lofs < llen && qcol < ncol)
338 { 343 {
339 int prow = lofs / prev_ncol; 344 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 345 int pcol = lofs % prev_ncol;
… …
346 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
347 // least. 352 // least.
348 if (prow == ocur.row) 353 if (prow == ocur.row)
349 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
350 355
351 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
352 357
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354 359
355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
366 } 371 }
367 while (p != pend && q > 0); 372 while (p != pend && q > 0);
368 373
369 term_start = total_rows - nrow; 374 term_start = total_rows - nrow;
370 top_row = q - term_start; 375 top_row = q - term_start;
371 376
372 // make sure all terminal lines exist 377 // make sure all terminal lines exist
373 while (top_row > 0) 378 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 379 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 380 }
376 else 381 else
377 { 382 {
378 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
379 384
380 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
381 { 386 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
384 389
385 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
386 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
387 } 394 }
388 395
389 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
390 {
391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
392 }
393 398
394 term_start = 0; 399 term_start = 0;
395 } 400 }
396
397 free (old_buf);
398 delete old_ta;
399 delete old_ra;
400 401
401 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
404 }
403 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
404 free (tabs); 415 free (tabs);
405 } 416 tabs = (char *)rxvt_malloc (ncol);
417
418 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0;
406 420
407 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
408 422
409 prev_nrow = nrow; 423 prev_nrow = nrow;
410 prev_ncol = ncol; 424 prev_ncol = ncol;
411 425
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 426 tt_winch ();
413 427
414 for (int col = ncol; col--; ) 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
415 tabs [col] = col % TABSIZE == 0; 429}
430
431/* ------------------------------------------------------------------------- */
432/*
433 * Free everything. That way malloc debugging can find leakage.
434 */
435void
436rxvt_term::scr_release () NOTHROW
437{
438 free (chunk);
439 free (tabs);
440}
441
442/* ------------------------------------------------------------------------- */
443/*
444 * Hard/Soft reset
445 */
446void
447rxvt_term::scr_poweron ()
448{
449 scr_release ();
450
451 row_buf = 0;
452 tabs = 0;
453 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false;
455 scr_soft_reset ();
456 scr_reset ();
457
458 scr_clear (true);
459 scr_refresh ();
460}
461
462void
463rxvt_term::scr_soft_reset () NOTHROW
464{
465 /* only affects modes, nothing drastic such as clearing the screen */
466#if ENABLE_OVERLAY
467 scr_overlay_off ();
468#endif
416 469
417 if (current_screen != PRIMARY) 470 if (current_screen != PRIMARY)
418 scr_swap_screen (); 471 scr_swap_screen ();
419 472
420 tt_winch (); 473 scr_scroll_region (0, MAX_ROWS - 1);
421 474 scr_rendition (0, ~RS_None);
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 475 scr_insert_mode (0);
423}
424
425/* ------------------------------------------------------------------------- */
426/*
427 * Free everything. That way malloc debugging can find leakage.
428 */
429void
430rxvt_term::scr_release () NOTHROW
431{
432 if (row_buf)
433 {
434 delete talloc; talloc = 0;
435 delete ralloc; ralloc = 0;
436
437 free (row_buf);
438 free (swap_buf);
439 free (drawn_buf);
440 free (tabs);
441
442 row_buf = 0; // signal that we freed all the arrays
443 }
444}
445
446/* ------------------------------------------------------------------------- */
447/*
448 * Hard reset
449 */
450void
451rxvt_term::scr_poweron ()
452{
453 scr_release ();
454 prev_nrow = prev_ncol = 0;
455 scr_reset ();
456
457 scr_clear (true);
458 scr_refresh ();
459} 476}
460 477
461/* ------------------------------------------------------------------------- * 478/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 479 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 480 * ------------------------------------------------------------------------- */
… …
501 } 518 }
502 519
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 520 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 521 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 522 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
509#endif
510} 525}
511 526
512void 527void
513rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
514{ 529{
515 if (!OPTION (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
516 return; 531 return;
517 532
518 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 534 ::swap (ROW(i), swap_buf [i]);
520 535
… …
537 return; 552 return;
538 553
539 want_refresh = 1; 554 want_refresh = 1;
540 view_start = 0; 555 view_start = 0;
541 556
542 selection_check (2); /* check for boundary cross */ 557 /* check for boundary cross */
558 row_col_t pos;
559 pos.row = pos.col = 0;
560 if (ROWCOL_IS_BEFORE (selection.beg, pos)
561 && ROWCOL_IS_AFTER (selection.end, pos))
562 CLEAR_SELECTION ();
543 563
544 int i = current_screen; current_screen = scrn; scrn = i; 564 current_screen = scrn;
545 565
546#if NSCREENS 566#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
548 { 568 {
549 num_scr = 0; 569 num_scr = 0;
550 570
551 scr_swap_screen (); 571 scr_swap_screen ();
552 572
… …
555 screen.flags |= Screen_VisibleCursor; 575 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 576 swap.flags |= Screen_VisibleCursor;
557 } 577 }
558 else 578 else
559#endif 579#endif
560 if (OPTION (Opt_secondaryScroll)) 580 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 581 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 582}
563 583
564// clear WrapNext indicator, solidifying position on next line 584// clear WrapNext indicator, solidifying position on next line
565void 585void
… …
598/* 618/*
599 * Change the rendition style for following text 619 * Change the rendition style for following text
600 */ 620 */
601void 621void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 622rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 623{
604 if (set) 624 if (set)
605 rstyle |= style; 625 rstyle |= style;
606 else if (style == ~RS_None) 626 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 627 rstyle = DEFAULT_RSTYLE;
608 else 628 else
609 rstyle &= ~style; 629 rstyle &= ~style;
610 } 630}
611 631
612/* ------------------------------------------------------------------------- */ 632/* ------------------------------------------------------------------------- */
613/* 633/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 634 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 635 * count positive ==> scroll up
… …
624 want_refresh = 1; 644 want_refresh = 1;
625 num_scr += count; 645 num_scr += count;
626 646
627 if (count > 0 647 if (count > 0
628 && row1 == 0 648 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 649 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 650 {
651 min_it (count, total_rows - (nrow - (row2 + 1)));
652
631 top_row = max (top_row - count, -saveLines); 653 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635 654
636 // sever bottommost line 655 // sever bottommost line
637 { 656 {
638 line_t &l = ROW(row2 - count); 657 line_t &l = ROW(row2);
639 l.is_longer (0); 658 l.is_longer (0);
640 l.touch (); 659 l.touch ();
641 } 660 }
642 661
662 // scroll everything up 'count' lines
663 term_start = (term_start + count) % total_rows;
664
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
643 // erase newly scrolled-in lines 677 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 678 for (int i = count; i--; )
645 { 679 {
646 line_t &l = ROW(nrow - 1 - i); 680 line_t &l = ROW(row2 - i);
647 681
648 // optimize if already cleared, can be significant on slow machines 682 // optimise if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 683 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 684 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 685 {
652 scr_blank_line (l, 0, l.l, rstyle); 686 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 687 l.l = 0;
654 l.f = 0; 688 l.f = 0;
655 } 689 }
656 else 690 else
657 scr_blank_screen_mem (l, rstyle); 691 scr_blank_screen_mem (l, rstyle);
658 } 692 }
659 693
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
671
672 // move and/or clear selection, if any 694 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen
696 && selection.beg.row <= row2)
674 { 697 {
675 selection.beg.row -= count; 698 selection.beg.row -= count;
676 selection.end.row -= count; 699 selection.end.row -= count;
677 selection.mark.row -= count; 700 selection.mark.row -= count;
678 701
679 if (selection.beg.row < top_row 702 selection_check (0);
680 || selection.end.row < top_row
681 || selection.mark.row < top_row)
682 {
683 CLEAR_ALL_SELECTION ();
684 selection.op = SELECTION_CLEAR;
685 }
686 } 703 }
687 704
688 // finally move the view window, if desired 705 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 706 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 707 && view_start != 0
691 && view_start != -saveLines) 708 && view_start != -saveLines)
692 scr_page (UP, count); 709 scr_page (UP, count);
693 710
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 711 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 729 {
713 /* move selected region too */ 730 /* move selected region too */
714 selection.beg.row -= count; 731 selection.beg.row -= count;
715 selection.end.row -= count; 732 selection.end.row -= count;
716 selection.mark.row -= count; 733 selection.mark.row -= count;
717 734
718 selection_check (0); 735 selection_check (0);
719 } 736 }
720 } 737 }
721 738
722 // use a simple and robust scrolling algorithm, this 739 // use a simple and robust scrolling algorithm, this
723 // part of scr_scroll_text is not time-critical. 740 // part of scr_scroll_text is not time-critical.
724 741
742 // sever line above scroll region
743 if (row1)
744 {
745 line_t &l = ROW(row1 - 1);
746 l.is_longer (0);
747 l.touch ();
748 }
749
725 int rows = row2 - row1 + 1; 750 int rows = row2 - row1 + 1;
726 751
727 min_it (count, rows); 752 min_it (count, rows);
728 753
729 line_t *temp_buf = row_buf + total_rows; 754 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
730 755
731 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
732 { 757 {
733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 758 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
734 759
… …
736 scr_blank_screen_mem (temp_buf [row], rstyle); 761 scr_blank_screen_mem (temp_buf [row], rstyle);
737 } 762 }
738 763
739 for (int row = 0; row < rows; row++) 764 for (int row = 0; row < rows; row++)
740 ROW(row1 + row) = temp_buf [row]; 765 ROW(row1 + row) = temp_buf [row];
766
767 // sever bottommost line
768 {
769 line_t &l = ROW(row2);
770 l.is_longer (0);
771 l.touch ();
772 }
741 } 773 }
742 774
743 return count; 775 return count;
744} 776}
745 777
… …
751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
752{ 784{
753 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
754 return; 786 return;
755 787
756 unsigned char checksel; 788 bool checksel;
757 unicode_t c; 789 unicode_t c;
758 int ncol = this->ncol; 790 int ncol = this->ncol;
759 const wchar_t *strend = str + len; 791 const wchar_t *strend = str + len;
760 792
761 want_refresh = 1; 793 want_refresh = 1;
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 806 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 807 screen.cur.row -= minlines;
776 } 808 }
777 } 809 }
778 810
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 811 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 812 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 813 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 814 int row = screen.cur.row;
785 815
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 817
788 line_t *line = &ROW(row); 818 line_t *line = &ROW(row);
789 819
790 while (str < strend) 820 while (str < strend)
791 { 821 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 822 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 823
794 if (c < 0x20) 824 if (ecb_unlikely (c < 0x20))
795 if (c == C0_LF) 825 if (c == C0_LF)
796 { 826 {
797 max_it (line->l, screen.cur.col); 827 max_it (line->l, screen.cur.col);
798 828
799 screen.flags &= ~Screen_WrapNext; 829 screen.flags &= ~Screen_WrapNext;
… …
818 { 848 {
819 scr_tab (1, true); 849 scr_tab (1, true);
820 continue; 850 continue;
821 } 851 }
822 852
853 if (ecb_unlikely (
823 if (checksel /* see if we're writing within selection */ 854 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 855 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 856 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
857 ))
826 { 858 {
827 checksel = 0; 859 checksel = 0;
828 /* 860 /*
829 * If we wrote anywhere in the selected area, kill the selection 861 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 862 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 863 * should be a similar check.
832 */ 864 */
833 CLEAR_SELECTION (); 865 CLEAR_SELECTION ();
834 } 866 }
835 867
836 if (screen.flags & Screen_WrapNext) 868 if (ecb_unlikely (screen.flags & Screen_WrapNext))
837 { 869 {
838 scr_do_wrap (); 870 scr_do_wrap ();
839 871
840 line->l = ncol; 872 line->l = ncol;
841 line->is_longer (1); 873 line->is_longer (1);
842 874
843 row = screen.cur.row; 875 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 876 line = &ROW(row); /* _must_ refresh */
845 } 877 }
846 878
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 879 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 880 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 881 c = 0xfffd;
850 882
851 // rely on wcwidth to tell us the character width, do wcwidth before 883 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 884 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 885 // drawing characters below as they might be invalid in the current
854 // locale. 886 // locale.
855 int width = WCWIDTH (c); 887 int width = WCWIDTH (c);
856 888
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 889 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 890 {
859 // vt100 special graphics and line drawing 891 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 892 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 893 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 894 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 907 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 908 width = 1; // vt100 line drawing characters are always single-width
877 } 909 }
878 } 910 }
879 911
880 if (screen.flags & Screen_Insert) 912 if (ecb_unlikely (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 913 scr_insdel_chars (width, INSERT);
882 914
883 if (width != 0) 915 if (width != 0)
884 { 916 {
885#if !UNICODE_3 917#if !UNICODE_3
… …
890# else 922# else
891 c = 0xfffd; 923 c = 0xfffd;
892# endif 924# endif
893#endif 925#endif
894 926
927 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
928
929 // if the character doesn't fit into the remaining columns...
930 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
931 {
932 if (screen.flags & Screen_Autowrap)
933 {
934 // ... artificially enlargen the previous one
935 c = NOCHAR;
936 // and try the same character next loop iteration
937 --str;
938 }
939 else
940 screen.cur.col = ncol - width;
941 }
942
895 // nuke the character at this position, if required 943 // nuke the character at this position, if required
944 // due to wonderful coincidences everywhere else in this loop
945 // we never have to check for overwriting a wide char itself,
946 // only its tail.
896 if (line->t[screen.cur.col] == NOCHAR 947 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 948 scr_kill_char (*line, screen.cur.col);
898 && line->t[screen.cur.col + 1] == NOCHAR))
899 {
900 int col = screen.cur.col;
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' ';
923 // and try the same character next loop iteration
924 --str;
925 }
926 949
927 line->touch (); 950 line->touch ();
928 951
929 do 952 do
930 { 953 {
931 line->t[screen.cur.col] = c; 954 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 955 line->r[screen.cur.col] = rend;
933 956
934 if (screen.cur.col < ncol - 1) 957 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 958 screen.cur.col++;
936 else 959 else
937 { 960 {
938 line->l = ncol; 961 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 962 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 963 screen.flags |= Screen_WrapNext;
941 break; 964
965 goto end_of_line;
942 } 966 }
943 967
944 c = NOCHAR; 968 c = NOCHAR;
945 } 969 }
946 while (--width > 0); 970 while (ecb_unlikely (--width > 0));
947 971
948 // pad with spaces when overwriting wide character with smaller one 972 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 973 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 974 {
951 line->touch (); 975 line->t[c] = ' ';
976 line->r[c] = rend;
977 }
952 978
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 979end_of_line:
980 ;
981 }
982#if ENABLE_COMBINING
983 else // width == 0
984 {
985 if (c != 0xfeff) // ignore BOM
986 {
987 // handle combining characters
988 // we just tag the accent on the previous on-screen character.
989 // this is arguably not correct, but also arguably not wrong.
990 // we don't handle double-width characters nicely yet.
991 line_t *linep;
992 text_t *tp;
993 rend_t *rp;
994
995 if (screen.cur.col > 0)
954 { 996 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 997 linep = line;
998 tp = line->t + screen.cur.col - 1;
999 rp = line->r + screen.cur.col - 1;
957 } 1000 }
1001 else if (screen.cur.row > 0
1002 && ROW(screen.cur.row - 1).is_longer ())
1003 {
1004 linep = &ROW(screen.cur.row - 1);
1005 tp = line->t + ncol - 1;
1006 rp = line->r + ncol - 1;
1007 }
1008 else
1009 continue;
1010
1011 linep->touch ();
1012
1013 while (*tp == NOCHAR && tp > linep->t)
1014 tp--, rp--;
1015
1016 // first try to find a precomposed character
1017 unicode_t n = rxvt_compose (*tp, c);
1018 if (n == NOCHAR)
1019 n = rxvt_composite.compose (*tp, c);
1020
1021 *tp = n;
1022 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 1023 }
959 } 1024 }
960 else // width == 0
961 {
962#if ENABLE_COMBINING
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 1025#endif
1000 }
1001 } 1026 }
1002 1027
1003 max_it (line->l, screen.cur.col); 1028 max_it (line->l, screen.cur.col);
1004 1029
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1030 assert (screen.cur.row >= 0);
1007#endif
1008} 1031}
1009 1032
1010/* ------------------------------------------------------------------------- */ 1033/* ------------------------------------------------------------------------- */
1011/* 1034/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1035 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1036 * XTERM_SEQ: CTRL-H
1014 */ 1037 */
1015void 1038void
1016rxvt_term::scr_backspace () NOTHROW 1039rxvt_term::scr_backspace () NOTHROW
1017{ 1040{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1041 if (screen.cur.col == 0)
1021 { 1042 {
1022 if (screen.cur.row > 0) 1043 if (screen.cur.row > 0)
1023 { 1044 {
1024#ifdef TERMCAP_HAS_BW 1045#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1046 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1047 --screen.cur.row;
1027 return; 1048
1049 want_refresh = 1;
1028#endif 1050#endif
1029 } 1051 }
1030 } 1052 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1053 else if (screen.flags & Screen_WrapNext)
1054 screen.flags &= ~Screen_WrapNext;
1055 else
1032 scr_gotorc (0, -1, RELATIVE); 1056 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1057}
1036 1058
1037/* ------------------------------------------------------------------------- */ 1059/* ------------------------------------------------------------------------- */
1038/* 1060/*
1039 * Process Horizontal Tab 1061 * Process Horizontal Tab
… …
1062 x = i; 1084 x = i;
1063 1085
1064 if (!--count) 1086 if (!--count)
1065 break; 1087 break;
1066 } 1088 }
1067 else 1089 else
1068 ht &= l.t[i] == ' ' 1090 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1091 && RS_SAME (l.r[i], base_rend);
1070 1092
1071 if (count) 1093 if (count)
1072 x = ncol - 1; 1094 x = ncol - 1;
1073 1095
1074 // store horizontal tab commands as characters inside the text 1096 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1097 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1098 if (ht && option (Opt_pastableTabs))
1077 { 1099 {
1078 base_rend = SET_FONT (base_rend, 0); 1100 base_rend = SET_FONT (base_rend, 0);
1079 1101
1080 l.touch (x); 1102 l.touch (x);
1081 1103
… …
1188 } 1210 }
1189 } 1211 }
1190 else 1212 else
1191 { 1213 {
1192 if (screen.flags & Screen_Relative) 1214 if (screen.flags & Screen_Relative)
1215 {
1193 { /* relative origin mode */ 1216 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1217 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1218 min_it (screen.cur.row, screen.bscroll);
1196 } 1219 }
1197 else 1220 else
1198 screen.cur.row = row; 1221 screen.cur.row = row;
… …
1231/* 1254/*
1232 * Erase part or whole of a line 1255 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1256 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1257 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1258 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1259 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1260 */
1237void 1261void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1262rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1263{
1240 unsigned int col, num; 1264 unsigned int col, num;
… …
1249 line.touch (); 1273 line.touch ();
1250 line.is_longer (0); 1274 line.is_longer (0);
1251 1275
1252 switch (mode) 1276 switch (mode)
1253 { 1277 {
1278 case 3:
1279 if (screen.flags & Screen_WrapNext)
1280 return;
1281
1282 /* fall through */
1283
1254 case 0: /* erase to end of line */ 1284 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1285 col = screen.cur.col;
1256 num = ncol - col; 1286 num = ncol - col;
1257 min_it (line.l, col); 1287 min_it (line.l, col);
1288
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1289 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1290 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1291 CLEAR_SELECTION ();
1261 break; 1292 break;
1293
1262 case 1: /* erase to beginning of line */ 1294 case 1: /* erase to beginning of line */
1263 col = 0; 1295 col = 0;
1264 num = screen.cur.col + 1; 1296 num = screen.cur.col + 1;
1297
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1298 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1299 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1300 CLEAR_SELECTION ();
1268 break; 1301 break;
1302
1269 case 2: /* erase whole line */ 1303 case 2: /* erase whole line */
1270 col = 0; 1304 col = 0;
1271 num = ncol; 1305 num = ncol;
1272 line.l = 0; 1306 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1307 if (selection.beg.row <= screen.cur.row
… …
1281 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1282} 1316}
1283 1317
1284/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1285/* 1319/*
1286 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1290 */ 1324 */
1291void 1325void
… …
1300 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1301 1335
1302 switch (mode) 1336 switch (mode)
1303 { 1337 {
1304 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1305 selection_check (1);
1306 scr_erase_line (0); 1339 scr_erase_line (0);
1307 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1308 num = nrow - row; 1341 num = nrow - row;
1309 break; 1342 break;
1310 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1311 selection_check (3);
1312 scr_erase_line (1); 1344 scr_erase_line (1);
1313 row = 0; 1345 row = 0;
1314 num = screen.cur.row; 1346 num = screen.cur.row;
1315 break; 1347 break;
1316 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1317 selection_check (3);
1318 row = 0; 1349 row = 0;
1319 num = nrow; 1350 num = nrow;
1320 break; 1351 break;
1321 default: 1352 default:
1322 return; 1353 return;
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1362 if (row >= nrow) /* Out Of Bounds */
1332 return; 1363 return;
1333 1364
1334 min_it (num, nrow - row); 1365 min_it (num, nrow - row);
1335 1366
1336 if (rstyle & (RS_RVid | RS_Uline)) 1367 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1368 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1369 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1370 {
1340 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1372
1373 if (mapped)
1374 XClearArea (dpy, vt, 0,
1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1376 (unsigned int)Height2Pixel (num), False);
1342 } 1377 }
1343 else 1378 else
1344 { 1379 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1381
1382 if (mapped)
1383 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1386 XFillRectangle (dpy, vt, gc,
1387 0, Row2Pixel (row - view_start),
1388 (unsigned int)vt_width,
1389 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1392 }
1351 } 1393 }
1352 1394
1353 for (; num--; row++) 1395 for (; num--; row++)
1354 { 1396 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1397 scr_blank_screen_mem (ROW(row), rstyle);
1398
1399 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1400 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1401 }
1358} 1402}
1359 1403
1360#if !ENABLE_MINIMAL 1404#if !ENABLE_MINIMAL
1361void 1405void
… …
1380 1424
1381 want_refresh = 1; 1425 want_refresh = 1;
1382 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1383 1427
1384 num_scr_allow = 0; 1428 num_scr_allow = 0;
1385 selection_check (3); 1429
1430 row_col_t pos;
1431 pos.row = pos.col = 0;
1432 if (ROWCOL_IS_AFTER (selection.end, pos))
1433 CLEAR_SELECTION ();
1386 1434
1387 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1388 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1389 { 1437 {
1390 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1435 * Insert/Delete <count> characters from the current position 1483 * Insert/Delete <count> characters from the current position
1436 */ 1484 */
1437void 1485void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1486rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1487{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1488 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1489 ZERO_SCROLLBACK ();
1445 1490
1446 if (count <= 0) 1491 if (count <= 0)
1447 return; 1492 return;
… …
1449 scr_do_wrap (); 1494 scr_do_wrap ();
1450 1495
1451 selection_check (1); 1496 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1497 min_it (count, ncol - screen.cur.col);
1453 1498
1454 row = screen.cur.row; 1499 int row = screen.cur.row;
1455 1500
1456 line_t *line = &ROW(row); 1501 line_t *line = &ROW(row);
1457 1502
1458 line->touch (); 1503 line->touch ();
1459 line->is_longer (0); 1504 line->is_longer (0);
1460 1505
1506 // nuke wide spanning the start
1507 if (line->t[screen.cur.col] == NOCHAR)
1508 scr_kill_char (*line, screen.cur.col);
1509
1461 switch (insdel) 1510 switch (insdel)
1462 { 1511 {
1463 case INSERT: 1512 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1513 line->l = min (line->l + count, ncol);
1514
1515 if (line->t[screen.cur.col] == NOCHAR)
1516 scr_kill_char (*line, screen.cur.col);
1517
1518 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1519 {
1466 line->t[col] = line->t[col - count]; 1520 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1521 line->r[col] = line->r[col - count];
1468 } 1522 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1523
1472 if (selection.op && current_screen == selection.screen 1524 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1526 {
1475 if (selection.end.row != screen.cur.row 1527 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1528 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1529 CLEAR_SELECTION ();
1478 else 1530 else
1531 {
1479 { /* shift selection */ 1532 /* shift selection */
1480 selection.beg.col += count; 1533 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1534 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1535 selection.end.col += count;
1483 } 1536 }
1484 } 1537 }
… …
1489 case ERASE: 1542 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1543 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1544 selection_check (1);
1492 screen.cur.col -= count; 1545 screen.cur.col -= count;
1493 1546
1494 line->l = max (line->l - count, 0); 1547 // nuke wide char after the end
1548 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1549 scr_kill_char (*line, screen.cur.col + count);
1550
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1551 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1552 break;
1497 1553
1498 case DELETE: 1554 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1555 line->l = max (line->l - count, 0);
1500 1556
1557 // nuke wide char spanning the end
1558 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1559 scr_kill_char (*line, screen.cur.col + count);
1560
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1561 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1562 {
1503 line->t[col] = line->t[col + count]; 1563 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1564 line->r[col] = line->r[col + count];
1505 } 1565 }
1506 1566
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1567 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1568
1510 if (selection.op && current_screen == selection.screen 1569 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1570 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1571 {
1513 if (selection.end.row != screen.cur.row 1572 if (selection.end.row != screen.cur.row
… …
1623 */ 1682 */
1624void 1683void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1684rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1685{
1627 if (mode < 0) 1686 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1687 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1688 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1689 tabs [screen.cur.col] = !!mode;
1631} 1690}
1632 1691
1633/* ------------------------------------------------------------------------- */ 1692/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1707 if (rvideo_state != on)
1649 { 1708 {
1650 rvideo_state = on; 1709 rvideo_state = on;
1651 1710
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1712#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1713 if (bg_pixmap == None)
1655#endif 1714#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1716
1661 XGCValues gcvalue; 1717 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1719 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1720 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1721
1666 scr_clear (); 1722 scr_clear ();
1667 scr_touch (true); 1723 scr_touch (true);
1668 } 1724 }
1669} 1725}
… …
1823 * Refresh the entire screen 1879 * Refresh the entire screen
1824 */ 1880 */
1825void 1881void
1826rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1827{ 1883{
1828 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1829} 1885}
1830 1886
1831/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1832/* 1888/*
1833 * Move the display so that the line represented by scrollbar value Y is at 1889 * Move the display so that the line represented by scrollbar value Y is at
… …
1871 return true; 1927 return true;
1872} 1928}
1873 1929
1874#ifndef NO_BELL 1930#ifndef NO_BELL
1875void 1931void
1876rxvt_term::bell_cb (time_watcher &w) 1932rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1933{
1878 rvideo_bell = false; 1934 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1935 scr_rvideo_mode (rvideo_mode);
1936 refresh_check ();
1880} 1937}
1881#endif 1938#endif
1882 1939
1883/* ------------------------------------------------------------------------- */ 1940/* ------------------------------------------------------------------------- */
1884void 1941void
… …
1886{ 1943{
1887#ifndef NO_BELL 1944#ifndef NO_BELL
1888 1945
1889# ifndef NO_MAPALERT 1946# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1947# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1948 if (option (Opt_mapAlert))
1892# endif 1949# endif
1893 XMapWindow (xdisp, parent[0]); 1950 XMapWindow (dpy, parent);
1894# endif 1951# endif
1895 1952
1953# if ENABLE_FRILLS
1954 if (option (Opt_urgentOnBell))
1955 set_urgency (1);
1956# endif
1957
1896 if (OPTION (Opt_visualBell)) 1958 if (option (Opt_visualBell))
1897 { 1959 {
1898 rvideo_bell = true; 1960 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1961 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1962 flush ();
1901 1963
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1964 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1965 }
1904 else 1966 else
1905 XBell (xdisp, 0); 1967 XBell (dpy, 0);
1906 1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907#endif 1969#endif
1908} 1970}
1909 1971
1910/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */
1912void 1973void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1974rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1975{
1915#ifdef PRINTPIPE 1976#ifdef PRINTPIPE
1916 int nrows, row_start; 1977 int nrows, row_start;
1917 FILE *fd; 1978 FILE *fd = popen_printer ();
1918 1979
1919 if ((fd = popen_printer ()) == NULL) 1980 if (!fd)
1920 return; 1981 return;
1921 1982
1922 if (fullhist) 1983 if (fullhist)
1923 { 1984 {
1924 nrows = nrow - top_row; 1985 nrows = nrow - top_row;
… …
1930 row_start = view_start; 1991 row_start = view_start;
1931 } 1992 }
1932 1993
1933 wctomb (0, 0); 1994 wctomb (0, 0);
1934 1995
1935 for (int r1 = 0; r1 < nrows; r1++) 1996 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936 { 1997 {
1937 text_t *tp = ROW(r1).t; 1998 text_t *tp = ROW(r1).t;
1938 int len = ROW(r1).l; 1999 int len = ROW(r1).l;
1939 2000
1940 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2001 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1969 * screen.text/screen.rend contain what the screen will change to. 2030 * screen.text/screen.rend contain what the screen will change to.
1970 */ 2031 */
1971void 2032void
1972rxvt_term::scr_refresh () NOTHROW 2033rxvt_term::scr_refresh () NOTHROW
1973{ 2034{
1974 unsigned char must_clear, /* use draw_string not draw_image_string */
1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 2035 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 2036 ocrow; /* old cursor row */
1978 int i; /* tmp */ 2037 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2038#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2039 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 2040#endif
1982 rend_t *crp; // cursor rendition pointer 2041 rend_t *crp; // cursor rendition pointer
2042 rend_t ccol1, /* Cursor colour */
2043 ccol2; /* Cursor colour2 */
1983 2044
1984 want_refresh = 0; /* screen is current */ 2045 want_refresh = 0; /* screen is current */
1985 2046
1986 if (refresh_type == NO_REFRESH || !mapped) 2047 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2048 return;
1988 2049
1989 /* 2050 /*
1990 * A: set up vars 2051 * A: set up vars
1991 */ 2052 */
1992 must_clear = 0;
1993 refresh_count = 0; 2053 refresh_count = 0;
1994 2054
1995#if XPM_BACKGROUND 2055 unsigned int old_screen_flags = screen.flags;
1996 must_clear |= bgPixmap.pixmap != None; 2056 bool have_bg = 0;
1997#endif 2057#ifdef HAVE_BG_PIXMAP
1998#if TRANSPARENT 2058 have_bg = bg_pixmap != None;
1999 must_clear |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2059#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2061
2003 /* 2062 /*
2004 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
2005 */ 2064 */
2006 scr_reverse_selection (); 2065 scr_reverse_selection ();
2007 2066
2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2068#if ENABLE_OVERLAY
2069 scr_swap_overlay ();
2070#endif
2071
2072 bool showcursor = screen.flags & Screen_VisibleCursor;
2073
2008 /* 2074 /*
2009 * C: set the cursor character (s) 2075 * C: set the cursor character (s)
2010 */ 2076 */
2011 { 2077 {
2012 unsigned char setoldcursor; 2078 bool setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2079
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2081 if (hidden_cursor)
2019 showcursor = 0; 2082 showcursor = 0;
2020#endif 2083#endif
2021 2084
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2090 col--;
2028 2091
2029 crp = &ROW(screen.cur.row).r[col]; 2092 crp = &ROW(screen.cur.row).r[col];
2030 2093
2031 if (showcursor && focus) 2094#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor;
2098 else
2099#endif
2100#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2101 ccol1 = fgcolor_of (rstyle);
2102#else
2103 ccol1 = Color_fg;
2104#endif
2105
2106#ifndef NO_CURSORCOLOR
2107 if (ISSET_PIXCOLOR (Color_cursor2))
2108 ccol2 = Color_cursor2;
2109 else
2110#endif
2111#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2112 ccol2 = bgcolor_of (rstyle);
2113#else
2114 ccol2 = Color_bg;
2115#endif
2116
2117 if (focus)
2032 { 2118 {
2033 if (OPTION (Opt_cursorUnderline)) 2119 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2120 *crp ^= RS_Uline;
2035 else 2121 else
2036 { 2122 {
2037 *crp ^= RS_RVid; 2123 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2124 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2125 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2126 }
2061 } 2127 }
2062 } 2128 }
2063 2129
2064 /* make sure no outline cursor is left around */ 2130 /* make sure no outline cursor is left around */
… …
2091 oldcursor.col = screen.cur.col; 2157 oldcursor.col = screen.cur.col;
2092 } 2158 }
2093 } 2159 }
2094 } 2160 }
2095 2161
2096 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2097#if ENABLE_OVERLAY
2098 scr_swap_overlay ();
2099#endif
2100
2101#ifndef NO_SLOW_LINK_SUPPORT 2162#ifndef NO_SLOW_LINK_SUPPORT
2102 /* 2163 /*
2103 * D: CopyArea pass - very useful for slower links 2164 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2165 * This has been deliberately kept simple.
2105 */ 2166 */
2106 if (!display->is_local 2167 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2168 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !must_clear) 2169 && abs (num_scr) < nrow && !have_bg)
2109 { 2170 {
2110 int16_t nits; 2171 int16_t nits;
2172 int i = num_scr;
2111 int j; 2173 int j;
2112 int len, wlen; 2174 int len, wlen;
2113 dLocal (int, num_scr);
2114 2175
2115 j = nrow; 2176 j = nrow;
2116 wlen = len = -1; 2177 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2179
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2180 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2181 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2182 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2183 {
2122 line_t s = ROW(view_start + row); 2184 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2205 wlen = row;
2144 continue; 2206 continue;
2145 } 2207 }
2146 } 2208 }
2147 2209
2148 if (len != -1) 2210 if (len >= 0)
2149 { 2211 {
2150 /* also comes here at end if needed because of >= above */ 2212 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2213 if (wlen < len)
2152 ::swap (wlen, len); 2214 ::swap (wlen, len);
2153 2215
2216 XGCValues gcv;
2217
2218 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154 XCopyArea (xdisp, vt, vt, 2219 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2220 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2221 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2222 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2223 0, Row2Pixel (len));
2224 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2225
2159 len = -1; 2226 len = -1;
2160 } 2227 }
2161 } 2228 }
2162 } 2229 }
2163#endif 2230#endif
… …
2187 continue; 2254 continue;
2188 2255
2189 // redraw one or more characters 2256 // redraw one or more characters
2190 2257
2191 // seek to the beginning of wide characters 2258 // seek to the beginning of wide characters
2192 while (stp[col] == NOCHAR && col > 0) 2259 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2193 --col; 2260 --col;
2194 2261
2195 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2262 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2196 text_t *text = stp + col; 2263 text_t *text = stp + col;
2197 int count = 1; 2264 int count = 1;
2198 2265
2199 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2200 drp[col] = rend; 2267 drp[col] = rend;
… …
2204 for (i = 0; ++col < ncol; ) 2271 for (i = 0; ++col < ncol; )
2205 { 2272 {
2206 if (stp[col] == NOCHAR) 2273 if (stp[col] == NOCHAR)
2207 { 2274 {
2208 dtp[col] = stp[col]; 2275 dtp[col] = stp[col];
2209 drp[col] = rend; 2276 drp[col] = srp[col];
2277
2210 count++; 2278 count++;
2211 i++; 2279 i++;
2212 2280
2213 continue; 2281 continue;
2214 } 2282 }
… …
2219 count++; 2287 count++;
2220 2288
2221 if (stp[col] != dtp[col] 2289 if (stp[col] != dtp[col]
2222 || !RS_SAME (srp[col], drp[col])) 2290 || !RS_SAME (srp[col], drp[col]))
2223 { 2291 {
2224 if (must_clear && (i++ > count / 2)) 2292 if (have_bg && (i++ > count / 2))
2225 break; 2293 break;
2226 2294
2227 dtp[col] = stp[col]; 2295 dtp[col] = stp[col];
2228 drp[col] = rend; 2296 drp[col] = rend;
2229 i = 0; 2297 i = 0;
2230 } 2298 }
2231 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2299 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232 break; 2300 break;
2233 } 2301 }
2234 2302
2235 col--; /* went one too far. move back */ 2303 col--; /* went one too far. move back */
2236 count -= i; /* dump any matching trailing chars */ 2304 count -= i; /* dump any matching trailing chars */
2237 2305
2238 // sometimes we optimize away the trailing NOCHAR's, add them back 2306 // sometimes we optimize away the trailing NOCHAR's, add them back
2239 while (i && text[count] == NOCHAR) 2307 while (ecb_unlikely (i && text[count] == NOCHAR))
2240 count++, i--; 2308 count++, i--;
2241 2309
2242 /* 2310 /*
2243 * Determine the attributes for the string 2311 * Determine the attributes for the string
2244 */ 2312 */
2245 int fore = fgcolor_of (rend); // desired foreground 2313 int fore = fgcolor_of (rend); // desired foreground
2246 int back = bgcolor_of (rend); // desired background 2314 int back = bgcolor_of (rend); // desired background
2247 2315
2248 // only do special processing if any attributes are set, which is unlikely 2316 // only do special processing if any attributes are set, which is unlikely
2249 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2317 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2250 { 2318 {
2251#if ENABLE_STYLES
2252 // "careful" (too wide) character handling
2253
2254 // include previous careful character(s) if possible, looks nicer (best effort...)
2255 while (text > stp
2256 && srp[text - stp - 1] & RS_Careful
2257 && RS_SAME (rend, srp[text - stp - 1]))
2258 text--, count++, xpixel -= fwidth;
2259
2260 // force redraw after "careful" characters to avoid pixel droppings
2261 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2262 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2263
2264 // force redraw before "careful" characters to avoid pixel droppings
2265 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2266 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2267#endif
2268
2269 bool invert = rend & RS_RVid; 2319 bool invert = rend & RS_RVid;
2270 2320
2271#ifndef NO_BOLD_UNDERLINE_REVERSE 2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2272 if (rend & RS_Bold
2273 && fore == Color_fg) 2322 if (rend & RS_Bold && fore == Color_fg)
2274 { 2323 {
2275 if (ISSET_PIXCOLOR (Color_BD)) 2324 if (ISSET_PIXCOLOR (Color_BD))
2276 fore = Color_BD; 2325 fore = Color_BD;
2277# if !ENABLE_STYLES 2326# if !ENABLE_STYLES
2278 else 2327 else
2279 invert = !invert; 2328 invert = !invert;
2280# endif 2329# endif
2281 } 2330 }
2282 2331
2283 if (rend & RS_Italic 2332 if (rend & RS_Italic && fore == Color_fg)
2284 && fore == Color_fg)
2285 { 2333 {
2286 if (ISSET_PIXCOLOR (Color_IT)) 2334 if (ISSET_PIXCOLOR (Color_IT))
2287 fore = Color_IT; 2335 fore = Color_IT;
2288# if !ENABLE_STYLES 2336# if !ENABLE_STYLES
2289 else 2337 else
2290 invert = !invert; 2338 invert = !invert;
2291# endif 2339# endif
2292 } 2340 }
2293 2341
2294 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2342 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2343 fore = Color_UL;
2344#endif
2345
2346#ifdef OPTION_HC
2347 if (rend & RS_Sel)
2348 {
2349 /* invert the column if no highlightColor is set or it is the
2350 * current cursor column */
2351 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2352 && ISSET_PIXCOLOR (Color_HC))
2353 {
2354 if (ISSET_PIXCOLOR (Color_HTC))
2355 fore = Color_HTC;
2356 // if invert is 0 reverse video is set so we use bg color as fg color
2357 else if (!invert)
2358 fore = back;
2359
2360 back = Color_HC;
2361 invert = 0;
2362 }
2363 }
2296#endif 2364#endif
2297 2365
2298 if (invert) 2366 if (invert)
2299 { 2367 {
2300 ::swap (fore, back); 2368 ::swap (fore, back);
2301 2369
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2370#ifndef NO_BOLD_UNDERLINE_REVERSE
2303 if (ISSET_PIXCOLOR (Color_RV))
2304 back = Color_RV;
2305
2306 if (fore == back) 2371 if (fore == back)
2307 { 2372 {
2308 fore = Color_bg; 2373 fore = Color_bg;
2309 back = Color_fg; 2374 back = Color_fg;
2310 } 2375 }
… …
2312 } 2377 }
2313 2378
2314#ifdef TEXT_BLINK 2379#ifdef TEXT_BLINK
2315 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2380 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2316 { 2381 {
2317 if (!text_blink_ev.active) 2382 if (!text_blink_ev.is_active ())
2318 { 2383 {
2319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2384 text_blink_ev.again ();
2320 hidden_text = 0; 2385 hidden_text = 0;
2321 } 2386 }
2322 else if (hidden_text) 2387 else if (hidden_text)
2323 fore = back; 2388 fore = back;
2324 } 2389 }
2325#endif 2390#endif
2391
2392#if ENABLE_STYLES
2393 // "careful" (too wide) character handling
2394
2395 // include previous careful character(s) if possible, looks nicer (best effort...)
2396 while (text > stp
2397 && srp[text - stp - 1] & RS_Careful
2398 && RS_SAME (rend, srp[text - stp - 1]))
2399 text--, count++, xpixel -= fwidth;
2400
2401 // force redraw after "careful" characters to avoid pixel droppings
2402 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2403 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2404
2405 // force redraw before "careful" characters to avoid pixel droppings
2406 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2407 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2408#endif
2326 } 2409 }
2327 2410
2328 /* 2411 /*
2329 * Actually do the drawing of the string here 2412 * Actually do the drawing of the string here
2330 */ 2413 */
2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2414 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332 2415
2333 if (back == fore) 2416 if (ecb_likely (have_bg && back == Color_bg))
2334 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2335 else if (back == Color_bg)
2336 { 2417 {
2337 if (must_clear) 2418 // this is very ugly, maybe push it into ->draw?
2338 {
2339 CLEAR_CHARS (xpixel, ypixel, count);
2340 2419
2341 for (i = 0; i < count; i++) /* don't draw empty strings */ 2420 for (i = 0; i < count; i++) /* don't draw empty strings */
2342 if (text[i] != ' ') 2421 if (text[i] != ' ')
2343 { 2422 {
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2345 break; 2424 goto did_clear;
2346 }
2347 } 2425 }
2348 else 2426
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2427 CLEAR_CHARS (xpixel, ypixel, count);
2428 did_clear: ;
2350 } 2429 }
2351 else 2430 else
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2353 2432
2354 if (rend & RS_Uline && font->descent > 1 && fore != back) 2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2355 { 2434 {
2356#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2357 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2358 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2359 else 2438 else
2360#endif 2439#endif
2361 XSetForeground (xdisp, gc, pix_colors[fore]); 2440 XSetForeground (dpy, gc, pix_colors[fore]);
2362 2441
2363 XDrawLine (xdisp, drawBuffer, gc, 2442 XDrawLine (dpy, vt, gc,
2364 xpixel, ypixel + font->ascent + 1, 2443 xpixel, ypixel + font->ascent + 1,
2365 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2444 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2366 } 2445 }
2367 } /* for (col....) */ 2446 } /* for (col....) */
2368 } /* for (row....) */ 2447 } /* for (row....) */
2369 2448
2370#if ENABLE_OVERLAY
2371 scr_swap_overlay ();
2372#endif
2373 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2374
2375 /* 2449 /*
2376 * G: cleanup cursor and display outline cursor if necessary 2450 * G: cleanup cursor and display outline cursor if necessary
2377 */ 2451 */
2378 if (showcursor) 2452 if (showcursor)
2379 { 2453 {
2380 if (focus) 2454 if (focus)
2381 { 2455 {
2382 if (OPTION (Opt_cursorUnderline)) 2456 if (option (Opt_cursorUnderline))
2383 *crp ^= RS_Uline; 2457 *crp ^= RS_Uline;
2384 else 2458 else
2385 { 2459 {
2386 *crp ^= RS_RVid; 2460 *crp ^= RS_RVid;
2387#ifndef NO_CURSORCOLOR 2461#ifndef NO_CURSORCOLOR
… …
2401 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2475 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2402 cursorwidth++; 2476 cursorwidth++;
2403 2477
2404#ifndef NO_CURSORCOLOR 2478#ifndef NO_CURSORCOLOR
2405 if (ISSET_PIXCOLOR (Color_cursor)) 2479 if (ISSET_PIXCOLOR (Color_cursor))
2406 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2480 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2481 else
2407#endif 2482#endif
2483 XSetForeground (dpy, gc, pix_colors[ccol1]);
2408 2484
2409 XDrawRectangle (xdisp, drawBuffer, gc, 2485 XDrawRectangle (dpy, vt, gc,
2410 Col2Pixel (col), 2486 Col2Pixel (col),
2411 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2412 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2413 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2414 } 2490 }
2415 } 2491 }
2416 2492
2417 /* 2493 /*
2418 * H: cleanup selection 2494 * H: cleanup selection
2419 */ 2495 */
2496#if ENABLE_OVERLAY
2497 scr_swap_overlay ();
2498#endif
2499 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2500
2420 scr_reverse_selection (); 2501 scr_reverse_selection ();
2421 2502
2503 screen.flags = old_screen_flags;
2422 num_scr = 0; 2504 num_scr = 0;
2423 num_scr_allow = 1; 2505 num_scr_allow = 1;
2424} 2506}
2425 2507
2426void 2508void
2427rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2428{ 2510{
2429 if (!l.t) 2511 if (!l.valid ())
2430 return; 2512 return;
2431 2513
2432 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2433 2515
2434 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
… …
2447 scr_remap_chars (swap_buf [i]); 2529 scr_remap_chars (swap_buf [i]);
2448 } 2530 }
2449} 2531}
2450 2532
2451void 2533void
2452rxvt_term::scr_recolour () NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2453{ 2535{
2454 if (1 2536 bool transparent = false;
2455#if TRANSPARENT 2537
2456 && !am_transparent 2538#ifdef HAVE_BG_PIXMAP
2539 if (bg_pixmap != None)
2540 {
2541# ifdef ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT)
2543 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2546
2547 transparent = true;
2548 }
2549 else
2457#endif 2550# endif
2458#if XPM_BACKGROUND
2459 && !bgPixmap.pixmap
2460#endif
2461 ) 2551 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2554 }
2462 { 2555 }
2556 else
2557#endif
2558 {
2463 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2464 XClearWindow (xdisp, parent[0]);
2465 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2560 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2466#if HAVE_SCROLLBARS 2561 }
2562
2563 XClearWindow (dpy, parent);
2564
2467 if (scrollBar.win) 2565 if (scrollBar.win)
2468 { 2566 {
2567 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else
2469 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2470 scrollBar.setIdle (); 2571 scrollBar.state = SB_STATE_IDLE;
2471 scrollbar_show (0); 2572 scrollBar.show (0);
2472 } 2573 }
2473#endif 2574
2575 if (refresh)
2474 } 2576 {
2475
2476 scr_clear (); 2577 scr_clear ();
2477 scr_touch (true); 2578 scr_touch (true);
2579 }
2478 want_refresh = 1; 2580 want_refresh = 1;
2479} 2581}
2480 2582
2481/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2482void 2584void
… …
2487 2589
2488 num_scr_allow = 0; 2590 num_scr_allow = 0;
2489 want_refresh = 1; 2591 want_refresh = 1;
2490 2592
2491 if (really) 2593 if (really)
2492 XClearWindow (xdisp, vt); 2594 XClearWindow (dpy, vt);
2493} 2595}
2494 2596
2495void 2597void
2496rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2598rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2497{ 2599{
… …
2550 { 2652 {
2551#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2552 if (selection.rect) 2654 if (selection.rect)
2553 scr_xor_rect (selection.beg.row, selection.beg.col, 2655 scr_xor_rect (selection.beg.row, selection.beg.col,
2554 selection.end.row, selection.end.col, 2656 selection.end.row, selection.end.col,
2555 RS_RVid, RS_RVid | RS_Uline); 2657 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2556 else 2658 else
2557#endif 2659#endif
2558 scr_xor_span (selection.beg.row, selection.beg.col, 2660 scr_xor_span (selection.beg.row, selection.beg.col,
2559 selection.end.row, selection.end.col, 2661 selection.end.row, selection.end.col,
2560 RS_RVid); 2662 RS_Sel | RS_RVid);
2561 } 2663 }
2562} 2664}
2563 2665
2564/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2565/* 2667/*
… …
2568 */ 2670 */
2569#if 0 2671#if 0
2570void 2672void
2571rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2572{ 2674{
2573 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2574 unsigned int width, towrite; 2676 // relevant code in scr_printscreen
2575 char r1[] = "\n";
2576
2577 for (row = saveLines - nsaved;
2578 row < saveLines + nrow - 1; row++)
2579 {
2580 width = row_buf[row].l >= 0 ? row_buf[row].l
2581 : ncol;
2582 for (towrite = width; towrite; towrite -= wrote)
2583 {
2584 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2585 towrite);
2586 if (wrote < 0)
2587 return; /* XXX: death, no report */
2588 }
2589 if (row_buf[row].l >= 0)
2590 if (write (fd, r1, 1) <= 0)
2591 return; /* XXX: death, no report */
2592 }
2593} 2677}
2594#endif 2678#endif
2595 2679
2596/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2597 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
2598 * ------------------------------------------------------------------------- */ 2682 * ------------------------------------------------------------------------- */
2599void 2683void
2600rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2601{ 2685{
2602 row_col_t pos;
2603
2604 if (!selection.op) 2686 if (!selection.op)
2605 return; 2687 return;
2606 2688
2607 pos.row = pos.col = 0;
2608 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2609 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2610 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2611 || (check_more == 1 2692 || (check_more == 1
2612 && current_screen == selection.screen 2693 && current_screen == selection.screen
2613 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2614 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2615 || (check_more == 2
2616 && ROWCOL_IS_BEFORE (selection.beg, pos)
2617 && ROWCOL_IS_AFTER (selection.end, pos))
2618 || (check_more == 3
2619 && ROWCOL_IS_AFTER (selection.end, pos))
2620 || (check_more == 4 /* screen width change */
2621 && (selection.beg.row != selection.end.row
2622 || selection.end.col > ncol)))
2623 CLEAR_SELECTION (); 2696 CLEAR_ALL_SELECTION ();
2624} 2697}
2625 2698
2626/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2627/* 2700/*
2628 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
2629 */ 2702 */
2630void 2703void
2631rxvt_term::paste (char *data, unsigned int len) NOTHROW 2704rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2632{ 2705{
2633 /* convert normal newline chars into common keyboard Return key sequence */ 2706 /* convert normal newline chars into common keyboard Return key sequence */
2634 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2635 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2636 data[i] = C0_CR; 2709 data[i] = C0_CR;
2637 2710
2711 if (priv_modes & PrivMode_BracketPaste)
2712 tt_printf ("\x1b[200~");
2713
2638 tt_write (data, len); 2714 tt_write (data, len);
2639}
2640 2715
2641/* ------------------------------------------------------------------------- */ 2716 if (priv_modes & PrivMode_BracketPaste)
2642/* 2717 tt_printf ("\x1b[201~");
2643 * Respond to a notification that a primary selection has been sent
2644 * EXT: SelectionNotify
2645 */
2646void
2647rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2648{
2649 if (prop == None) /* check for failed XConvertSelection */
2650 {
2651 if ((selection_type & Sel_CompoundText))
2652 {
2653 int selnum = selection_type & Sel_whereMask;
2654
2655 selection_type = 0;
2656 if (selnum != Sel_direct)
2657 selection_request_other (XA_STRING, selnum);
2658 }
2659
2660 if ((selection_type & Sel_UTF8String))
2661 {
2662 int selnum = selection_type & Sel_whereMask;
2663
2664 selection_type = Sel_CompoundText;
2665 if (selnum != Sel_direct)
2666 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2667 else
2668 selection_type = 0;
2669 }
2670
2671 return;
2672 }
2673
2674 unsigned long bytes_after;
2675 XTextProperty ct;
2676
2677 if (XGetWindowProperty (xdisp, win, prop,
2678 0, PROP_SIZE / 4,
2679 delete_prop, AnyPropertyType,
2680 &ct.encoding, &ct.format,
2681 &ct.nitems, &bytes_after,
2682 &ct.value) != Success)
2683 {
2684 ct.value = 0;
2685 goto bailout;
2686 }
2687
2688 if (ct.encoding == None)
2689 goto bailout;
2690
2691 if (bytes_after)
2692 {
2693 // fetch and append remaining data
2694 XTextProperty ct2;
2695
2696 if (XGetWindowProperty (xdisp, win, prop,
2697 ct.nitems / 4, (bytes_after + 3) / 4,
2698 delete_prop, AnyPropertyType,
2699 &ct2.encoding, &ct2.format,
2700 &ct2.nitems, &bytes_after,
2701 &ct2.value) != Success)
2702 goto bailout;
2703
2704 // realloc should be compatible to XFree, here, and elsewhere, too
2705 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2706 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2707 ct.nitems += ct2.nitems;
2708
2709 XFree (ct2.value);
2710 }
2711
2712 if (ct.value == 0)
2713 goto bailout;
2714
2715 if (ct.encoding == xa[XA_INCR])
2716 {
2717 // INCR selection, start handshake
2718 if (!delete_prop)
2719 XDeleteProperty (xdisp, win, prop);
2720
2721 selection_wait = Sel_incr;
2722 incr_buf_fill = 0;
2723 incr_ev.start (NOW + 10);
2724
2725 goto bailout;
2726 }
2727
2728 if (ct.nitems == 0)
2729 {
2730 if (selection_wait == Sel_incr)
2731 {
2732 XFree (ct.value);
2733
2734 // finally complete, now paste the whole thing
2735 selection_wait = Sel_normal;
2736 ct.value = (unsigned char *)incr_buf;
2737 ct.nitems = incr_buf_fill;
2738 incr_buf = 0;
2739 incr_buf_size = 0;
2740 incr_ev.stop ();
2741 }
2742 else
2743 {
2744 if (selection_wait == Sel_normal
2745 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2746 {
2747 /*
2748 * pass through again trying CUT_BUFFER0 if we've come from
2749 * XConvertSelection () but nothing was presented
2750 */
2751 selection_paste (display->root, XA_CUT_BUFFER0, False);
2752 }
2753
2754 goto bailout;
2755 }
2756 }
2757 else if (selection_wait == Sel_incr)
2758 {
2759 incr_ev.start (NOW + 10);
2760
2761 while (incr_buf_fill + ct.nitems > incr_buf_size)
2762 {
2763 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2764 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2765 }
2766
2767 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2768 incr_buf_fill += ct.nitems;
2769
2770 goto bailout;
2771 }
2772
2773 char **cl;
2774 int cr;
2775
2776#if !ENABLE_MINIMAL
2777 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2778 // so recode it manually
2779 if (ct.encoding == xa[XA_UTF8_STRING])
2780 {
2781 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2782 char *s = rxvt_wcstombs (w);
2783 free (w);
2784 // TODO: strlen == only the first element will be converted. well...
2785 paste (s, strlen (s));
2786 free (s);
2787 }
2788 else
2789#endif
2790 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2791 && cl)
2792 {
2793 for (int i = 0; i < cr; i++)
2794 paste (cl[i], strlen (cl[i]));
2795
2796 XFreeStringList (cl);
2797 }
2798 else
2799 paste ((char *)ct.value, ct.nitems); // paste raw
2800
2801bailout:
2802 XFree (ct.value);
2803
2804 if (selection_wait == Sel_normal)
2805 selection_wait = Sel_none;
2806} 2718}
2807 2719
2808void 2720void
2809rxvt_term::incr_cb (time_watcher &w) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2810{ 2722{
2811 selection_wait = Sel_none; 2723 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2812
2813 incr_buf_size = 0;
2814 free (incr_buf);
2815
2816 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2817}
2818
2819void
2820rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2821{
2822 if (prop == None || selection_wait != Sel_incr)
2823 return; 2724 return;
2824 2725
2825 selection_paste (win, prop, true); 2726 tt_paste (data, len);
2826} 2727}
2827 2728
2828/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2829/* 2730/*
2830 * Request the current selection: 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2831 * Order: > internal selection if available 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2832 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2733 * as fallback
2833 * > CUT_BUFFER0
2834 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2835 * will auto fallback to CUT_BUFFER0
2836 * EXT: button 2 release 2734 * EXT: button 2 release
2837 */ 2735 */
2838void 2736void
2839rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2840{ 2738{
2841 if (selection.text && selnum == Sel_Primary) 2739 if (!selection_req)
2842 { /* internal selection */
2843 char *str = rxvt_wcstombs (selection.text, selection.len);
2844 paste (str, strlen (str));
2845 free (str);
2846 return;
2847 } 2740 {
2848 else 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2742 selection_req->run ();
2849 { 2743 }
2850 selection_request_time = tm;
2851 selection_wait = Sel_normal;
2852
2853#if X_HAVE_UTF8_STRING
2854 selection_type = Sel_UTF8String;
2855 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2856 return;
2857#else
2858 selection_type = Sel_CompoundText;
2859 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2860 return;
2861#endif
2862 }
2863
2864 selection_wait = Sel_none; /* don't loop in selection_paste () */
2865 selection_paste (display->root, XA_CUT_BUFFER0, false);
2866}
2867
2868int
2869rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2870{
2871 Atom sel;
2872
2873 selection_type |= selnum;
2874
2875 if (selnum == Sel_Primary)
2876 sel = XA_PRIMARY;
2877 else if (selnum == Sel_Secondary)
2878 sel = XA_SECONDARY;
2879 else
2880 sel = xa[XA_CLIPBOARD];
2881
2882 if (XGetSelectionOwner (xdisp, sel) != None)
2883 {
2884 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2885 vt, selection_request_time);
2886 return 1;
2887 }
2888
2889 return 0;
2890} 2744}
2891 2745
2892/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2893/* 2747/*
2894 * Clear all selected text 2748 * Clear all selected text
2895 * EXT: SelectionClear 2749 * EXT: SelectionClear
2896 */ 2750 */
2897void 2751void
2898rxvt_term::selection_clear () NOTHROW 2752rxvt_term::selection_clear (bool clipboard) NOTHROW
2899{ 2753{
2754 if (!clipboard)
2755 {
2900 want_refresh = 1; 2756 want_refresh = 1;
2901 free (selection.text); 2757 free (selection.text);
2902 selection.text = NULL; 2758 selection.text = NULL;
2903 selection.len = 0; 2759 selection.len = 0;
2904 CLEAR_SELECTION (); 2760 CLEAR_SELECTION ();
2905 2761
2906 if (display->selection_owner == this) 2762 if (display->selection_owner == this)
2907 display->selection_owner = 0; 2763 display->selection_owner = 0;
2764 }
2765 else
2766 {
2767 free (selection.clip_text);
2768 selection.clip_text = NULL;
2769 selection.clip_len = 0;
2770
2771 if (display->clipboard_owner == this)
2772 display->clipboard_owner = 0;
2773 }
2908} 2774}
2909 2775
2910/* ------------------------------------------------------------------------- */ 2776/* ------------------------------------------------------------------------- */
2911/* 2777/*
2912 * Copy a selection into the cut buffer 2778 * Copy a selection into the cut buffer
2913 * EXT: button 1 or 3 release 2779 * EXT: button 1 or 3 release
2914 */ 2780 */
2915void 2781void
2916rxvt_term::selection_make (Time tm) 2782rxvt_term::selection_make (Time tm)
2917{ 2783{
2918 int i; 2784 int size;
2919 wchar_t *new_selection_text; 2785 wchar_t *new_selection_text;
2920 text_t *t; 2786 text_t *t;
2921 2787
2922 switch (selection.op) 2788 switch (selection.op)
2923 { 2789 {
… …
2939 return; /* nothing selected, go away */ 2805 return; /* nothing selected, go away */
2940 2806
2941 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2807 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2942 return; 2808 return;
2943 2809
2944 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2810 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2945 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2811 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2946 2812
2947 int ofs = 0; 2813 int ofs = 0;
2948 int extra = 0; 2814 int extra = 0;
2949 2815
2950 int col = selection.beg.col; 2816 int col = selection.beg.col;
… …
2956 { 2822 {
2957#if !ENABLE_MINIMAL 2823#if !ENABLE_MINIMAL
2958 if (selection.rect) 2824 if (selection.rect)
2959 { 2825 {
2960 col = selection.beg.col; 2826 col = selection.beg.col;
2961 end_col = ncol + 1; 2827 end_col = selection.end.col;
2962 } 2828 }
2963 else 2829 else
2964#endif 2830#endif
2965 end_col = ROW(row).l; 2831 end_col = ROW(row).l;
2966 2832
2967 col = max (col, 0); 2833 col = max (col, 0);
2968 2834
2969 if (row == selection.end.row 2835 if (row == selection.end.row)
2970#if !ENABLE_MINIMAL
2971 || selection.rect
2972#endif
2973 )
2974 min_it (end_col, selection.end.col); 2836 min_it (end_col, selection.end.col);
2975 2837
2976 t = ROW(row).t + col; 2838 t = ROW(row).t + col;
2977 2839
2978 for (; col < end_col; col++) 2840 for (; col < end_col; col++)
… …
2986 2848
2987 extra -= (len - 1); 2849 extra -= (len - 1);
2988 2850
2989 if (extra < 0) 2851 if (extra < 0)
2990 { 2852 {
2991 extra += i; 2853 extra += size;
2992 i += i; 2854 size += size;
2993 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2855 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2994 } 2856 }
2995 2857
2996 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2858 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2997 } 2859 }
2998#endif 2860#endif
… …
3010 2872
3011 new_selection_text[ofs++] = C0_LF; 2873 new_selection_text[ofs++] = C0_LF;
3012 } 2874 }
3013 else 2875 else
3014#endif 2876#endif
3015 if (!ROW(row).is_longer () && row != selection.end.row) 2877 if (!ROW(row).is_longer ()
2878 && (row != selection.end.row || end_col != selection.end.col)
2879 && (row != selection.beg.row || selection.beg.col < ncol))
3016 new_selection_text[ofs++] = C0_LF; 2880 new_selection_text[ofs++] = C0_LF;
3017 } 2881 }
3018
3019 if (end_col != selection.end.col)
3020 new_selection_text[ofs++] = C0_LF;
3021 2882
3022 new_selection_text[ofs] = 0; 2883 new_selection_text[ofs] = 0;
3023 2884
3024 if (ofs == 0) 2885 if (ofs == 0)
3025 { 2886 {
… …
3038 2899
3039 selection_grab (tm); 2900 selection_grab (tm);
3040} 2901}
3041 2902
3042bool 2903bool
3043rxvt_term::selection_grab (Time tm) NOTHROW 2904rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3044{ 2905{
2906 Atom sel;
2907
2908 if (!clipboard)
2909 {
3045 selection_time = tm; 2910 selection_time = tm;
3046 2911 sel = XA_PRIMARY;
3047 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3048 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3049 { 2912 }
2913 else
2914 {
2915 clipboard_time = tm;
2916 sel = xa[XA_CLIPBOARD];
2917 }
2918
2919 XSetSelectionOwner (dpy, sel, vt, tm);
2920 if (XGetSelectionOwner (dpy, sel) == vt)
2921 {
3050 display->set_selection_owner (this); 2922 display->set_selection_owner (this, clipboard);
3051 return true; 2923 return true;
3052 } 2924 }
3053 else 2925 else
3054 { 2926 {
3055 selection_clear (); 2927 selection_clear (clipboard);
3056 return false; 2928 return false;
3057 } 2929 }
3058 2930
3059#if 0 2931#if 0
3060 XTextProperty ct; 2932 XTextProperty ct;
3061 2933
3062 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 2934 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3063 { 2935 {
3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2936 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3065 XFree (ct.value); 2937 XFree (ct.value);
3066 } 2938 }
3067#endif 2939#endif
… …
3113 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2985 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3114 2986
3115 while (selection.mark.col > 0 2987 while (selection.mark.col > 0
3116 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2988 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3117 --selection.mark.col; 2989 --selection.mark.col;
3118 2990
3119 if (selection.op) 2991 if (selection.op)
2992 {
3120 { /* clear the old selection */ 2993 /* clear the old selection */
3121 selection.beg.row = selection.end.row = selection.mark.row; 2994 selection.beg.row = selection.end.row = selection.mark.row;
3122 selection.beg.col = selection.end.col = selection.mark.col; 2995 selection.beg.col = selection.end.col = selection.mark.col;
3123 } 2996 }
3124 2997
3125 selection.op = SELECTION_INIT; 2998 selection.op = SELECTION_INIT;
… …
3314 * a point/word/line which is either the start or end of the selection 3187 * a point/word/line which is either the start or end of the selection
3315 * and it was decided by whichever point/word/line was `fixed' at the 3188 * and it was decided by whichever point/word/line was `fixed' at the
3316 * time of the most recent button3 press 3189 * time of the most recent button3 press
3317 */ 3190 */
3318 if (button3 && buttonpress) 3191 if (button3 && buttonpress)
3192 {
3319 { /* button3 press */ 3193 /* button3 press */
3320 /* 3194 /*
3321 * first determine which edge of the selection we are closest to 3195 * first determine which edge of the selection we are closest to
3322 */ 3196 */
3323 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3197 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3324 || (!ROWCOL_IS_AFTER (pos, selection.end) 3198 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3342 selection.mark.row = selection.beg.row; 3216 selection.mark.row = selection.beg.row;
3343 selection.mark.col = selection.beg.col; 3217 selection.mark.col = selection.beg.col;
3344 } 3218 }
3345 } 3219 }
3346 else 3220 else
3221 {
3347 { /* button1 drag or button3 drag */ 3222 /* button1 drag or button3 drag */
3348 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3223 if (ROWCOL_IS_AFTER (selection.mark, pos))
3349 { 3224 {
3350 if (selection.mark.row == selection.end.row 3225 if (selection.mark.row == selection.end.row
3351 && selection.mark.col == selection.end.col 3226 && selection.mark.col == selection.end.col
3352 && clickchange 3227 && clickchange
… …
3395 selection_delimit_word (DN, &selection.end, &selection.end); 3270 selection_delimit_word (DN, &selection.end, &selection.end);
3396 } 3271 }
3397 else if (selection.clicks == 3) 3272 else if (selection.clicks == 3)
3398 { 3273 {
3399#if ENABLE_FRILLS 3274#if ENABLE_FRILLS
3400 if (OPTION (Opt_tripleclickwords)) 3275 if (option (Opt_tripleclickwords))
3401 { 3276 {
3402 selection_delimit_word (UP, &selection.beg, &selection.beg); 3277 selection_delimit_word (UP, &selection.beg, &selection.beg);
3403 3278
3404 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3279 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405 { 3280 {
… …
3433 selection.end.row++; 3308 selection.end.row++;
3434 } 3309 }
3435 } 3310 }
3436 3311
3437 if (button3 && buttonpress) 3312 if (button3 && buttonpress)
3313 {
3438 { /* mark may need to be changed */ 3314 /* mark may need to be changed */
3439 if (closeto == LEFT) 3315 if (closeto == LEFT)
3440 { 3316 {
3441 selection.mark.row = selection.end.row; 3317 selection.mark.row = selection.end.row;
3442 selection.mark.col = selection.end.col - (selection.clicks == 2); 3318 selection.mark.col = selection.end.col - (selection.clicks == 2);
3443 } 3319 }
… …
3516 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3517 */ 3393 */
3518void 3394void
3519rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3520{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3521 XSelectionEvent ev; 3398 XSelectionEvent ev;
3522 3399
3523 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3524 ev.property = None; 3401 ev.property = None;
3525 ev.display = rq.display; 3402 ev.display = rq.display;
… …
3540 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3541#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3542 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3543#endif 3420#endif
3544 3421
3545 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3546 32, PropModeReplace, 3423 32, PropModeReplace,
3547 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3548 ev.property = rq.property; 3425 ev.property = property;
3549 } 3426 }
3550#if TODO // TODO 3427#if TODO // TODO
3551 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3552 { 3429 {
3553 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3554 } 3431 }
3555#endif 3432#endif
3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3557 { 3434 {
3558 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3559 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560 ev.property = rq.property; 3437 ev.property = property;
3438 }
3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3440 {
3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3443 ev.property = property;
3561 } 3444 }
3562 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3563 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3564 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3565 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
… …
3597 { 3480 {
3598 target = xa[XA_COMPOUND_TEXT]; 3481 target = xa[XA_COMPOUND_TEXT];
3599 style = enc_compound_text; 3482 style = enc_compound_text;
3600 } 3483 }
3601 3484
3602 if (selection.text) 3485 if (rq.selection == XA_PRIMARY && selection.text)
3603 { 3486 {
3604 cl = selection.text; 3487 cl = selection.text;
3605 selectlen = selection.len; 3488 selectlen = selection.len;
3489 }
3490 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3491 {
3492 cl = selection.clip_text;
3493 selectlen = selection.clip_len;
3606 } 3494 }
3607 else 3495 else
3608 { 3496 {
3609 cl = L""; 3497 cl = L"";
3610 selectlen = 0; 3498 selectlen = 0;
… …
3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3509 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622 ct.nitems = strlen ((char *)ct.value); 3510 ct.nitems = strlen ((char *)ct.value);
3623 } 3511 }
3624 else 3512 else
3625#endif 3513#endif
3626 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3514 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627 freect = 1; 3515 freect = 1;
3628 else 3516 else
3629 { 3517 {
3630 /* if we failed to convert then send it raw */ 3518 /* if we failed to convert then send it raw */
3631 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3632 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3633 ct.encoding = target; 3521 ct.encoding = target;
3634 } 3522 }
3635 3523
3636 XChangeProperty (xdisp, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3637 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3638 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3639 ev.property = rq.property; 3527 ev.property = property;
3640 3528
3641 if (freect) 3529 if (freect)
3642 XFree (ct.value); 3530 XFree (ct.value);
3643 } 3531 }
3644 3532
3645 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3646}
3647
3648/* ------------------------------------------------------------------------- *
3649 * MOUSE ROUTINES *
3650 * ------------------------------------------------------------------------- */
3651
3652/*
3653 * return col/row values corresponding to x/y pixel values
3654 */
3655void
3656rxvt_term::pixel_position (int *x, int *y) NOTHROW
3657{
3658 *x = Pixel2Col (*x);
3659 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3660 *y = Pixel2Row (*y);
3661 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3662} 3534}
3663 3535
3664/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3665#ifdef USE_XIM 3537#ifdef USE_XIM
3666void 3538void
3667rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668{ 3540{
3669 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3670 3542
3671 XGetWindowAttributes (xdisp, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);
3672 3544
3673 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3545 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3546 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675} 3547}
3676#endif 3548#endif
… …
3694 h += 2; min_it (h, nrow); 3566 h += 2; min_it (h, nrow);
3695 3567
3696 x -= 1; clamp_it (x, 0, ncol - w); 3568 x -= 1; clamp_it (x, 0, ncol - w);
3697 y -= 1; clamp_it (y, 0, nrow - h); 3569 y -= 1; clamp_it (y, 0, nrow - h);
3698 3570
3699 ov_x = x; ov_y = y; 3571 ov.x = x; ov.y = y;
3700 ov_w = w; ov_h = h; 3572 ov.w = w; ov.h = h;
3701 3573
3702 ov_text = new text_t *[h]; 3574 ov.text = new text_t *[h];
3703 ov_rend = new rend_t *[h]; 3575 ov.rend = new rend_t *[h];
3704 3576
3705 for (y = 0; y < h; y++) 3577 for (y = 0; y < h; y++)
3706 { 3578 {
3707 text_t *tp = ov_text[y] = new text_t[w]; 3579 text_t *tp = ov.text[y] = new text_t[w];
3708 rend_t *rp = ov_rend[y] = new rend_t[w]; 3580 rend_t *rp = ov.rend[y] = new rend_t[w];
3709 3581
3710 text_t t0, t1, t2; 3582 text_t t0, t1, t2;
3711 rend_t r = OVERLAY_RSTYLE; 3583 rend_t r = OVERLAY_RSTYLE;
3712 3584
3713 if (y == 0) 3585 if (y == 0)
… …
3732} 3604}
3733 3605
3734void 3606void
3735rxvt_term::scr_overlay_off () NOTHROW 3607rxvt_term::scr_overlay_off () NOTHROW
3736{ 3608{
3737 if (!ov_text) 3609 if (!ov.text)
3738 return; 3610 return;
3739 3611
3740 want_refresh = 1; 3612 want_refresh = 1;
3741 3613
3742 for (int y = 0; y < ov_h; y++) 3614 for (int y = 0; y < ov.h; y++)
3743 { 3615 {
3744 delete [] ov_text[y]; 3616 delete [] ov.text[y];
3745 delete [] ov_rend[y]; 3617 delete [] ov.rend[y];
3746 } 3618 }
3747 3619
3748 delete [] ov_text; ov_text = 0; 3620 delete [] ov.text; ov.text = 0;
3749 delete [] ov_rend; ov_rend = 0; 3621 delete [] ov.rend; ov.rend = 0;
3750} 3622}
3751 3623
3752void 3624void
3753rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3625rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3754{ 3626{
3755 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3627 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3756 return; 3628 return;
3757 3629
3758 x++, y++; 3630 x++, y++;
3759 3631
3760 ov_text[y][x] = text; 3632 ov.text[y][x] = text;
3761 ov_rend[y][x] = rend; 3633 ov.rend[y][x] = rend;
3762} 3634}
3763 3635
3764void 3636void
3765rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3766{ 3638{
… …
3785} 3657}
3786 3658
3787void 3659void
3788rxvt_term::scr_swap_overlay () NOTHROW 3660rxvt_term::scr_swap_overlay () NOTHROW
3789{ 3661{
3790 if (!ov_text) 3662 if (!ov.text)
3791 return; 3663 return;
3792 3664
3665 // hide cursor if it is within the overlay area
3666 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3667 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3668 screen.flags &= ~Screen_VisibleCursor;
3669
3793 // swap screen mem with overlay 3670 // swap screen mem with overlay
3794 for (int y = ov_h; y--; ) 3671 for (int y = ov.h; y--; )
3795 { 3672 {
3796 text_t *t1 = ov_text[y]; 3673 text_t *t1 = ov.text[y];
3797 rend_t *r1 = ov_rend[y]; 3674 rend_t *r1 = ov.rend[y];
3798 3675
3799 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3676 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3800 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3677 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3801 3678
3802 for (int x = ov_w; x--; ) 3679 for (int x = ov.w; x--; )
3803 { 3680 {
3804 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3681 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3805 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3682 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3806 } 3683 }
3807 } 3684 }

Diff Legend

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