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.255 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 2013 UTC

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

Diff Legend

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