ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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