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.192 by root, Thu Dec 22 19:25:58 2005 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

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

Diff Legend

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