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.215 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC

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

Diff Legend

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