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.37 by pcg, Tue Feb 24 23:58:13 2004 UTC vs.
Revision 1.343 by sf-exg, Thu Jul 1 21:52:52 2010 UTC

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

Diff Legend

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