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

Diff Legend

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