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.198 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

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

Diff Legend

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