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.191 by root, Thu Dec 22 18:36:55 2005 UTC vs.
Revision 1.427 by sf-exg, Sat Dec 29 15:59:51 2012 UTC

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

Diff Legend

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