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.189 by root, Thu Dec 22 15:28:15 2005 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

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

Diff Legend

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