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.193 by root, Thu Dec 22 19:39:29 2005 UTC vs.
Revision 1.428 by sf-exg, Sun Jan 13 17:42:24 2013 UTC

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

Diff Legend

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