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.189 by root, Thu Dec 22 15:28:15 2005 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 2012 UTC

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

Diff Legend

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