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.244 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 UTC

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

Diff Legend

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