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.195 by root, Mon Dec 26 23:02:34 2005 UTC vs.
Revision 1.434 by root, Sat Feb 16 17:26:53 2013 UTC

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

Diff Legend

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