ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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