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

Diff Legend

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