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.23 by pcg, Sat Jan 31 02:31:17 2004 UTC vs.
Revision 1.313 by root, Tue Nov 4 14:25:10 2008 UTC

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

Diff Legend

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