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.190 by root, Thu Dec 22 15:52:57 2005 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

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

Diff Legend

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