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

Diff Legend

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