ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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