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.261 by root, Sat Feb 18 15:44:26 2006 UTC vs.
Revision 1.451 by mikachu, Sat Dec 6 09:36:12 2014 UTC

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

Diff Legend

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