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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

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

Diff Legend

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