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.249 by root, Wed Jan 25 00:42:21 2006 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC

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

Diff Legend

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