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

Diff Legend

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