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

Diff Legend

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