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

Diff Legend

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