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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.33 by pcg, Sun Feb 22 17:13:21 2004 UTC vs.
Revision 1.325 by root, Wed Nov 5 12:28:15 2008 UTC

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

Diff Legend

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