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.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.459 by root, Tue Jun 25 03:35:01 2019 UTC

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

Diff Legend

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