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

Diff Legend

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