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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC

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

Diff Legend

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