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.216 by root, Mon Jan 9 18:51:19 2006 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

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

Diff Legend

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