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.188 by root, Thu Dec 22 00:07:47 2005 UTC vs.
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC

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

Diff Legend

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