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

Diff Legend

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