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

Diff Legend

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