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.194 by root, Mon Dec 26 21:30:04 2005 UTC vs.
Revision 1.416 by root, Mon May 28 14:26:11 2012 UTC

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

Diff Legend

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