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.437 by sf-exg, Mon Mar 25 12:28:04 2013 UTC

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

Diff Legend

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