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

Diff Legend

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