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.217 by root, Mon Jan 9 19:01:56 2006 UTC vs.
Revision 1.421 by sf-exg, Sun Jun 10 13:07:56 2012 UTC

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

Diff Legend

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