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

Diff Legend

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