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

Diff Legend

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