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.246 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

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

Diff Legend

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