ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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