ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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