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.211 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

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

Diff Legend

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