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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.35 by pcg, Tue Feb 24 11:48:40 2004 UTC vs.
Revision 1.319 by root, Tue Nov 4 23:08:44 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
284 row_col_t ocur = screen.cur;
285 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286
287 do
288 {
289 p = MOD (p - 1, prev_total_rows);
290#ifdef DEBUG_STRICT
291 assert (old_buf [MOD (p, prev_total_rows)].t);
292#endif
293 int plines = 1;
294 int llen = old_buf [MOD (p, prev_total_rows)].l;
295
296 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
260 { 297 {
261#ifdef DEBUG_STRICT 298 p = MOD (p - 1, prev_total_rows);
262 assert (screen.rend[q]); 299
263#endif 300 plines++;
264 talloc->free (screen.text[q]); 301 llen += prev_ncol;
265 ralloc->free (screen.rend[q]);
266 } 302 }
267 if (swap.text[p]) 303
304 int qlines = max (0, (llen - 1) / ncol) + 1;
305
306 // drop partial lines completely
307 if (q < qlines)
308 break;
309
310 q -= qlines;
311
312 int lofs = 0;
313 line_t *qline;
314
315 // re-assemble the full line by destination lines
316 for (int qrow = q; qlines--; qrow++)
268 { 317 {
269#ifdef DEBUG_STRICT 318 qline = row_buf + qrow;
270 assert (swap.rend[p]); 319 lalloc (*qline);
271#endif 320 qline->l = ncol;
272 talloc->free (swap.text[p]); 321 qline->is_longer (1);
273 ralloc->free (swap.rend[p]); 322
323 int qcol = 0;
324
325 // see below for cursor adjustment rationale
326 if (p == ocur.row)
327 screen.cur.row = q - (total_rows - nrow);
328
329 // fill a single destination line
330 while (lofs < llen && qcol < ncol)
331 {
332 int prow = lofs / prev_ncol;
333 int pcol = lofs % prev_ncol;
334
335 prow = MOD (p + prow, prev_total_rows);
336
337 // we only adjust the cursor _row_ and put it into
338 // the topmost line of "long line" it was in, as
339 // this seems to upset applications/shells/readline
340 // least.
341 if (prow == ocur.row)
342 screen.cur.row = q - (total_rows - nrow);
343
344 line_t &pline = old_buf [prow];
345
346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
350
351 lofs += len;
352 qcol += len;
353 }
274 } 354 }
275#ifdef DEBUG_STRICT 355
276 assert (drawn_text[p] && drawn_rend[p]); 356 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
277#endif 357 qline->is_longer (0);
278 talloc->free (drawn_text[p]); 358 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
279 ralloc->free (drawn_rend[p]);
280 } 359 }
360 while (p != pend && q > 0);
281 361
282 /* we have fewer rows so fix up cursor position */ 362 term_start = total_rows - nrow;
283 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 363 top_row = q - term_start;
284 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
285 364
286 scr_reset_realloc (); /* realloc _last_ */ 365 // make sure all terminal lines exist
287 } 366 while (top_row > 0)
288 else if (nrow > prev_nrow) 367 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
289 { 368 }
290 /* add rows */ 369 else
291 scr_reset_realloc (); /* realloc _first_ */ 370 {
371 // if no scrollback exists (yet), wing, instead of wrap
292 372
293 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 373 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 { 374 {
299 screen.tlen[p] = 0; 375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
300 screen.text[p] = NULL; 376 line_t &qline = row_buf [row];
301 screen.rend[p] = NULL; 377
378 qline = pline;
379 lresize (qline);
302 } 380 }
303 381
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++) 382 for (int row = prev_nrow; row < nrow; row++)
308 { 383 {
309 swap.tlen[p] = 0; 384 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 } 385 }
317 386
318 if (k > 0) 387 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 { 388 }
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 389
343 for (p = 0; p < total_rows; p++) 390 free (old_buf);
344 { 391 delete old_ta;
345 if (screen.text[p]) 392 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 393
350 MIN_IT (screen.tlen[p], (int16_t)ncol); 394 clamp_it (screen.cur.row, 0, nrow - 1);
351 395 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 } 396 }
397
398 CLEAR_ALL_SELECTION ();
395 399
396 prev_nrow = nrow; 400 prev_nrow = nrow;
397 prev_ncol = ncol; 401 prev_ncol = ncol;
398 402
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 (); 403 tt_winch ();
405}
406 404
407void 405 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} 406}
429 407
430/* ------------------------------------------------------------------------- */ 408/* ------------------------------------------------------------------------- */
431/* 409/*
432 * Free everything. That way malloc debugging can find leakage. 410 * Free everything. That way malloc debugging can find leakage.
433 */ 411 */
434void 412void
435rxvt_term::scr_release () 413rxvt_term::scr_release () NOTHROW
436{ 414{
437 uint16_t total_rows; 415 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 } 416 {
449#endif
450
451 delete talloc; talloc = 0; 417 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 418 delete ralloc; ralloc = 0;
453 419
454 free (screen.text); 420 free (row_buf);
455 free (screen.tlen); 421 free (swap_buf);
456 free (screen.rend); 422 free (drawn_buf);
457 free (drawn_text); 423 row_buf = 0; // signal that we freed all the arrays above
458 free (drawn_rend); 424
459 free (swap.text);
460 free (swap.tlen);
461 free (swap.rend);
462 free (buf_text);
463 free (buf_rend);
464 free (tabs); 425 free (tabs);
465 426 tabs = 0;
466 /* NULL these so if anything tries to use them, we'll know about it */ 427 }
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} 428}
474 429
475/* ------------------------------------------------------------------------- */ 430/* ------------------------------------------------------------------------- */
476/* 431/*
477 * Hard reset 432 * Hard/Soft reset
478 */ 433 */
479void 434void
480rxvt_term::scr_poweron () 435rxvt_term::scr_poweron ()
481{ 436{
482 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
483
484 scr_release (); 437 scr_release ();
485 prev_nrow = prev_ncol = 0; 438 prev_nrow = prev_ncol = 0;
439 scr_soft_reset ();
486 scr_reset (); 440 scr_reset ();
487 441
488 scr_clear (); 442 scr_clear (true);
489 scr_refresh (SLOW_REFRESH); 443 scr_refresh ();
444}
445
446void
447rxvt_term::scr_soft_reset ()
448{
449 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY
451 scr_overlay_off ();
452#endif
453
454 rvideo_mode = false;
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 xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1231 if (rstyle & (RS_RVid | RS_Uline)) 1347 if (rstyle & (RS_RVid | RS_Uline))
1232 ren = (rend_t) ~RS_None; 1348 ren = (rend_t) ~RS_None;
1233 else if (GET_BASEBG (rstyle) == Color_bg) 1349 else if (GET_BASEBG (rstyle) == Color_bg)
1234 { 1350 {
1235 ren = DEFAULT_RSTYLE; 1351 ren = DEFAULT_RSTYLE;
1236 CLEAR_ROWS (row, num); 1352
1353 if (mapped)
1354 XClearArea (dpy, vt, 0,
1355 Row2Pixel (row), (unsigned int)width,
1356 (unsigned int)Height2Pixel (num), False);
1237 } 1357 }
1238 else 1358 else
1239 { 1359 {
1240 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1360 ren = rstyle & (RS_fgMask | RS_bgMask);
1361
1241 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1362 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1242 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1363 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1243 ERASE_ROWS (row, num); 1364 XFillRectangle (dpy, vt, gc,
1365 0, Row2Pixel (row),
1366 (unsigned int)width,
1367 (unsigned int)Height2Pixel (num));
1244 gcvalue.foreground = PixColors[Color_fg]; 1368 gcvalue.foreground = pix_colors[Color_fg];
1245 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1369 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1246 } 1370 }
1371
1247 for (; num--; row++) 1372 for (; num--; row++)
1248 { 1373 {
1249 scr_blank_screen_mem (screen.text, screen.rend, 1374 scr_blank_screen_mem (ROW(row), rstyle);
1250 (unsigned int) (row + row_offset), rstyle); 1375 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1251 screen.tlen[row + row_offset] = 0;
1252 scr_blank_line (drawn_text[row], drawn_rend[row],
1253 (unsigned int)TermWin.ncol, ren);
1254 } 1376 }
1255} 1377}
1378
1379#if !ENABLE_MINIMAL
1380void
1381rxvt_term::scr_erase_savelines () NOTHROW
1382{
1383 want_refresh = 1;
1384 ZERO_SCROLLBACK ();
1385
1386 top_row = 0;
1387}
1388#endif
1256 1389
1257/* ------------------------------------------------------------------------- */ 1390/* ------------------------------------------------------------------------- */
1258/* 1391/*
1259 * Fill the screen with `E's 1392 * Fill the screen with `E's
1260 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1393 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1261 */ 1394 */
1262void 1395void
1263rxvt_term::scr_E () 1396rxvt_term::scr_E () NOTHROW
1264{ 1397{
1265 int i, j, k; 1398 rend_t fs;
1266 rend_t *r1, fs;
1267 1399
1268 want_refresh = 1; 1400 want_refresh = 1;
1401 ZERO_SCROLLBACK ();
1402
1269 num_scr_allow = 0; 1403 num_scr_allow = 0;
1270 ZERO_SCROLLBACK ();
1271 selection_check (3); 1404 selection_check (3);
1272 1405
1273 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1406 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1274 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1407 for (int row = nrow; row--; )
1275 { 1408 {
1276 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1409 line_t &line = ROW(row);
1410
1277 fill_text (screen.text[k], 'E', TermWin.ncol); 1411 fill_text (line.t, 'E', ncol);
1278 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1412 rend_t *r1 = line.r;
1413
1414 for (int j = ncol; j--; )
1279 *r1++ = fs; 1415 *r1++ = fs;
1416
1417 line.is_longer (0);
1418 line.touch (ncol);
1280 } 1419 }
1281} 1420}
1282 1421
1283/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1284/* 1423/*
1285 * Insert/Delete <count> lines 1424 * Insert/Delete <count> lines
1286 */ 1425 */
1287void 1426void
1288rxvt_term::scr_insdel_lines (int count, int insdel) 1427rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1289{ 1428{
1290 int end; 1429 int end;
1291 1430
1292 ZERO_SCROLLBACK (); 1431 ZERO_SCROLLBACK ();
1293 1432
1294 selection_check (1); 1433 selection_check (1);
1295 1434
… …
1302 if (insdel == DELETE) 1441 if (insdel == DELETE)
1303 return; 1442 return;
1304 else if (insdel == INSERT) 1443 else if (insdel == INSERT)
1305 count = end; 1444 count = end;
1306 } 1445 }
1307 screen.flags &= ~Screen_WrapNext;
1308 1446
1447 scr_do_wrap ();
1448
1309 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1449 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1310} 1450}
1311 1451
1312/* ------------------------------------------------------------------------- */ 1452/* ------------------------------------------------------------------------- */
1313/* 1453/*
1314 * Insert/Delete <count> characters from the current position 1454 * Insert/Delete <count> characters from the current position
1315 */ 1455 */
1316void 1456void
1317rxvt_term::scr_insdel_chars (int count, int insdel) 1457rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1318{ 1458{
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; 1459 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1460 ZERO_SCROLLBACK ();
1327 1461
1328 if (count <= 0) 1462 if (count <= 0)
1329 return; 1463 return;
1330 1464
1465 scr_do_wrap ();
1466
1331 selection_check (1); 1467 selection_check (1);
1332 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1468 min_it (count, ncol - screen.cur.col);
1333 1469
1334 row = screen.cur.row + TermWin.saveLines; 1470 int row = screen.cur.row;
1335 screen.flags &= ~Screen_WrapNext;
1336 1471
1337 stp = screen.text[row]; 1472 line_t *line = &ROW(row);
1338 srp = screen.rend[row]; 1473
1339 slp = & (screen.tlen[row]); 1474 line->touch ();
1475 line->is_longer (0);
1476
1477 // nuke wide spanning the start
1478 if (line->t[screen.cur.col] == NOCHAR)
1479 scr_kill_char (*line, screen.cur.col);
1480
1340 switch (insdel) 1481 switch (insdel)
1341 { 1482 {
1342 case INSERT: 1483 case INSERT:
1343 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1484 line->l = min (line->l + count, ncol);
1344 col--) 1485
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1489 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1345 { 1490 {
1346 stp[col] = stp[col - count]; 1491 line->t[col] = line->t[col - count];
1347 srp[col] = srp[col - count]; 1492 line->r[col] = line->r[col - count];
1348 } 1493 }
1349 if (*slp != -1) 1494
1350 {
1351 *slp += count;
1352 MIN_IT (*slp, TermWin.ncol);
1353 }
1354 if (selection.op && current_screen == selection.screen 1495 if (selection.op && current_screen == selection.screen
1355 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1356 { 1497 {
1357 if (selection.end.row != screen.cur.row 1498 if (selection.end.row != screen.cur.row
1358 || (selection.end.col + count >= TermWin.ncol)) 1499 || (selection.end.col + count >= ncol))
1359 CLEAR_SELECTION (); 1500 CLEAR_SELECTION ();
1360 else 1501 else
1502 {
1361 { /* shift selection */ 1503 /* shift selection */
1362 selection.beg.col += count; 1504 selection.beg.col += count;
1363 selection.mark.col += count; /* XXX: yes? */ 1505 selection.mark.col += count; /* XXX: yes? */
1364 selection.end.col += count; 1506 selection.end.col += count;
1365 } 1507 }
1366 } 1508 }
1367 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1509
1368 (unsigned int)count, rstyle); 1510 scr_blank_line (*line, screen.cur.col, count, rstyle);
1369 break; 1511 break;
1512
1370 case ERASE: 1513 case ERASE:
1371 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1514 screen.cur.col += count; /* don't worry if > ncol */
1372 selection_check (1); 1515 selection_check (1);
1373 screen.cur.col -= count; 1516 screen.cur.col -= count;
1374 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1517
1375 (unsigned int)count, rstyle); 1518 // nuke wide char after the end
1519 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col + count);
1521
1522 scr_blank_line (*line, screen.cur.col, count, rstyle);
1376 break; 1523 break;
1524
1377 case DELETE: 1525 case DELETE:
1378 tr = srp[TermWin.ncol - 1] 1526 line->l = max (line->l - count, 0);
1379 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527
1528 // nuke wide char spanning the end
1529 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1530 scr_kill_char (*line, screen.cur.col + count);
1531
1380 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1532 for (int col = screen.cur.col; (col + count) < ncol; col++)
1381 { 1533 {
1382 stp[col] = stp[col + count]; 1534 line->t[col] = line->t[col + count];
1383 srp[col] = srp[col + count]; 1535 line->r[col] = line->r[col + count];
1384 } 1536 }
1385 scr_blank_line (& (stp[TermWin.ncol - count]), 1537
1386 & (srp[TermWin.ncol - count]), 1538 scr_blank_line (*line, ncol - count, count,
1387 (unsigned int)count, tr); 1539 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1388 if (*slp == -1) /* break line continuation */ 1540
1389 *slp = TermWin.ncol;
1390 *slp -= count;
1391 MAX_IT (*slp, 0);
1392 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1393 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1394 { 1543 {
1395 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
1396 || (screen.cur.col >= selection.beg.col - count) 1545 || (screen.cur.col >= selection.beg.col - count)
1397 || selection.end.col >= TermWin.ncol) 1546 || selection.end.col >= ncol)
1398 CLEAR_SELECTION (); 1547 CLEAR_SELECTION ();
1399 else 1548 else
1400 { 1549 {
1401 /* shift selection */ 1550 /* shift selection */
1402 selection.beg.col -= count; 1551 selection.beg.col -= count;
1403 selection.mark.col -= count; /* XXX: yes? */ 1552 selection.mark.col -= count; /* XXX: yes? */
1404 selection.end.col -= count; 1553 selection.end.col -= count;
1405 } 1554 }
1406 } 1555 }
1556
1407 break; 1557 break;
1408 } 1558 }
1409} 1559}
1410 1560
1411/* ------------------------------------------------------------------------- */ 1561/* ------------------------------------------------------------------------- */
1412/* 1562/*
1413 * Set the scrolling region 1563 * Set the scrolling region
1414 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1564 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1415 */ 1565 */
1416void 1566void
1417rxvt_term::scr_scroll_region (int top, int bot) 1567rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1418{ 1568{
1419 MAX_IT (top, 0); 1569 max_it (top, 0);
1420 MIN_IT (bot, (int)TermWin.nrow - 1); 1570 min_it (bot, nrow - 1);
1571
1421 if (top > bot) 1572 if (top > bot)
1422 return; 1573 return;
1574
1423 screen.tscroll = top; 1575 screen.tscroll = top;
1424 screen.bscroll = bot; 1576 screen.bscroll = bot;
1425 scr_gotorc (0, 0, 0); 1577 scr_gotorc (0, 0, 0);
1426} 1578}
1427 1579
… …
1430 * Make the cursor visible/invisible 1582 * Make the cursor visible/invisible
1431 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1583 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1432 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1584 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1433 */ 1585 */
1434void 1586void
1435rxvt_term::scr_cursor_visible (int mode) 1587rxvt_term::scr_cursor_visible (int mode) NOTHROW
1436{ 1588{
1437 want_refresh = 1; 1589 want_refresh = 1;
1590
1438 if (mode) 1591 if (mode)
1439 screen.flags |= Screen_VisibleCursor; 1592 screen.flags |= Screen_VisibleCursor;
1440 else 1593 else
1441 screen.flags &= ~Screen_VisibleCursor; 1594 screen.flags &= ~Screen_VisibleCursor;
1442} 1595}
… …
1446 * Set/unset automatic wrapping 1599 * Set/unset automatic wrapping
1447 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1600 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1448 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1601 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1449 */ 1602 */
1450void 1603void
1451rxvt_term::scr_autowrap (int mode) 1604rxvt_term::scr_autowrap (int mode) NOTHROW
1452{ 1605{
1453 if (mode) 1606 if (mode)
1454 screen.flags |= Screen_Autowrap; 1607 screen.flags |= Screen_Autowrap;
1455 else 1608 else
1456 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1609 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1457} 1610}
1458 1611
1459/* ------------------------------------------------------------------------- */ 1612/* ------------------------------------------------------------------------- */
1460/* 1613/*
1461 * Set/unset margin origin mode 1614 * Set/unset margin origin mode
… …
1465 * and the cursor cannot be moved outside. 1618 * and the cursor cannot be moved outside.
1466 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1619 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1467 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1620 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1468 */ 1621 */
1469void 1622void
1470rxvt_term::scr_relative_origin (int mode) 1623rxvt_term::scr_relative_origin (int mode) NOTHROW
1471{ 1624{
1472 if (mode) 1625 if (mode)
1473 screen.flags |= Screen_Relative; 1626 screen.flags |= Screen_Relative;
1474 else 1627 else
1475 screen.flags &= ~Screen_Relative; 1628 screen.flags &= ~Screen_Relative;
1629
1476 scr_gotorc (0, 0, 0); 1630 scr_gotorc (0, 0, 0);
1477} 1631}
1478 1632
1479/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
1480/* 1634/*
1481 * Set insert/replace mode 1635 * Set insert/replace mode
1482 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1636 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1483 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1637 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1484 */ 1638 */
1485void 1639void
1486rxvt_term::scr_insert_mode (int mode) 1640rxvt_term::scr_insert_mode (int mode) NOTHROW
1487{ 1641{
1488 if (mode) 1642 if (mode)
1489 screen.flags |= Screen_Insert; 1643 screen.flags |= Screen_Insert;
1490 else 1644 else
1491 screen.flags &= ~Screen_Insert; 1645 screen.flags &= ~Screen_Insert;
… …
1497 * XTERM_SEQ: Set tab at current column : ESC H 1651 * XTERM_SEQ: Set tab at current column : ESC H
1498 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1652 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1499 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1653 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1500 */ 1654 */
1501void 1655void
1502rxvt_term::scr_set_tab (int mode) 1656rxvt_term::scr_set_tab (int mode) NOTHROW
1503{ 1657{
1504 if (mode < 0) 1658 if (mode < 0)
1505 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1659 memset (tabs, 0, ncol);
1506 else if (screen.cur.col < TermWin.ncol) 1660 else if (screen.cur.col < ncol)
1507 tabs[screen.cur.col] = (mode ? 1 : 0); 1661 tabs [screen.cur.col] = !!mode;
1508} 1662}
1509 1663
1510/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
1511/* 1665/*
1512 * Set reverse/normal video 1666 * Set reverse/normal video
1513 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1667 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1514 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1668 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1515 */ 1669 */
1516void 1670void
1517rxvt_term::scr_rvideo_mode (int mode) 1671rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1518{ 1672{
1519 XGCValues gcvalue; 1673 rvideo_mode = on;
1520 1674
1675#ifndef NO_BELL
1676 on ^= rvideo_bell;
1677#endif
1678
1521 if (rvideo != mode) 1679 if (rvideo_state != on)
1522 { 1680 {
1523 rvideo = mode; 1681 rvideo_state = on;
1524 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1682
1525#if defined(XPM_BACKGROUND) 1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP
1526 if (bgPixmap.pixmap == None) 1685 if (bgPixmap.pixmap == None)
1527#endif 1686#endif
1528#if defined(TRANSPARENT) 1687 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 1688
1689 XGCValues gcvalue;
1534 gcvalue.foreground = PixColors[Color_fg]; 1690 gcvalue.foreground = pix_colors[Color_fg];
1535 gcvalue.background = PixColors[Color_bg]; 1691 gcvalue.background = pix_colors[Color_bg];
1536 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1692 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1537 &gcvalue); 1693
1538 scr_clear (); 1694 scr_clear ();
1539 scr_touch (true); 1695 scr_touch (true);
1540 } 1696 }
1541} 1697}
1542 1698
… …
1544/* 1700/*
1545 * Report current cursor position 1701 * Report current cursor position
1546 * XTERM_SEQ: Report position: ESC [ 6 n 1702 * XTERM_SEQ: Report position: ESC [ 6 n
1547 */ 1703 */
1548void 1704void
1549rxvt_term::scr_report_position () 1705rxvt_term::scr_report_position () NOTHROW
1550{ 1706{
1551 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1707 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1552} 1708}
1553 1709
1554/* ------------------------------------------------------------------------- * 1710/* ------------------------------------------------------------------------- *
… …
1557 1713
1558/* 1714/*
1559 * Set font style 1715 * Set font style
1560 */ 1716 */
1561void 1717void
1562rxvt_term::set_font_style () 1718rxvt_term::set_font_style () NOTHROW
1563{ 1719{
1720#if 0
1564 switch (charsets[screen.charset]) 1721 switch (charsets [screen.charset])
1565 { 1722 {
1566 case '0': /* DEC Special Character & Line Drawing Set */ 1723 case '0': /* DEC Special Character & Line Drawing Set */
1567 break; 1724 break;
1568 case 'A': /* United Kingdom (UK) */ 1725 case 'A': /* United Kingdom (UK) */
1569 break; 1726 break;
… …
1576 case 'C': /* Finnish character set */ 1733 case 'C': /* Finnish character set */
1577 break; 1734 break;
1578 case 'K': /* German character set */ 1735 case 'K': /* German character set */
1579 break; 1736 break;
1580 } 1737 }
1738#endif
1581} 1739}
1582 1740
1583/* ------------------------------------------------------------------------- */ 1741/* ------------------------------------------------------------------------- */
1584/* 1742/*
1585 * Choose a font 1743 * Choose a font
… …
1587 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1745 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1588 * XTERM_SEQ: Invoke G2 character set: ESC N 1746 * XTERM_SEQ: Invoke G2 character set: ESC N
1589 * XTERM_SEQ: Invoke G3 character set: ESC O 1747 * XTERM_SEQ: Invoke G3 character set: ESC O
1590 */ 1748 */
1591void 1749void
1592rxvt_term::scr_charset_choose (int set) 1750rxvt_term::scr_charset_choose (int set) NOTHROW
1593 { 1751{
1594 screen.charset = set; 1752 screen.charset = set;
1595 set_font_style (); 1753 set_font_style ();
1596 } 1754}
1597 1755
1598/* ------------------------------------------------------------------------- */ 1756/* ------------------------------------------------------------------------- */
1599/* 1757/*
1600 * Set a font 1758 * Set a font
1601 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1759 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1603 * XTERM_SEQ: Set G2 character set: ESC * <C> 1761 * XTERM_SEQ: Set G2 character set: ESC * <C>
1604 * XTERM_SEQ: Set G3 character set: ESC + <C> 1762 * XTERM_SEQ: Set G3 character set: ESC + <C>
1605 * See set_font_style for possible values for <C> 1763 * See set_font_style for possible values for <C>
1606 */ 1764 */
1607void 1765void
1608rxvt_term::scr_charset_set (int set, unsigned int ch) 1766rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1609 { 1767{
1610 charsets[set] = (unsigned char)ch; 1768 charsets[set] = (unsigned char)ch;
1611 set_font_style (); 1769 set_font_style ();
1612 } 1770}
1613 1771
1614 1772
1615/* ------------------------------------------------------------------------- * 1773/* ------------------------------------------------------------------------- *
1616 * MAJOR SCREEN MANIPULATION * 1774 * MAJOR SCREEN MANIPULATION *
1617 * ------------------------------------------------------------------------- */ 1775 * ------------------------------------------------------------------------- */
1618 1776
1619/* 1777/*
1620 * refresh matching text. 1778 * refresh matching text.
1621 */ 1779 */
1622bool 1780bool
1623rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1781rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1624{ 1782{
1625 bool found = false; 1783 bool found = false;
1626 1784
1627 for (int i = 0; i < TermWin.nrow; i++) 1785 for (int i = 0; i < nrow; i++)
1628 { 1786 {
1629 int col = 0;
1630 rend_t *drp = drawn_rend [i]; 1787 rend_t *drp = drawn_buf[i].r;
1631 1788
1632 for (; col < TermWin.ncol; col++, drp++) 1789 for (int col = 0; col < ncol; col++, drp++)
1633 if ((*drp & mask) == value) 1790 if ((*drp & mask) == value)
1634 { 1791 {
1635 found = true; 1792 found = true;
1636 *drp = ~value; 1793 *drp = ~value;
1637 } 1794 }
… …
1648 PART_END, 1805 PART_END,
1649 RC_COUNT 1806 RC_COUNT
1650}; 1807};
1651 1808
1652void 1809void
1653rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1654{ 1811{
1655 int i; 1812 int i;
1656 row_col_t rc[RC_COUNT]; 1813 row_col_t rc[RC_COUNT];
1657 1814
1658 if (drawn_text == NULL) /* sanity check */ 1815 if (!drawn_buf) /* sanity check */
1659 return; 1816 return;
1660 1817
1661#ifdef DEBUG_STRICT 1818#ifndef NO_SLOW_LINK_SUPPORT
1662 x = max (x, (int)TermWin.int_bwidth); 1819 if (refresh_type == FAST_REFRESH && !display->is_local)
1663 x = min (x, (int)TermWin.width); 1820 {
1664 y = max (y, (int)TermWin.int_bwidth); 1821 y = 0;
1665 y = min (y, (int)TermWin.height); 1822 eheight = height;
1823 }
1666#endif 1824#endif
1667 1825
1668 /* round down */ 1826 /* round down */
1669 rc[PART_BEG].col = Pixel2Col (x); 1827 rc[PART_BEG].col = Pixel2Col (x);
1670 rc[PART_BEG].row = Pixel2Row (y); 1828 rc[PART_BEG].row = Pixel2Row (y);
1671 /* round up */ 1829 /* round up */
1672 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1830 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1673 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1831 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1674 1832
1675 /* sanity checks */ 1833 /* sanity checks */
1676 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1677 { 1835 {
1678 MIN_IT (rc[i].col, TermWin.ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1679 MIN_IT (rc[i].row, TermWin.nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1680 } 1838 }
1681 1839// 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++) 1840 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1685 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1841 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)); 1842
1843 num_scr_allow = 0;
1687 1844
1688 if (refresh) 1845 if (refresh)
1689 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1846 scr_refresh ();
1690} 1847}
1691 1848
1692/* ------------------------------------------------------------------------- */ 1849/* ------------------------------------------------------------------------- */
1693/* 1850/*
1694 * Refresh the entire screen 1851 * Refresh the entire screen
1695 */ 1852 */
1696void 1853void
1697rxvt_term::scr_touch (bool refresh) 1854rxvt_term::scr_touch (bool refresh) NOTHROW
1698{ 1855{
1699 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1856 scr_expose (0, 0, width, height, refresh);
1700} 1857}
1701 1858
1702/* ------------------------------------------------------------------------- */ 1859/* ------------------------------------------------------------------------- */
1703/* 1860/*
1704 * Move the display so that the line represented by scrollbar value Y is at 1861 * Move the display so that the line represented by scrollbar value Y is at
1705 * the top of the screen 1862 * the top of the screen
1706 */ 1863 */
1707int 1864void
1708rxvt_term::scr_move_to (int y, int len) 1865rxvt_term::scr_move_to (int y, int len) NOTHROW
1709{ 1866{
1710 long p = 0; 1867 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} 1868}
1725 1869
1726/* ------------------------------------------------------------------------- */ 1870/* ------------------------------------------------------------------------- */
1727/* 1871/*
1728 * Page the screen up/down nlines 1872 * Page the screen up/down nlines
1729 * direction should be UP or DN 1873 * direction should be UP or DN
1730 */ 1874 */
1731int 1875bool
1732rxvt_term::scr_page (enum page_dirn direction, int nlines) 1876rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1733{ 1877{
1734 int n; 1878 int new_view_start =
1735 uint16_t oldviewstart; 1879 direction == UP ? view_start - nlines
1880 : view_start + nlines;
1736 1881
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); 1882 return scr_changeview (new_view_start);
1753} 1883}
1754 1884
1755int 1885bool
1756rxvt_term::scr_changeview (uint16_t oldviewstart) 1886rxvt_term::scr_changeview (int new_view_start) NOTHROW
1757{ 1887{
1888 clamp_it (new_view_start, top_row, 0);
1889
1758 if (TermWin.view_start != oldviewstart) 1890 if (new_view_start == view_start)
1759 { 1891 return false;
1892
1893 num_scr += new_view_start - view_start;
1894 view_start = new_view_start;
1760 want_refresh = 1; 1895 want_refresh = 1;
1761 num_scr -= (TermWin.view_start - oldviewstart);
1762 }
1763 return (int) (TermWin.view_start - oldviewstart);
1764}
1765 1896
1766/* ------------------------------------------------------------------------- */ 1897 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1767void 1898
1768rxvt_term::scr_bell () 1899 return true;
1769{ 1900}
1901
1770#ifndef NO_BELL 1902#ifndef NO_BELL
1903void
1904rxvt_term::bell_cb (ev::timer &w, int revents)
1905{
1906 rvideo_bell = false;
1907 scr_rvideo_mode (rvideo_mode);
1908 refresh_check ();
1909}
1910#endif
1911
1912/* ------------------------------------------------------------------------- */
1913void
1914rxvt_term::scr_bell () NOTHROW
1915{
1916#ifndef NO_BELL
1917
1771# ifndef NO_MAPALERT 1918# ifndef NO_MAPALERT
1772# ifdef MAPALERT_OPTION 1919# ifdef MAPALERT_OPTION
1773 if (Options & Opt_mapAlert) 1920 if (option (Opt_mapAlert))
1774# endif 1921# endif
1775 XMapWindow (display->display, TermWin.parent[0]); 1922 XMapWindow (dpy, parent[0]);
1776# endif 1923# endif
1924
1925# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell))
1927 set_urgency (1);
1928# endif
1929
1777 if (Options & Opt_visualBell) 1930 if (option (Opt_visualBell))
1778 { 1931 {
1779 scr_rvideo_mode (!rvideo); /* refresh also done */ 1932 rvideo_bell = true;
1780 scr_rvideo_mode (!rvideo); /* refresh also done */ 1933 scr_rvideo_mode (rvideo_mode);
1934 flush ();
1935
1936 bell_ev.start (VISUAL_BELL_DURATION);
1781 } 1937 }
1782 else 1938 else
1783 XBell (display->display, 0); 1939 XBell (dpy, 0);
1784#endif 1940#endif
1785} 1941}
1786 1942
1787/* ------------------------------------------------------------------------- */ 1943/* ------------------------------------------------------------------------- */
1788/* ARGSUSED */ 1944/* ARGSUSED */
1789void 1945void
1790rxvt_term::scr_printscreen (int fullhist) 1946rxvt_term::scr_printscreen (int fullhist) NOTHROW
1791{ 1947{
1792#ifdef PRINTPIPE 1948#ifdef PRINTPIPE
1793 int i, r1, nrows, row_offset; 1949 int nrows, row_start;
1794 text_t *t; 1950 FILE *fd = popen_printer ();
1795 FILE *fd;
1796 1951
1797 if ((fd = popen_printer ()) == NULL) 1952 if (!fd)
1798 return; 1953 return;
1799 nrows = TermWin.nrow; 1954
1800 row_offset = TermWin.saveLines;
1801 if (!fullhist) 1955 if (fullhist)
1802 row_offset -= TermWin.view_start; 1956 {
1957 nrows = nrow - top_row;
1958 row_start = top_row;
1959 }
1803 else 1960 else
1804 { 1961 {
1805 nrows += TermWin.nscrolled; 1962 nrows = nrow;
1806 row_offset -= TermWin.nscrolled; 1963 row_start = view_start;
1807 } 1964 }
1808 1965
1966 wctomb (0, 0);
1967
1809 for (r1 = 0; r1 < nrows; r1++) 1968 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 } 1969 {
1970 text_t *tp = ROW(r1).t;
1971 int len = ROW(r1).l;
1972
1973 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1974 {
1975 char mb[MB_LEN_MAX];
1976 text_t t = *tp++;
1977 if (t == NOCHAR)
1978 continue;
1979
1980 len = wctomb (mb, t);
1981
1982 if (len <= 0)
1983 {
1984 mb[0] = ' ';
1985 len = 1;
1986 }
1987
1988 fwrite (mb, 1, len, fd);
1989 }
1990
1991 fputc ('\n', fd);
1992 }
1993
1817 pclose_printer (fd); 1994 pclose_printer (fd);
1818#endif 1995#endif
1819} 1996}
1820 1997
1821/* ------------------------------------------------------------------------- */ 1998/* ------------------------------------------------------------------------- */
1822/* 1999/*
1823 * Refresh the screen 2000 * Refresh the screen
1824 * drawn_text/drawn_rend contain the screen information before the update. 2001 * drawn_text/drawn_rend contain the screen information before the update.
1825 * screen.text/screen.rend contain what the screen will change to. 2002 * screen.text/screen.rend contain what the screen will change to.
1826 */ 2003 */
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 2004void
1838rxvt_term::scr_refresh (unsigned char refresh_type) 2005rxvt_term::scr_refresh () NOTHROW
1839{ 2006{
1840 unsigned char clearfirst, /* first character writes before cell */ 2007 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 */ 2008 showcursor; /* show the cursor */
1845 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
1846 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
1847 int i, /* tmp */ 2011 int i; /* tmp */
1848 row_offset; /* basic offset in screen structure */
1849#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
1850 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
1851#endif 2014#endif
1852 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2015 rend_t *crp; // cursor rendition pointer
1853 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2016 rend_t ccol1, /* Cursor colour */
2017 ccol2; /* Cursor colour2 */
1854 2018
2019 want_refresh = 0; /* screen is current */
2020
1855 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2021 if (refresh_type == NO_REFRESH || !mapped)
1856 return; 2022 return;
1857 2023
1858 /* 2024 /*
1859 * A: set up vars 2025 * A: set up vars
1860 */ 2026 */
1861 clearfirst = clearlast = must_clear = 0;
1862
1863 refresh_count = 0; 2027 refresh_count = 0;
1864 2028
1865 row_offset = TermWin.saveLines - TermWin.view_start; 2029 have_bg = 0;
1866 2030#ifdef HAVE_BG_PIXMAP
1867 if ((refresh_type & REFRESH_BOUNDS)) 2031 have_bg = bgPixmap.pixmap != None;
1868 {
1869 clearfirst = clearlast = 1;
1870 refresh_type &= ~REFRESH_BOUNDS;
1871 }
1872
1873#ifdef XPM_BACKGROUND
1874 must_clear |= (bgPixmap.pixmap != None);
1875#endif
1876#ifdef TRANSPARENT
1877 must_clear |= ((Options & Opt_transparent) && am_transparent);
1878#endif 2032#endif
1879 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1880 2034
1881 /* 2035 /*
1882 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
… …
1885 2039
1886 /* 2040 /*
1887 * C: set the cursor character (s) 2041 * C: set the cursor character (s)
1888 */ 2042 */
1889 { 2043 {
1890 unsigned char setoldcursor; 2044 unsigned char setoldcursor;
1891 rend_t ccol1, /* Cursor colour */
1892 ccol2; /* Cursor colour2 */
1893 2045
1894 showcursor = (screen.flags & Screen_VisibleCursor); 2046 showcursor = (screen.flags & Screen_VisibleCursor);
1895#ifdef CURSOR_BLINK 2047#ifdef CURSOR_BLINK
1896 if (hidden_cursor) 2048 if (hidden_cursor)
1897 showcursor = 0; 2049 showcursor = 0;
1898#endif 2050#endif
1899 2051
1900 if (showcursor) 2052 if (showcursor)
1901 { 2053 {
1902 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2054 int col = screen.cur.col;
1903 [screen.cur.col]);
1904 2055
2056 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2057 col--;
2058
2059 crp = &ROW(screen.cur.row).r[col];
2060
2061#ifndef NO_CURSORCOLOR
2062 cc1 = *crp & (RS_fgMask | RS_bgMask);
2063 if (ISSET_PIXCOLOR (Color_cursor))
2064 ccol1 = Color_cursor;
2065 else
2066#endif
2067#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2068 ccol1 = fgcolor_of (rstyle);
2069#else
2070 ccol1 = Color_fg;
2071#endif
2072
2073#ifndef NO_CURSORCOLOR
2074 if (ISSET_PIXCOLOR (Color_cursor2))
2075 ccol2 = Color_cursor2;
2076 else
2077#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2079 ccol2 = bgcolor_of (rstyle);
2080#else
2081 ccol2 = Color_bg;
2082#endif
2083
1905 if (showcursor && TermWin.focus) 2084 if (showcursor && focus)
1906 { 2085 {
2086 if (option (Opt_cursorUnderline))
1907 *srp ^= RS_RVid; 2087 *crp ^= RS_Uline;
1908#ifndef NO_CURSORCOLOR
1909 cc1 = *srp & (RS_fgMask | RS_bgMask);
1910 if (ISSET_PIXCOLOR (Color_cursor))
1911 ccol1 = Color_cursor;
1912 else 2088 else
1913#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1914 ccol1 = GET_FGCOLOR (rstyle);
1915#else
1916 ccol1 = Color_fg;
1917#endif
1918 if (ISSET_PIXCOLOR (Color_cursor2))
1919 ccol2 = Color_cursor2;
1920 else 2089 {
1921#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2090 *crp ^= RS_RVid;
1922 ccol2 = GET_BGCOLOR (rstyle);
1923#else
1924 ccol2 = Color_bg;
1925#endif
1926 *srp = SET_FGCOLOR (*srp, ccol1); 2091 *crp = SET_FGCOLOR (*crp, ccol1);
1927 *srp = SET_BGCOLOR (*srp, ccol2); 2092 *crp = SET_BGCOLOR (*crp, ccol2);
1928#endif 2093 }
1929 } 2094 }
1930 } 2095 }
1931 2096
1932 /* make sure no outline cursor is left around */ 2097 /* make sure no outline cursor is left around */
1933 setoldcursor = 0; 2098 setoldcursor = 0;
1934 if (ocrow != -1) 2099 if (ocrow != -1)
1935 { 2100 {
1936 if (screen.cur.row + TermWin.view_start != ocrow 2101 if (screen.cur.row - view_start != ocrow
1937 || screen.cur.col != oldcursor.col) 2102 || screen.cur.col != oldcursor.col)
1938 { 2103 {
1939 if (ocrow < TermWin.nrow 2104 if (ocrow < nrow
1940 && oldcursor.col < TermWin.ncol) 2105 && oldcursor.col < ncol)
1941 {
1942 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2106 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
1943 } 2107
1944 if (TermWin.focus || !showcursor) 2108 if (focus || !showcursor)
1945 oldcursor.row = -1; 2109 oldcursor.row = -1;
1946 else 2110 else
1947 setoldcursor = 1; 2111 setoldcursor = 1;
1948 } 2112 }
1949 } 2113 }
1950 else if (!TermWin.focus) 2114 else if (!focus)
1951 setoldcursor = 1; 2115 setoldcursor = 1;
2116
1952 if (setoldcursor) 2117 if (setoldcursor)
1953 { 2118 {
1954 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2119 if (screen.cur.row - view_start >= nrow)
1955 oldcursor.row = -1; 2120 oldcursor.row = -1;
1956 else 2121 else
1957 { 2122 {
1958 oldcursor.row = screen.cur.row + TermWin.view_start; 2123 oldcursor.row = screen.cur.row - view_start;
1959 oldcursor.col = screen.cur.col; 2124 oldcursor.col = screen.cur.col;
1960 } 2125 }
1961 } 2126 }
1962 } 2127 }
2128
2129 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2130#if ENABLE_OVERLAY
2131 scr_swap_overlay ();
2132#endif
1963 2133
1964#ifndef NO_SLOW_LINK_SUPPORT 2134#ifndef NO_SLOW_LINK_SUPPORT
1965 /* 2135 /*
1966 * D: CopyArea pass - very useful for slower links 2136 * D: CopyArea pass - very useful for slower links
1967 * This has been deliberately kept simple. 2137 * This has been deliberately kept simple.
1968 */ 2138 */
1969 i = num_scr; 2139 if (!display->is_local
1970 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2140 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
1971 && abs (i) < TermWin.nrow && !must_clear) 2141 && abs (num_scr) < nrow && !have_bg)
1972 { 2142 {
1973 int16_t nits; 2143 int16_t nits;
1974 int j; 2144 int i = num_scr;
1975 rend_t *drp2; 2145 int j;
1976 text_t *dtp2;
1977 int len, wlen; 2146 int len, wlen;
2147 dLocal (int, num_scr);
1978 2148
1979 j = TermWin.nrow; 2149 j = nrow;
1980 wlen = len = -1; 2150 wlen = len = -1;
1981 row = i > 0 ? 0 : j - 1; 2151 row = i > 0 ? 0 : j - 1;
2152
1982 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2153 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1983 { 2154 {
1984 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2155 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
1985 { 2156 {
1986 stp = screen.text[row + row_offset]; 2157 line_t s = ROW(view_start + row);
1987 srp = screen.rend[row + row_offset];
1988 dtp = drawn_text[row]; 2158 line_t d = drawn_buf[row];
1989 dtp2 = drawn_text[row + i]; 2159 line_t d2 = drawn_buf[row + i];
1990 drp = drawn_rend[row];
1991 drp2 = drawn_rend[row + i];
1992 2160
1993 for (nits = 0, col = TermWin.ncol; col--; ) 2161 for (nits = 0, col = ncol; col--; )
1994 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2162 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
1995 nits--; 2163 nits--;
1996 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2164 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
1997 nits++; 2165 nits++;
1998 2166
1999 if (nits > 8) /* XXX: arbitrary choice */ 2167 if (nits > 8) /* XXX: arbitrary choice */
2000 { 2168 {
2001 for (col = TermWin.ncol; col--; ) 2169 for (col = ncol; col--; )
2002 { 2170 {
2003 *dtp++ = *dtp2++; 2171 *d.t++ = *d2.t++;
2004 *drp++ = *drp2++; 2172 *d.r++ = *d2.r++;
2005 } 2173 }
2006 2174
2007 if (len == -1) 2175 if (len == -1)
2008 len = row; 2176 len = row;
2009 2177
2010 wlen = row; 2178 wlen = row;
2011 continue; 2179 continue;
2012 } 2180 }
2013 } 2181 }
2014 2182
2015 if (len != -1) 2183 if (len >= 0)
2016 { 2184 {
2017 /* also comes here at end if needed because of >= above */ 2185 /* also comes here at end if needed because of >= above */
2018 if (wlen < len) 2186 if (wlen < len)
2019 SWAP_IT (wlen, len, int); 2187 ::swap (wlen, len);
2020 2188
2021 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); 2189 XGCValues gcv;
2022 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2190
2191 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2192 XCopyArea (dpy, vt, vt,
2023 TermWin.gc, 0, Row2Pixel (len + i), 2193 gc, 0, Row2Pixel (len + i),
2024 (unsigned int)TermWin_TotalWidth (), 2194 (unsigned int)this->width,
2025 (unsigned int)Height2Pixel (wlen - len + 1), 2195 (unsigned int)Height2Pixel (wlen - len + 1),
2026 0, Row2Pixel (len)); 2196 0, Row2Pixel (len));
2197 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2198
2027 len = -1; 2199 len = -1;
2028 } 2200 }
2029 } 2201 }
2030 } 2202 }
2031#endif 2203#endif
2032 2204
2033 /* 2205 /*
2034 * E: main pass across every character 2206 * E: main pass across every character
2035 */ 2207 */
2036 for (row = 0; row < TermWin.nrow; row++) 2208 for (row = 0; row < nrow; row++)
2037 { 2209 {
2038 stp = screen.text[row + row_offset]; 2210 text_t *stp = ROW(view_start + row).t;
2039 srp = screen.rend[row + row_offset]; 2211 rend_t *srp = ROW(view_start + row).r;
2040 dtp = drawn_text[row]; 2212 text_t *dtp = drawn_buf[row].t;
2041 drp = drawn_rend[row]; 2213 rend_t *drp = drawn_buf[row].r;
2042 2214
2043 /* 2215 /*
2044 * E2: OK, now the real pass 2216 * E2: OK, now the real pass
2045 */ 2217 */
2046 int ypixel = (int)Row2Pixel (row); 2218 int ypixel = (int)Row2Pixel (row);
2047 2219
2048 for (col = 0; col < TermWin.ncol; col++) 2220 for (col = 0; col < ncol; col++)
2049 { 2221 {
2050 /* compare new text with old - if exactly the same then continue */ 2222 /* compare new text with old - if exactly the same then continue */
2223 if (stp[col] == dtp[col] /* Must match characters to skip. */
2224 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2225 || (stp[col] == ' ' /* space w/ no background change */
2226 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2227 continue;
2228
2229 // redraw one or more characters
2230
2231 // seek to the beginning of wide characters
2232 while (expect_false (stp[col] == NOCHAR && col > 0))
2233 --col;
2234
2051 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2235 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2052
2053 if (stp[col] == dtp[col] /* Must match characters to skip. */
2054 && (rend == drp[col] /* Either rendition the same or */
2055 || (stp[col] == ' ' /* space w/ no background change */
2056 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2057 continue;
2058
2059 text_t *text = stp + col; 2236 text_t *text = stp + col;
2060 int count = 1; 2237 int count = 1;
2061 2238
2062 /* redraw one or more characters */
2063
2064 dtp[col] = stp[col]; 2239 dtp[col] = stp[col];
2065 drp[col] = rend; 2240 drp[col] = rend;
2066 2241
2067 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2068 continue;
2069
2070 int xpixel = Col2Pixel (col); 2242 int xpixel = Col2Pixel (col);
2071 2243
2072 // this loop looks very messy, it can probably be optimized
2073 // and cleaned a bit by you?
2074 for (i = 0; ++col < TermWin.ncol; ) 2244 for (i = 0; ++col < ncol; )
2075 { 2245 {
2076 if (stp[col] == NOCHAR) 2246 if (stp[col] == NOCHAR)
2077 { 2247 {
2078 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2079 drp[col] = rend; 2249 drp[col] = rend;
2080 count++; 2250 count++;
2081
2082 if (i) // only possible skip if char unchanged
2083 i++; 2251 i++;
2084 2252
2085 continue; 2253 continue;
2086 } 2254 }
2087 2255
2088 if (rend != srp[col]) 2256 if (!RS_SAME (rend, srp[col]))
2089 break; 2257 break;
2090 2258
2091 count++; 2259 count++;
2092 2260
2093 if (stp[col] != dtp[col] 2261 if (stp[col] != dtp[col]
2094 || srp[col] != drp[col]) 2262 || !RS_SAME (srp[col], drp[col]))
2095 { 2263 {
2096 if (must_clear && (i++ > (count / 2))) 2264 if (have_bg && (i++ > count / 2))
2097 break; 2265 break;
2098 2266
2099 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2100 drp[col] = rend; 2268 drp[col] = rend;
2101 i = 0; 2269 i = 0;
2102 } 2270 }
2103 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2271 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2104 break; 2272 break;
2105 } 2273 }
2106 2274
2107 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2108 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2277
2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2279 while (expect_false (i && text[count] == NOCHAR))
2280 count++, i--;
2109 2281
2110 /* 2282 /*
2111 * Determine the attributes for the string 2283 * Determine the attributes for the string
2112 */ 2284 */
2113 int fid = GET_FONT (rend);
2114 int fore = GET_FGCOLOR (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2115 int back = GET_BGCOLOR (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2116 2287
2117 rend = GET_ATTR (rend); 2288 // only do special processing if any attributes are set, which is unlikely
2118 2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2119 rvid = !! (rend & RS_RVid);
2120 if (rvid)
2121 { 2290 {
2122 SWAP_IT (fore, back, int); 2291 bool invert = rend & RS_RVid;
2123 2292
2124#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg)
2295 {
2125 if (ISSET_PIXCOLOR (Color_RV) 2296 if (ISSET_PIXCOLOR (Color_BD))
2126# ifndef NO_CURSORCOLOR 2297 fore = Color_BD;
2127 && !ISSET_PIXCOLOR (Color_cursor) 2298# if !ENABLE_STYLES
2299 else
2300 invert = !invert;
2128# endif 2301# endif
2129 ) 2302 }
2303
2304 if (rend & RS_Italic && fore == Color_fg)
2305 {
2306 if (ISSET_PIXCOLOR (Color_IT))
2307 fore = Color_IT;
2308# if !ENABLE_STYLES
2309 else
2310 invert = !invert;
2311# endif
2312 }
2313
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL;
2316#endif
2317
2318 if (invert)
2319 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331
2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2130 back = Color_RV; 2335 back = Color_RV;
2131#endif 2336# endif
2337 if (fore == back)
2338 {
2339 fore = Color_bg;
2340 back = Color_fg;
2341 }
2342#endif
2343 }
2132 2344
2345#ifdef TEXT_BLINK
2346 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2347 {
2348 if (!text_blink_ev.is_active ())
2349 {
2350 text_blink_ev.again ();
2351 hidden_text = 0;
2352 }
2353 else if (hidden_text)
2354 fore = back;
2355 }
2356#endif
2357
2358#if ENABLE_STYLES
2359 // "careful" (too wide) character handling
2360
2361 // include previous careful character(s) if possible, looks nicer (best effort...)
2362 while (text > stp
2363 && srp[text - stp - 1] & RS_Careful
2364 && RS_SAME (rend, srp[text - stp - 1]))
2365 text--, count++, xpixel -= fwidth;
2366
2367 // force redraw after "careful" characters to avoid pixel droppings
2368 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2369 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2370
2371 // force redraw before "careful" characters to avoid pixel droppings
2372 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2373 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2374#endif
2133 } 2375 }
2134#ifdef TEXT_BLINK
2135 if (rend & RS_Blink)
2136 {
2137 if (!text_blink_ev.active)
2138 {
2139 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2140 hidden_text = 0;
2141 }
2142 else if (hidden_text)
2143 fore = back;
2144 }
2145#endif
2146#ifndef NO_BOLD_UNDERLINE_REVERSE
2147 else if (rend & RS_Bold)
2148 {
2149 if (ISSET_PIXCOLOR (Color_BD))
2150 fore = Color_BD;
2151 else if (fore == Color_fg)
2152 fore = Color_White;
2153 }
2154 else if (rend & RS_Uline)
2155 {
2156 if (ISSET_PIXCOLOR (Color_UL))
2157 fore = Color_UL;
2158 }
2159#endif
2160 2376
2161 /* 2377 /*
2162 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2163 */ 2379 */
2164 rxvt_font *font = (*TermWin.fontset)[fid]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2165 2381
2166 if (back == fore) 2382 if (expect_true (have_bg && back == Color_bg))
2167 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2168 TermWin.fwidth * count, TermWin.fheight,
2169 back);
2170 else if (back == Color_bg)
2171 { 2383 {
2172 if (must_clear) 2384 // this is very ugly, maybe push it into ->draw?
2173 {
2174 CLEAR_CHARS (xpixel, ypixel, count);
2175 2385
2176 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2177 if (text[i] != ' ') 2387 if (text[i] != ' ')
2178 { 2388 {
2179 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2180 break; 2390 goto did_clear;
2181 }
2182 } 2391 }
2183 else 2392
2184 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2393 CLEAR_CHARS (xpixel, ypixel, count);
2394 did_clear: ;
2185 } 2395 }
2186 else 2396 else
2187 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2188 2398
2189 if ((rend & RS_Uline) && (font->descent > 1)) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2190 XDrawLine (display->display, drawBuffer, TermWin.gc, 2400 {
2401#if ENABLE_FRILLS
2402 if (ISSET_PIXCOLOR (Color_underline))
2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2404 else
2405#endif
2406 XSetForeground (dpy, gc, pix_colors[fore]);
2407
2408 XDrawLine (dpy, vt, gc,
2191 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2192 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411 }
2193 } /* for (col....) */ 2412 } /* for (col....) */
2194 } /* for (row....) */ 2413 } /* for (row....) */
2414
2415#if ENABLE_OVERLAY
2416 scr_swap_overlay ();
2417#endif
2418 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2195 2419
2196 /* 2420 /*
2197 * G: cleanup cursor and display outline cursor if necessary 2421 * G: cleanup cursor and display outline cursor if necessary
2198 */ 2422 */
2199 if (showcursor) 2423 if (showcursor)
2200 { 2424 {
2201 if (TermWin.focus) 2425 if (focus)
2426 {
2427 if (option (Opt_cursorUnderline))
2428 *crp ^= RS_Uline;
2429 else
2202 { 2430 {
2203 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2204 [screen.cur.col]);
2205 *srp ^= RS_RVid; 2431 *crp ^= RS_RVid;
2206#ifndef NO_CURSORCOLOR 2432#ifndef NO_CURSORCOLOR
2207 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2433 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2208#endif 2434#endif
2435 }
2209 } 2436 }
2210 else if (oldcursor.row >= 0) 2437 else if (oldcursor.row >= 0)
2211 { 2438 {
2439 int cursorwidth = 1;
2440 int col = oldcursor.col;
2441
2442 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2443 col--;
2444
2445 while (col + cursorwidth < ncol
2446 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2447 cursorwidth++;
2448
2212#ifndef NO_CURSORCOLOR 2449#ifndef NO_CURSORCOLOR
2213 if (ISSET_PIXCOLOR (Color_cursor)) 2450 if (ISSET_PIXCOLOR (Color_cursor))
2214 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2451 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2452 else
2215#endif 2453#endif
2216 int cursorwidth = 1; 2454 XSetForeground (dpy, gc, pix_colors[ccol1]);
2217 while (oldcursor.col + cursorwidth < TermWin.ncol
2218 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2219 cursorwidth++;
2220 2455
2221 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2456 XDrawRectangle (dpy, vt, gc,
2222 Col2Pixel (oldcursor.col), 2457 Col2Pixel (col),
2223 Row2Pixel (oldcursor.row), 2458 Row2Pixel (oldcursor.row),
2224 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2459 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2225 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2460 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2226 } 2461 }
2227 } 2462 }
2228 2463
2229 /* 2464 /*
2230 * H: cleanup selection 2465 * H: cleanup selection
2231 */ 2466 */
2232 scr_reverse_selection (); 2467 scr_reverse_selection ();
2233 2468
2234 /*
2235 * I: other general cleanup
2236 */
2237 if (clearfirst && TermWin.int_bwidth)
2238 /*
2239 * clear the whole screen height, note that width == 0 is treated
2240 * specially by XClearArea
2241 */
2242 XClearArea (display->display, TermWin.vt, 0, 0,
2243 (unsigned int)TermWin.int_bwidth,
2244 (unsigned int)TermWin_TotalHeight (), False);
2245 if (clearlast && TermWin.int_bwidth)
2246 /*
2247 * clear the whole screen height, note that width == 0 is treated
2248 * specially by XClearArea
2249 */
2250 XClearArea (display->display, TermWin.vt,
2251 TermWin.width + TermWin.int_bwidth, 0,
2252 (unsigned int)TermWin.int_bwidth,
2253 (unsigned int)TermWin_TotalHeight (), False);
2254 if (refresh_type & SMOOTH_REFRESH)
2255 XSync (display->display, False);
2256
2257 num_scr = 0; 2469 num_scr = 0;
2258 num_scr_allow = 1; 2470 num_scr_allow = 1;
2259 want_refresh = 0; /* screen is current */
2260} 2471}
2261 2472
2262void 2473void
2263rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2474rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2264{ 2475{
2265 if (!rp || !tp) 2476 if (!l.t)
2266 return; 2477 return;
2267 2478
2268 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2479 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2269 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2270}
2271 2480
2481 for (int i = ncol; i--; )
2482 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2483}
2484
2272void 2485void
2273rxvt_term::scr_remap_chars () 2486rxvt_term::scr_remap_chars () NOTHROW
2274{ 2487{
2275 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2488 for (int i = total_rows; i--; )
2276 scr_remap_chars (screen.text[i], screen.rend[i]); 2489 scr_remap_chars (row_buf [i]);
2277 2490
2278 for (int i = TermWin.nrow; i--; ) 2491 for (int i = nrow; i--; )
2492 {
2493 scr_remap_chars (drawn_buf [i]);
2494 scr_remap_chars (swap_buf [i]);
2495 }
2496}
2497
2498void
2499rxvt_term::scr_recolour () NOTHROW
2500{
2501#ifdef HAVE_BG_PIXMAP
2502 bgPixmap.apply ();
2503#else
2504
2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2506 XClearWindow (dpy, parent[0]);
2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2508
2509 if (scrollBar.win)
2279 { 2510 {
2280 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2281 scr_remap_chars (swap.text[i], swap.rend[i]); 2512 scrollBar.state = STATE_IDLE;
2513 scrollBar.show (0);
2282 } 2514 }
2283}
2284 2515
2516#endif
2517
2518 /* bgPixmap.apply () does not do the following : */
2519 scr_clear ();
2520 scr_touch (true);
2521 want_refresh = 1;
2522}
2523
2285/* ------------------------------------------------------------------------- */ 2524/* ------------------------------------------------------------------------- */
2286void 2525void
2287rxvt_term::scr_clear () 2526rxvt_term::scr_clear (bool really) NOTHROW
2288{ 2527{
2289 if (!TermWin.mapped) 2528 if (!mapped)
2290 return; 2529 return;
2291 2530
2292 num_scr_allow = 0; 2531 num_scr_allow = 0;
2293 want_refresh = 1; 2532 want_refresh = 1;
2294#ifdef TRANSPARENT 2533
2295 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2534 if (really)
2535 XClearWindow (dpy, vt);
2536}
2537
2538void
2539rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2540{
2541 int view_end = view_start + nrow;
2542 int row, col;
2543
2544 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2545 {
2546 text_t *stp = ROW(row).t;
2547 rend_t *srp = ROW(row).r;
2548
2549 for (col = beg_col; col < end_col; col++)
2550 srp[col] ^= rstyle1;
2551
2552 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2553 srp[col] ^= rstyle2;
2554
2555 if (++col < end_col)
2556 srp[col] ^= rstyle2;
2296 { 2557 }
2297 int i; 2558}
2298 2559
2299 if (! (Options & Opt_transparent_all)) 2560void
2561rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2562{
2563 int view_end = view_start + nrow;
2564 int row, col;
2565
2566 if (beg_row >= view_start)
2567 {
2568 col = beg_col;
2569 row = beg_row;
2570 }
2571 else
2572 {
2300 i = 0; 2573 col = 0;
2574 row = view_start;
2575 }
2576
2577 for (; row < min (end_row, view_end); row++, col = 0)
2578 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2579 srp[col] ^= rstyle;
2580
2581 if (row == end_row)
2582 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2583 srp[col] ^= rstyle;
2584}
2585
2586/* ------------------------------------------------------------------------- */
2587void
2588rxvt_term::scr_reverse_selection () NOTHROW
2589{
2590 if (selection.op
2591 && current_screen == selection.screen
2592 && selection.end.row >= view_start)
2593 {
2594#if !ENABLE_MINIMAL
2595 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline);
2301 else 2599 else
2302 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2303
2304 while (i--)
2305 if (TermWin.parent[i] != None)
2306 XClearWindow (display->display, TermWin.parent[i]);
2307 }
2308#endif 2600#endif
2309 2601 scr_xor_span (selection.beg.row, selection.beg.col,
2310 XClearWindow (display->display, TermWin.vt); 2602 selection.end.row, selection.end.col,
2311} 2603 RS_RVid);
2312
2313/* ------------------------------------------------------------------------- */
2314void
2315rxvt_term::scr_reverse_selection ()
2316{
2317 int i, col, row, end_row;
2318 rend_t *srp;
2319
2320 if (selection.op && current_screen == selection.screen)
2321 {
2322 end_row = TermWin.saveLines - TermWin.view_start;
2323 i = selection.beg.row + TermWin.saveLines;
2324 row = selection.end.row + TermWin.saveLines;
2325 if (i >= end_row)
2326 col = selection.beg.col;
2327 else
2328 {
2329 col = 0;
2330 i = end_row;
2331 }
2332 end_row += TermWin.nrow;
2333 for (; i < row && i < end_row; i++, col = 0)
2334 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2335 srp[col] ^= RS_RVid;
2336 if (i == row && i < end_row)
2337 for (srp = screen.rend[i]; col < selection.end.col; col++)
2338 srp[col] ^= RS_RVid;
2339 } 2604 }
2340} 2605}
2341 2606
2342/* ------------------------------------------------------------------------- */ 2607/* ------------------------------------------------------------------------- */
2343/* 2608/*
2344 * Dump the whole scrollback and screen to the passed filedescriptor. The 2609 * Dump the whole scrollback and screen to the passed filedescriptor. The
2345 * invoking routine must close the fd. 2610 * invoking routine must close the fd.
2346 */ 2611 */
2347#if 0 2612#if 0
2348void 2613void
2349rxvt_term::scr_dump (int fd) 2614rxvt_term::scr_dump (int fd) NOTHROW
2350{ 2615{
2351 int row, wrote; 2616 int row, wrote;
2352 unsigned int width, towrite; 2617 unsigned int width, towrite;
2353 char r1[] = "\n"; 2618 char r1[] = "\n";
2354 2619
2355 for (row = TermWin.saveLines - TermWin.nscrolled; 2620 for (row = saveLines + top_row;
2356 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2621 row < saveLines + nrow - 1; row++)
2357 { 2622 {
2358 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2359 : TermWin.ncol; 2624 : ncol;
2360 for (towrite = width; towrite; towrite -= wrote) 2625 for (towrite = width; towrite; towrite -= wrote)
2361 { 2626 {
2362 wrote = write (fd, & (screen.text[row][width - towrite]), 2627 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2363 towrite); 2628 towrite);
2364 if (wrote < 0) 2629 if (wrote < 0)
2365 return; /* XXX: death, no report */ 2630 return; /* XXX: death, no report */
2366 } 2631 }
2367 if (screen.tlen[row] >= 0) 2632 if (row_buf[row].l >= 0)
2368 if (write (fd, r1, 1) <= 0) 2633 if (write (fd, r1, 1) <= 0)
2369 return; /* XXX: death, no report */ 2634 return; /* XXX: death, no report */
2370 } 2635 }
2371} 2636}
2372#endif 2637#endif
2373 2638
2374/* ------------------------------------------------------------------------- * 2639/* ------------------------------------------------------------------------- *
2375 * CHARACTER SELECTION * 2640 * CHARACTER SELECTION *
2376 * ------------------------------------------------------------------------- */ 2641 * ------------------------------------------------------------------------- */
2377
2378/*
2379 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2380 */
2381void 2642void
2382rxvt_term::selection_check (int check_more) 2643rxvt_term::selection_check (int check_more) NOTHROW
2383{ 2644{
2384 row_col_t pos; 2645 row_col_t pos;
2385 2646
2386 if (!selection.op) 2647 if (!selection.op)
2387 return; 2648 return;
2388 2649
2389 pos.row = pos.col = 0; 2650 pos.row = pos.col = 0;
2390 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2651 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2391 || (selection.beg.row >= TermWin.nrow) 2652 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2392 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2653 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2393 || (selection.mark.row >= TermWin.nrow)
2394 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2395 || (selection.end.row >= TermWin.nrow)
2396 || (check_more == 1 2654 || (check_more == 1
2397 && current_screen == selection.screen 2655 && current_screen == selection.screen
2398 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2656 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2399 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2657 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2400 || (check_more == 2 2658 || (check_more == 2
… …
2402 && ROWCOL_IS_AFTER (selection.end, pos)) 2660 && ROWCOL_IS_AFTER (selection.end, pos))
2403 || (check_more == 3 2661 || (check_more == 3
2404 && ROWCOL_IS_AFTER (selection.end, pos)) 2662 && ROWCOL_IS_AFTER (selection.end, pos))
2405 || (check_more == 4 /* screen width change */ 2663 || (check_more == 4 /* screen width change */
2406 && (selection.beg.row != selection.end.row 2664 && (selection.beg.row != selection.end.row
2407 || selection.end.col > TermWin.ncol))) 2665 || selection.end.col > ncol)))
2408 CLEAR_SELECTION (); 2666 CLEAR_SELECTION ();
2409} 2667}
2410 2668
2411/* ------------------------------------------------------------------------- */ 2669/* ------------------------------------------------------------------------- */
2412/* 2670/*
2413 * Paste a selection direct to the command fd 2671 * Paste a selection direct to the command fd
2414 */ 2672 */
2415void 2673void
2416rxvt_term::paste (const unsigned char *data, unsigned int len) 2674rxvt_term::paste (char *data, unsigned int len) NOTHROW
2417{ 2675{
2418 unsigned int i, j, n;
2419 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2420
2421#if 0
2422 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2423 ZERO_SCROLLBACK (r);
2424#endif
2425
2426 /* convert normal newline chars into common keyboard Return key sequence */ 2676 /* convert normal newline chars into common keyboard Return key sequence */
2427 for (i = 0; i < len; i += PROP_SIZE) 2677 for (unsigned int i = 0; i < len; i++)
2428 { 2678 if (data[i] == C0_LF)
2429 n = min (len - i, PROP_SIZE); 2679 data[i] = C0_CR;
2430 MEMCPY (ds, data + i, n);
2431 2680
2432 for (j = 0; j < n; j++) 2681 if (priv_modes & PrivMode_BracketPaste)
2433 if (ds[j] == '\n') 2682 tt_printf ("\e[200~");
2434 ds[j] = '\r';
2435 2683
2436 tt_write (ds, (int)n); 2684 tt_write (data, len);
2437 }
2438 2685
2439 free (ds); 2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~");
2440} 2688}
2441 2689
2442/* ------------------------------------------------------------------------- */ 2690/* ------------------------------------------------------------------------- */
2443/* 2691/*
2444 * Respond to a notification that a primary selection has been sent 2692 * Respond to a notification that a primary selection has been sent
2445 * EXT: SelectionNotify 2693 * EXT: SelectionNotify
2446 */ 2694 */
2447int 2695void
2448rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2449{ 2697{
2450 long nread = 0;
2451 unsigned long bytes_after;
2452 XTextProperty ct;
2453
2454 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2455
2456 if (prop == None) /* check for failed XConvertSelection */ 2698 if (prop == None) /* check for failed XConvertSelection */
2457 { 2699 {
2458 if ((selection_type & Sel_CompoundText)) 2700 if ((selection_type & Sel_CompoundText))
2459 { 2701 {
2460 int selnum = selection_type & Sel_whereMask; 2702 int selnum = selection_type & Sel_whereMask;
… …
2473 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2715 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2474 else 2716 else
2475 selection_type = 0; 2717 selection_type = 0;
2476 } 2718 }
2477 2719
2478 return 0; 2720 return;
2479 }
2480
2481 for (;;)
2482 { 2721 }
2483 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2722
2484 (long) (PROP_SIZE / 4), delete_prop, 2723 unsigned long bytes_after;
2724 XTextProperty ct;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 0, PROP_SIZE / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct.encoding, &ct.format,
2730 &ct.nitems, &bytes_after,
2731 &ct.value) != Success)
2732 {
2733 ct.value = 0;
2734 goto bailout;
2735 }
2736
2737 if (ct.encoding == None)
2738 goto bailout;
2739
2740 if (bytes_after)
2741 {
2742 // fetch and append remaining data
2743 XTextProperty ct2;
2744
2745 if (XGetWindowProperty (dpy, win, prop,
2746 ct.nitems / 4, (bytes_after + 3) / 4,
2747 delete_prop, AnyPropertyType,
2485 AnyPropertyType, &ct.encoding, &ct.format, 2748 &ct2.encoding, &ct2.format,
2486 &ct.nitems, &bytes_after, 2749 &ct2.nitems, &bytes_after,
2487 &ct.value) != Success) 2750 &ct2.value) != Success)
2488 break; 2751 goto bailout;
2489 2752
2490 if (ct.encoding == 0) 2753 // realloc should be compatible to XFree, here, and elsewhere, too
2491 { 2754 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2492 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2755 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2493 break; 2756 ct.nitems += ct2.nitems;
2494 }
2495 2757
2758 XFree (ct2.value);
2759 }
2760
2496 if (ct.value == NULL) 2761 if (ct.value == 0)
2497 { 2762 goto bailout;
2498 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2499 continue;
2500 }
2501 2763
2764 if (ct.encoding == xa[XA_INCR])
2765 {
2766 // INCR selection, start handshake
2767 if (!delete_prop)
2768 XDeleteProperty (dpy, win, prop);
2769
2770 selection_wait = Sel_incr;
2771 incr_buf_fill = 0;
2772 incr_ev.start (10);
2773
2774 goto bailout;
2775 }
2776
2502 if (ct.nitems == 0) 2777 if (ct.nitems == 0)
2778 {
2779 if (selection_wait == Sel_incr)
2780 {
2781 XFree (ct.value);
2782
2783 // finally complete, now paste the whole thing
2784 selection_wait = Sel_normal;
2785 ct.value = (unsigned char *)incr_buf;
2786 ct.nitems = incr_buf_fill;
2787 incr_buf = 0;
2788 incr_buf_size = 0;
2789 incr_ev.stop ();
2503 { 2790 }
2504 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2791 else
2792 {
2505 if (selection_wait == Sel_normal && nread == 0) 2793 if (selection_wait == Sel_normal
2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2506 { 2795 {
2507 /* 2796 /*
2508 * pass through again trying CUT_BUFFER0 if we've come from 2797 * pass through again trying CUT_BUFFER0 if we've come from
2509 * XConvertSelection () but nothing was presented 2798 * XConvertSelection () but nothing was presented
2510 */ 2799 */
2511 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2512 selection_paste (display->root, XA_CUT_BUFFER0, False); 2800 selection_paste (display->root, XA_CUT_BUFFER0, False);
2513 } 2801 }
2514 2802
2515 nread = -1; /* discount any previous stuff */ 2803 goto bailout;
2516 break;
2517 }
2518
2519 nread += ct.nitems;
2520
2521 char **cl;
2522 int cr;
2523 if (XmbTextPropertyToTextList (display->display, &ct, &cl,
2524 &cr) >= 0 && cl)
2525 { 2804 }
2805 }
2806 else if (selection_wait == Sel_incr)
2807 {
2808 incr_ev.start (10);
2809
2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2811 {
2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2814 }
2815
2816 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2817 incr_buf_fill += ct.nitems;
2818
2819 goto bailout;
2820 }
2821
2822 char **cl;
2823 int cr;
2824
2825#if !ENABLE_MINIMAL
2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2827 // so recode it manually
2828 if (ct.encoding == xa[XA_UTF8_STRING])
2829 {
2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2831 char *s = rxvt_wcstombs (w);
2832 free (w);
2833 // TODO: strlen == only the first element will be converted. well...
2834 paste (s, strlen (s));
2835 free (s);
2836 }
2837 else
2838#endif
2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2840 && cl)
2841 {
2526 for (int i = 0; i < cr; i++) 2842 for (int i = 0; i < cr; i++)
2527 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2843 paste (cl[i], strlen (cl[i]));
2528 2844
2529 XFreeStringList (cl); 2845 XFreeStringList (cl);
2530 } 2846 }
2531 else 2847 else
2532 paste (ct.value, ct.nitems); 2848 paste ((char *)ct.value, ct.nitems); // paste raw
2533 2849
2534 if (bytes_after == 0) 2850bailout:
2535 break;
2536
2537 XFree (ct.value);
2538 }
2539
2540 if (ct.value)
2541 XFree (ct.value); 2851 XFree (ct.value);
2542 2852
2543 if (selection_wait == Sel_normal) 2853 if (selection_wait == Sel_normal)
2544 selection_wait = Sel_none; 2854 selection_wait = Sel_none;
2545
2546 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2547 return (int)nread;
2548} 2855}
2549 2856
2550void 2857void
2551rxvt_term::incr_cb (time_watcher &w) 2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2552{ 2859{
2553 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2554 2861
2862 incr_buf_size = 0;
2863 free (incr_buf);
2864
2555 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2865 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2556} 2866}
2557 2867
2558/*
2559 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2560 */
2561void 2868void
2562rxvt_term::selection_property (Window win, Atom prop) 2869rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2563{ 2870{
2564 int reget_time = 0; 2871 if (prop == None || selection_wait != Sel_incr)
2565
2566 if (prop == None)
2567 return; 2872 return;
2568 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2569 if (selection_wait == Sel_normal)
2570 {
2571 int a, afmt;
2572 Atom atype;
2573 unsigned long bytes_after, nitems;
2574 unsigned char *s = NULL;
2575 2873
2576 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2577 xa[XA_INCR], &atype, &afmt, &nitems,
2578 &bytes_after, &s);
2579 if (s)
2580 XFree (s);
2581 if (a != Success)
2582 return;
2583#ifndef __CYGWIN32__
2584 if (atype == xa[XA_INCR])
2585 { /* start an INCR transfer */
2586 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2587 XDeleteProperty (display->display, win, prop);
2588 XFlush (display->display);
2589 reget_time = 1;
2590 selection_wait = Sel_incr;
2591 }
2592#endif
2593
2594 }
2595 else if (selection_wait == Sel_incr)
2596 {
2597 reget_time = 1;
2598 if (selection_paste (win, prop, True) == -1) 2874 selection_paste (win, prop, true);
2599 {
2600 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2601 selection_wait = Sel_none;
2602 incr_ev.stop ();
2603 }
2604 }
2605 if (reget_time) /* received more data so reget time */
2606 incr_ev.start (NOW + 10);
2607} 2875}
2876
2608/* ------------------------------------------------------------------------- */ 2877/* ------------------------------------------------------------------------- */
2609/* 2878/*
2610 * Request the current selection: 2879 * Request the current selection:
2611 * Order: > internal selection if available 2880 * Order: > internal selection if available
2612 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2613 * > CUT_BUFFER0 2882 * > CUT_BUFFER0
2614 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2615 * will auto fallback to CUT_BUFFER0 2884 * will auto fallback to CUT_BUFFER0
2616 * EXT: button 2 release 2885 * EXT: button 2 release
2617 */ 2886 */
2618void 2887void
2619rxvt_term::selection_request (Time tm, int x, int y) 2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2620{ 2889{
2621 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2890 if (selection.text && selnum == Sel_Primary)
2622 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2891 {
2623 return; /* outside window */
2624
2625 if (selection.text != NULL)
2626 { /* internal selection */ 2892 /* internal selection */
2627 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2628 paste (selection.text, selection.len); 2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2894 paste (str, strlen (str));
2895 free (str);
2629 return; 2896 return;
2630 } 2897 }
2631 else 2898 else
2632 { 2899 {
2633 int i;
2634
2635 selection_request_time = tm; 2900 selection_request_time = tm;
2636 selection_wait = Sel_normal; 2901 selection_wait = Sel_normal;
2637 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2902
2638 {
2639#if X_HAVE_UTF8_STRING 2903#if X_HAVE_UTF8_STRING
2640 selection_type = Sel_UTF8String; 2904 selection_type = Sel_UTF8String;
2641 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2642 return; 2906 return;
2643#else 2907#else
2644 selection_type = Sel_CompoundText; 2908 selection_type = Sel_CompoundText;
2645 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2646 return; 2910 return;
2647#endif 2911#endif
2648
2649 }
2650 } 2912 }
2913
2651 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2914 selection_wait = Sel_none; /* don't loop in selection_paste () */
2652 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2653 selection_paste (display->root, XA_CUT_BUFFER0, False); 2915 selection_paste (display->root, XA_CUT_BUFFER0, false);
2654} 2916}
2655 2917
2656int 2918int
2657rxvt_term::selection_request_other (Atom target, int selnum) 2919rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2658{ 2920{
2659 Atom sel; 2921 Atom sel;
2660#ifdef DEBUG_SELECT
2661 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2662#endif
2663 2922
2664 selection_type |= selnum; 2923 selection_type |= selnum;
2924
2665 if (selnum == Sel_Primary) 2925 if (selnum == Sel_Primary)
2666 sel = XA_PRIMARY; 2926 sel = XA_PRIMARY;
2667 else if (selnum == Sel_Secondary) 2927 else if (selnum == Sel_Secondary)
2668 sel = XA_SECONDARY; 2928 sel = XA_SECONDARY;
2669 else 2929 else
2670 sel = xa[XA_CLIPBOARD]; 2930 sel = xa[XA_CLIPBOARD];
2931
2671 if (XGetSelectionOwner (display->display, sel) != None) 2932 if (XGetSelectionOwner (dpy, sel) != None)
2672 { 2933 {
2673 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2674 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2675 TermWin.vt, selection_request_time); 2935 vt, selection_request_time);
2676 return 1; 2936 return 1;
2677 } 2937 }
2938
2678 return 0; 2939 return 0;
2679} 2940}
2680 2941
2681/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2682/* 2943/*
2683 * Clear all selected text 2944 * Clear all selected text
2684 * EXT: SelectionClear 2945 * EXT: SelectionClear
2685 */ 2946 */
2686void 2947void
2687rxvt_term::selection_clear () 2948rxvt_term::selection_clear () NOTHROW
2688{ 2949{
2689 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2690
2691 want_refresh = 1; 2950 want_refresh = 1;
2692 free (selection.text); 2951 free (selection.text);
2693 selection.text = NULL; 2952 selection.text = NULL;
2694 selection.len = 0; 2953 selection.len = 0;
2695 CLEAR_SELECTION (); 2954 CLEAR_SELECTION ();
2955
2956 if (display->selection_owner == this)
2957 display->selection_owner = 0;
2696} 2958}
2697 2959
2698/* ------------------------------------------------------------------------- */ 2960/* ------------------------------------------------------------------------- */
2699/* 2961/*
2700 * Copy a selection into the cut buffer 2962 * Copy a selection into the cut buffer
2701 * EXT: button 1 or 3 release 2963 * EXT: button 1 or 3 release
2702 */ 2964 */
2703void 2965void
2704rxvt_term::selection_make (Time tm) 2966rxvt_term::selection_make (Time tm)
2705{ 2967{
2706 int i, col, end_col, row, end_row; 2968 int i;
2707 unsigned char *new_selection_text; 2969 wchar_t *new_selection_text;
2708 char *str;
2709 text_t *t; 2970 text_t *t;
2710#ifdef ACS_ASCII
2711 rend_t *re;
2712#endif
2713 2971
2714 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2715 switch (selection.op) 2972 switch (selection.op)
2716 { 2973 {
2717 case SELECTION_CONT: 2974 case SELECTION_CONT:
2718 break; 2975 break;
2719 case SELECTION_INIT: 2976 case SELECTION_INIT:
… …
2723 selection.op = SELECTION_DONE; 2980 selection.op = SELECTION_DONE;
2724 /* FALLTHROUGH */ 2981 /* FALLTHROUGH */
2725 default: 2982 default:
2726 return; 2983 return;
2727 } 2984 }
2985
2728 selection.op = SELECTION_DONE; 2986 selection.op = SELECTION_DONE;
2729 2987
2730 if (selection.clicks == 4) 2988 if (selection.clicks == 4)
2731 return; /* nothing selected, go away */ 2989 return; /* nothing selected, go away */
2732 2990
2991 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2992 return;
2993
2733 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2734 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2995 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2735 2996
2736 new_selection_text = (unsigned char *)str; 2997 int ofs = 0;
2998 int extra = 0;
2737 2999
2738 col = selection.beg.col; 3000 int col = selection.beg.col;
2739 MAX_IT (col, 0); 3001 int row = selection.beg.row;
2740 row = selection.beg.row + TermWin.saveLines;
2741 end_row = selection.end.row + TermWin.saveLines;
2742 3002
3003 int end_col;
3004
2743 for (; row <= end_row; row++, col = 0) 3005 for (; row <= selection.end.row; row++, col = 0)
2744 { 3006 {
2745 t = & (screen.text[row][col]); 3007#if !ENABLE_MINIMAL
2746 3008 if (selection.rect)
2747 end_col = screen.tlen[row]; 3009 {
2748 3010 col = selection.beg.col;
2749 if (end_col == -1)
2750 end_col = TermWin.ncol; 3011 end_col = ncol + 1;
3012 }
3013 else
3014#endif
3015 end_col = ROW(row).l;
2751 3016
3017 col = max (col, 0);
3018
2752 if (row == end_row) 3019 if (row == selection.end.row
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
2753 MIN_IT (end_col, selection.end.col); 3024 min_it (end_col, selection.end.col);
3025
3026 t = ROW(row).t + col;
2754 3027
2755 for (; col < end_col; col++) 3028 for (; col < end_col; col++)
3029 {
2756 if (*t == NOCHAR) 3030 if (*t == NOCHAR)
2757 t++; 3031 t++;
3032#if ENABLE_COMBINING
3033 else if (IS_COMPOSE (*t))
3034 {
3035 int len = rxvt_composite.expand (*t, 0);
3036
3037 extra -= (len - 1);
3038
3039 if (extra < 0)
3040 {
3041 extra += i;
3042 i += i;
3043 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
3044 }
3045
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 }
3048#endif
2758 else 3049 else
2759 { 3050 new_selection_text[ofs++] = *t++;
2760 int len = wctomb (str, *t++);
2761 if (len > 0)
2762 str += len;
2763 } 3051 }
2764 3052
2765 if (screen.tlen[row] != -1 && row != end_row) 3053#if !ENABLE_MINIMAL
2766 *str++ = '\n'; 3054 if (selection.rect)
2767 } 3055 {
3056 while (ofs
3057 && new_selection_text[ofs - 1] != C0_LF
3058 && unicode::is_space (new_selection_text[ofs - 1]))
3059 --ofs;
2768 3060
2769#ifndef NO_OLD_SELECTION 3061 new_selection_text[ofs++] = C0_LF;
2770 if (selection_style == OLD_SELECT) 3062 }
2771 if (end_col == TermWin.ncol) 3063 else
2772 *str++ = '\n';
2773#endif 3064#endif
2774#ifndef NO_NEW_SELECTION 3065 if (!ROW(row).is_longer () && row != selection.end.row)
2775 if (selection_style != OLD_SELECT) 3066 new_selection_text[ofs++] = C0_LF;
3067 }
3068
2776 if (end_col != selection.end.col) 3069 if (end_col != selection.end.col)
2777 *str++ = '\n'; 3070 new_selection_text[ofs++] = C0_LF;
2778#endif
2779 *str = '\0';
2780 3071
2781 i = str - (char *)new_selection_text; 3072 new_selection_text[ofs] = 0;
3073
2782 if (i == 0) 3074 if (ofs == 0)
2783 { 3075 {
2784 free (new_selection_text); 3076 free (new_selection_text);
2785 return; 3077 return;
2786 } 3078 }
2787 3079
2788 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2789 if (str - (char *)new_selection_text > 1024)
2790 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2791
2792 selection.len = i;
2793
2794 if (selection.text)
2795 free (selection.text); 3080 free (selection.text);
2796 3081
2797 selection.text = new_selection_text; 3082 // we usually allocate much more than necessary, so realloc it smaller again
3083 selection.len = ofs;
3084 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2798 3085
3086 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3087 return;
3088
3089 selection_grab (tm);
3090}
3091
3092bool
3093rxvt_term::selection_grab (Time tm) NOTHROW
3094{
3095 selection_time = tm;
3096
2799 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2800 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3099 {
2801 display->set_selection_owner (this); 3100 display->set_selection_owner (this);
3101 return true;
3102 }
2802 else 3103 else
2803 rxvt_print_error ("can't get primary selection");
2804
2805 { 3104 {
3105 selection_clear ();
3106 return false;
3107 }
3108
3109#if 0
2806 XTextProperty ct; 3110 XTextProperty ct;
2807 char *cl = (char *)selection.text;
2808 3111
2809 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 3112 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
2810 { 3113 {
2811 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3114 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2812 PropModeReplace, ct.value, ct.nitems);
2813 XFree (ct.value); 3115 XFree (ct.value);
2814 } 3116 }
2815 else 3117#endif
2816 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2817 PropModeReplace, selection.text, (int)selection.len);
2818 }
2819
2820 selection_time = tm;
2821 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2822} 3118}
2823 3119
2824/* ------------------------------------------------------------------------- */ 3120/* ------------------------------------------------------------------------- */
2825/* 3121/*
2826 * Mark or select text based upon number of clicks: 1, 2, or 3 3122 * Mark or select text based upon number of clicks: 1, 2, or 3
2827 * EXT: button 1 press 3123 * EXT: button 1 press
2828 */ 3124 */
2829void 3125void
2830rxvt_term::selection_click (int clicks, int x, int y) 3126rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2831{ 3127{
2832 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2833
2834 clicks = ((clicks - 1) % 3) + 1; 3128 clicks = ((clicks - 1) % 3) + 1;
2835 selection.clicks = clicks; /* save clicks so extend will work */ 3129 selection.clicks = clicks; /* save clicks so extend will work */
2836 3130
3131 if (clicks == 2 && !selection.rect
3132 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3133 {
3134 MEvent.clicks = 1; // what a mess
3135 selection.screen = current_screen;
3136 selection.op = SELECTION_CONT;
3137 return;
3138 }
3139
2837 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3140 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2838 3141
2839 if (clicks == 2 || clicks == 3) 3142 if (clicks == 2 || clicks == 3)
2840 selection_extend_colrow (selection.mark.col, 3143 selection_extend_colrow (selection.mark.col,
2841 selection.mark.row + TermWin.view_start, 3144 selection.mark.row - view_start,
2842 0, /* button 3 */ 3145 0, /* button 3 */
2843 1, /* button press */ 3146 1, /* button press */
2844 0); /* click change */ 3147 0); /* click change */
2845} 3148}
2846 3149
2847/* ------------------------------------------------------------------------- */ 3150/* ------------------------------------------------------------------------- */
2848/* 3151/*
2849 * Mark a selection at the specified col/row 3152 * Mark a selection at the specified col/row
2850 */ 3153 */
2851void 3154void
2852rxvt_term::selection_start_colrow (int col, int row) 3155rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2853{ 3156{
2854 want_refresh = 1; 3157 want_refresh = 1;
3158
3159 selection.mark.row = row + view_start;
2855 selection.mark.col = col; 3160 selection.mark.col = col;
2856 selection.mark.row = row - TermWin.view_start; 3161
2857 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3162 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2858 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3163 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3164
2859 MAX_IT (selection.mark.col, 0); 3165 while (selection.mark.col > 0
2860 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 3166 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3167 --selection.mark.col;
2861 3168
2862 if (selection.op) 3169 if (selection.op)
3170 {
2863 { /* clear the old selection */ 3171 /* clear the old selection */
2864 selection.beg.row = selection.end.row = selection.mark.row; 3172 selection.beg.row = selection.end.row = selection.mark.row;
2865 selection.beg.col = selection.end.col = selection.mark.col; 3173 selection.beg.col = selection.end.col = selection.mark.col;
2866 } 3174 }
3175
2867 selection.op = SELECTION_INIT; 3176 selection.op = SELECTION_INIT;
2868 selection.screen = current_screen; 3177 selection.screen = current_screen;
2869} 3178}
2870 3179
2871/* ------------------------------------------------------------------------- */ 3180/* ------------------------------------------------------------------------- */
… …
2873 * Word select: select text for 2 clicks 3182 * Word select: select text for 2 clicks
2874 * We now only find out the boundary in one direction 3183 * We now only find out the boundary in one direction
2875 */ 3184 */
2876 3185
2877/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3186/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2878#define DELIMIT_TEXT(x) \ 3187#define DELIMIT_TEXT(x) \
2879 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 3188 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2880#define DELIMIT_REND(x) 1 3189#define DELIMIT_REND(x) 1
2881 3190
2882void 3191void
2883rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3192rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
2884{ 3193{
2885 int col, row, dirnadd, tcol, trow, w1, w2; 3194 int col, row, dirnadd, tcol, trow, w1, w2;
2886 row_col_t bound; 3195 row_col_t bound;
2887 text_t *stp; 3196 text_t *stp;
2888 rend_t *srp; 3197 rend_t *srp;
2889 3198
2890 if (dirn == UP) 3199 if (dirn == UP)
2891 { 3200 {
2892 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3201 bound.row = top_row - 1;
2893 bound.col = 0; 3202 bound.col = 0;
2894 dirnadd = -1; 3203 dirnadd = -1;
2895 } 3204 }
2896 else 3205 else
2897 { 3206 {
2898 bound.row = TermWin.saveLines + TermWin.nrow; 3207 bound.row = nrow;
2899 bound.col = TermWin.ncol - 1; 3208 bound.col = ncol - 1;
2900 dirnadd = 1; 3209 dirnadd = 1;
2901 } 3210 }
2902 row = mark->row + TermWin.saveLines; 3211
3212 row = mark->row;
2903 col = mark->col; 3213 col = max (mark->col, 0);
2904 MAX_IT (col, 0); 3214
2905 /* find the edge of a word */ 3215 /* find the edge of a word */
2906 stp = & (screen.text[row][col]); 3216 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
2907 w1 = DELIMIT_TEXT (*stp); 3217 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
2908 3218
2909 if (selection_style != NEW_SELECT) 3219 for (;;)
2910 { 3220 {
2911 if (w1 == 1) 3221 for (; col != bound.col; col += dirnadd)
2912 { 3222 {
2913 stp += dirnadd; 3223 stp += dirnadd;
2914 if (DELIMIT_TEXT (*stp) == 1)
2915 goto Old_Word_Selection_You_Die;
2916 col += dirnadd;
2917 }
2918 w1 = 0;
2919 }
2920 srp = (&screen.rend[row][col]);
2921 w2 = DELIMIT_REND (*srp);
2922
2923 for (;;)
2924 {
2925 for (; col != bound.col; col += dirnadd)
2926 {
2927 stp += dirnadd; 3224 srp += dirnadd;
3225
3226 if (*stp == NOCHAR)
3227 continue;
3228
2928 if (DELIMIT_TEXT (*stp) != w1) 3229 if (DELIMIT_TEXT (*stp) != w1)
2929 break; 3230 break;
2930 srp += dirnadd;
2931 if (DELIMIT_REND (*srp) != w2) 3231 if (DELIMIT_REND (*srp) != w2)
2932 break; 3232 break;
2933 } 3233 }
3234
2934 if ((col == bound.col) && (row != bound.row)) 3235 if ((col == bound.col) && (row != bound.row))
2935 { 3236 {
2936 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3237 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
2937 { 3238 {
2938 trow = row + dirnadd; 3239 trow = row + dirnadd;
2939 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3240 tcol = dirn == UP ? ncol - 1 : 0;
2940 if (screen.text[trow] == NULL) 3241
3242 if (!ROW(trow).t)
2941 break; 3243 break;
2942 stp = & (screen.text[trow][tcol]); 3244
2943 srp = & (screen.rend[trow][tcol]); 3245 stp = ROW(trow).t + tcol;
3246 srp = ROW(trow).r + tcol;
3247
2944 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3248 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2945 break; 3249 break;
3250
2946 row = trow; 3251 row = trow;
2947 col = tcol; 3252 col = tcol;
2948 continue; 3253 continue;
2949 } 3254 }
2950 } 3255 }
2951 break; 3256 break;
2952 } 3257 }
2953Old_Word_Selection_You_Die:
2954 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2955 3258
2956 if (dirn == DN) 3259 if (dirn == DN)
2957 col++; /* put us on one past the end */ 3260 col++; /* put us on one past the end */
2958 3261
2959 /* Poke the values back in */ 3262 /* Poke the values back in */
2960 ret->row = row - TermWin.saveLines; 3263 ret->row = row;
2961 ret->col = col; 3264 ret->col = col;
2962} 3265}
2963 3266
2964/* ------------------------------------------------------------------------- */ 3267/* ------------------------------------------------------------------------- */
2965/* 3268/*
… …
2968 * flag == 0 ==> button 1 3271 * flag == 0 ==> button 1
2969 * flag == 1 ==> button 3 press 3272 * flag == 1 ==> button 3 press
2970 * flag == 2 ==> button 3 motion 3273 * flag == 2 ==> button 3 motion
2971 */ 3274 */
2972void 3275void
2973rxvt_term::selection_extend (int x, int y, int flag) 3276rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
2974{ 3277{
2975 int col, row; 3278 int col = clamp (Pixel2Col (x), 0, ncol);
3279 int row = clamp (Pixel2Row (y), 0, nrow - 1);
2976 3280
2977 col = Pixel2Col (x);
2978 row = Pixel2Row (y);
2979 MAX_IT (row, 0);
2980 MIN_IT (row, (int)TermWin.nrow - 1);
2981 MAX_IT (col, 0);
2982 MIN_IT (col, (int)TermWin.ncol);
2983
2984#ifndef NO_NEW_SELECTION
2985 /* 3281 /*
2986 * If we're selecting characters (single click) then we must check first 3282 * If we're selecting characters (single click) then we must check first
2987 * if we are at the same place as the original mark. If we are then 3283 * if we are at the same place as the original mark. If we are then
2988 * select nothing. Otherwise, if we're to the right of the mark, you have to 3284 * select nothing. Otherwise, if we're to the right of the mark, you have to
2989 * be _past_ a character for it to be selected. 3285 * be _past_ a character for it to be selected.
2990 */ 3286 */
2991 if (selection_style != OLD_SELECT)
2992 {
2993 if (((selection.clicks % 3) == 1) && !flag 3287 if (((selection.clicks % 3) == 1) && !flag
2994 && (col == selection.mark.col 3288 && (col == selection.mark.col
2995 && (row == selection.mark.row + TermWin.view_start))) 3289 && (row == selection.mark.row - view_start)))
2996 { 3290 {
2997 /* select nothing */ 3291 /* select nothing */
2998 selection.beg.row = selection.end.row = 0; 3292 selection.beg.row = selection.end.row = 0;
2999 selection.beg.col = selection.end.col = 0; 3293 selection.beg.col = selection.end.col = 0;
3000 selection.clicks = 4; 3294 selection.clicks = 4;
3001 want_refresh = 1; 3295 want_refresh = 1;
3002 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3003 return; 3296 return;
3004 }
3005 } 3297 }
3006#endif 3298
3007 if (selection.clicks == 4) 3299 if (selection.clicks == 4)
3008 selection.clicks = 1; 3300 selection.clicks = 1;
3009 3301
3010 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3302 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3011 flag == 1 ? 1 : 0, /* ? button press */ 3303 flag == 1 ? 1 : 0, /* ? button press */
… …
3015/* ------------------------------------------------------------------------- */ 3307/* ------------------------------------------------------------------------- */
3016/* 3308/*
3017 * Extend the selection to the specified col/row 3309 * Extend the selection to the specified col/row
3018 */ 3310 */
3019void 3311void
3020rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3312rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3021{ 3313{
3022 int16_t ncol = TermWin.ncol;
3023 int end_col;
3024 row_col_t pos; 3314 row_col_t pos;
3025 enum { 3315 enum {
3026 LEFT, RIGHT 3316 LEFT, RIGHT
3027 } closeto = RIGHT; 3317 } closeto = RIGHT;
3028 3318
3029 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3030 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3031
3032 want_refresh = 1; 3319 want_refresh = 1;
3320
3033 switch (selection.op) 3321 switch (selection.op)
3034 { 3322 {
3035 case SELECTION_INIT: 3323 case SELECTION_INIT:
3036 CLEAR_SELECTION (); 3324 CLEAR_SELECTION ();
3037 selection.op = SELECTION_BEGIN; 3325 selection.op = SELECTION_BEGIN;
… …
3050 selection_start_colrow (col, row); 3338 selection_start_colrow (col, row);
3051 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
3052 default: 3340 default:
3053 return; 3341 return;
3054 } 3342 }
3343
3055 if (selection.beg.col == selection.end.col 3344 if (selection.beg.col == selection.end.col
3056 && selection.beg.col != selection.mark.col 3345 && selection.beg.col != selection.mark.col
3057 && selection.beg.row == selection.end.row 3346 && selection.beg.row == selection.end.row
3058 && selection.beg.row != selection.mark.row) 3347 && selection.beg.row != selection.mark.row)
3059 { 3348 {
3060 selection.beg.col = selection.end.col = selection.mark.col; 3349 selection.beg.col = selection.end.col = selection.mark.col;
3061 selection.beg.row = selection.end.row = selection.mark.row; 3350 selection.beg.row = selection.end.row = selection.mark.row;
3062 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3063 } 3351 }
3064 3352
3065 pos.col = col; 3353 pos.col = col;
3066 pos.row = row; 3354 pos.row = view_start + row;
3067 3355
3068 pos.row -= TermWin.view_start; /* adjust for scroll */
3069
3070#ifndef NO_OLD_SELECTION
3071 /*
3072 * This mimics some of the selection behaviour of version 2.20 and before.
3073 * There are no ``selection modes'', button3 is always character extension.
3074 * Note: button3 drag is always available, c.f. v2.20
3075 * Selection always terminates (left or right as appropriate) at the mark.
3076 */
3077 if (selection_style == OLD_SELECT)
3078 {
3079 if (selection.clicks == 1 || button3)
3080 {
3081 if (hate_those_clicks)
3082 {
3083 hate_those_clicks = 0;
3084 if (selection.clicks == 1)
3085 {
3086 selection.beg.row = selection.mark.row;
3087 selection.beg.col = selection.mark.col;
3088 }
3089 else
3090 {
3091 selection.mark.row = selection.beg.row;
3092 selection.mark.col = selection.beg.col;
3093 }
3094 }
3095 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3096 {
3097 selection.end.row = selection.mark.row;
3098 selection.end.col = selection.mark.col + 1;
3099 selection.beg.row = pos.row;
3100 selection.beg.col = pos.col;
3101 }
3102 else
3103 {
3104 selection.beg.row = selection.mark.row;
3105 selection.beg.col = selection.mark.col;
3106 selection.end.row = pos.row;
3107 selection.end.col = pos.col + 1;
3108 }
3109 }
3110 else if (selection.clicks == 2)
3111 {
3112 selection_delimit_word (UP, & (selection.mark),
3113 & (selection.beg));
3114 selection_delimit_word (DN, & (selection.mark),
3115 & (selection.end));
3116 hate_those_clicks = 1;
3117 }
3118 else if (selection.clicks == 3)
3119 {
3120 selection.beg.row = selection.end.row = selection.mark.row;
3121 selection.beg.col = 0;
3122 selection.end.col = ncol;
3123 hate_those_clicks = 1;
3124 }
3125 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3126 return;
3127 }
3128#endif /* ! NO_OLD_SELECTION */
3129#ifndef NO_NEW_SELECTION
3130 /* selection_style must not be OLD_SELECT to get here */
3131 /* 3356 /*
3132 * This is mainly xterm style selection with a couple of differences, mainly 3357 * This is mainly xterm style selection with a couple of differences, mainly
3133 * in the way button3 drag extension works. 3358 * in the way button3 drag extension works.
3134 * We're either doing: button1 drag; button3 press; or button3 drag 3359 * We're either doing: button1 drag; button3 press; or button3 drag
3135 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3360 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3140 * a point/word/line which is either the start or end of the selection 3365 * a point/word/line which is either the start or end of the selection
3141 * and it was decided by whichever point/word/line was `fixed' at the 3366 * and it was decided by whichever point/word/line was `fixed' at the
3142 * time of the most recent button3 press 3367 * time of the most recent button3 press
3143 */ 3368 */
3144 if (button3 && buttonpress) 3369 if (button3 && buttonpress)
3370 {
3145 { /* button3 press */ 3371 /* button3 press */
3146 /* 3372 /*
3147 * first determine which edge of the selection we are closest to 3373 * first determine which edge of the selection we are closest to
3148 */ 3374 */
3149 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3375 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3150 || (!ROWCOL_IS_AFTER (pos, selection.end) 3376 || (!ROWCOL_IS_AFTER (pos, selection.end)
3151 && (((pos.col - selection.beg.col) 3377 && (((pos.col - selection.beg.col)
3152 + ((pos.row - selection.beg.row) * ncol)) 3378 + ((pos.row - selection.beg.row) * ncol))
3153 < ((selection.end.col - pos.col) 3379 < ((selection.end.col - pos.col)
3154 + ((selection.end.row - pos.row) * ncol))))) 3380 + ((selection.end.row - pos.row) * ncol)))))
3155 closeto = LEFT; 3381 closeto = LEFT;
3382
3156 if (closeto == LEFT) 3383 if (closeto == LEFT)
3157 { 3384 {
3158 selection.beg.row = pos.row; 3385 selection.beg.row = pos.row;
3159 selection.beg.col = pos.col; 3386 selection.beg.col = pos.col;
3160 selection.mark.row = selection.end.row; 3387 selection.mark.row = selection.end.row;
3161 selection.mark.col = selection.end.col 3388 selection.mark.col = selection.end.col - (selection.clicks == 2);
3162 - (selection.clicks == 2);
3163 } 3389 }
3164 else 3390 else
3165 { 3391 {
3166 selection.end.row = pos.row; 3392 selection.end.row = pos.row;
3167 selection.end.col = pos.col; 3393 selection.end.col = pos.col;
3168 selection.mark.row = selection.beg.row; 3394 selection.mark.row = selection.beg.row;
3169 selection.mark.col = selection.beg.col; 3395 selection.mark.col = selection.beg.col;
3170 } 3396 }
3171 } 3397 }
3172 else 3398 else
3399 {
3173 { /* button1 drag or button3 drag */ 3400 /* button1 drag or button3 drag */
3174 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3401 if (ROWCOL_IS_AFTER (selection.mark, pos))
3175 { 3402 {
3176 if ((selection.mark.row == selection.end.row) 3403 if (selection.mark.row == selection.end.row
3177 && (selection.mark.col == selection.end.col) 3404 && selection.mark.col == selection.end.col
3405 && clickchange
3178 && clickchange && selection.clicks == 2) 3406 && selection.clicks == 2)
3179 selection.mark.col--; 3407 selection.mark.col--;
3408
3180 selection.beg.row = pos.row; 3409 selection.beg.row = pos.row;
3181 selection.beg.col = pos.col; 3410 selection.beg.col = pos.col;
3182 selection.end.row = selection.mark.row; 3411 selection.end.row = selection.mark.row;
3183 selection.end.col = selection.mark.col 3412 selection.end.col = selection.mark.col + (selection.clicks == 2);
3184 + (selection.clicks == 2);
3185 } 3413 }
3186 else 3414 else
3187 { 3415 {
3188 selection.beg.row = selection.mark.row; 3416 selection.beg.row = selection.mark.row;
3189 selection.beg.col = selection.mark.col; 3417 selection.beg.col = selection.mark.col;
… …
3192 } 3420 }
3193 } 3421 }
3194 3422
3195 if (selection.clicks == 1) 3423 if (selection.clicks == 1)
3196 { 3424 {
3197 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3425 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3198 if (end_col != -1 && selection.beg.col > end_col) 3426 && !ROW(selection.beg.row).is_longer ()
3427#if !ENABLE_MINIMAL
3428 && !selection.rect
3429#endif
3199 { 3430 )
3200#if 1
3201 selection.beg.col = ncol; 3431 selection.beg.col = ncol;
3202#else
3203 if (selection.beg.row != selection.end.row)
3204 selection.beg.col = ncol;
3205 else
3206 selection.beg.col = selection.mark.col;
3207#endif
3208 3432
3433 if (
3434 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3435 && !ROW(selection.end.row).is_longer ()
3436#if !ENABLE_MINIMAL
3437 && !selection.rect
3438#endif
3209 } 3439 )
3210 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3211 if (end_col != -1 && selection.end.col > end_col)
3212 selection.end.col = ncol; 3440 selection.end.col = ncol;
3213
3214 } 3441 }
3215 else if (selection.clicks == 2) 3442 else if (selection.clicks == 2)
3216 { 3443 {
3217 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3444 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3218 selection.end.col--; 3445 selection.end.col--;
3446
3219 selection_delimit_word (UP, & (selection.beg), 3447 selection_delimit_word (UP, &selection.beg, &selection.beg);
3220 & (selection.beg));
3221 selection_delimit_word (DN, & (selection.end), 3448 selection_delimit_word (DN, &selection.end, &selection.end);
3222 & (selection.end));
3223 } 3449 }
3224 else if (selection.clicks == 3) 3450 else if (selection.clicks == 3)
3225 { 3451 {
3226#ifndef NO_FRILLS 3452#if ENABLE_FRILLS
3227 if ((Options & Opt_tripleclickwords)) 3453 if (option (Opt_tripleclickwords))
3228 { 3454 {
3229 int end_row;
3230
3231 selection_delimit_word (UP, & (selection.beg), 3455 selection_delimit_word (UP, &selection.beg, &selection.beg);
3232 & (selection.beg)); 3456
3233 end_row = screen.tlen[selection.mark.row
3234 + TermWin.saveLines];
3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3457 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3236 end_row++)
3237 { 3458 {
3238 end_col = screen.tlen[end_row + TermWin.saveLines]; 3459 if (!ROW(end_row).is_longer ())
3239 if (end_col != -1)
3240 { 3460 {
3241 selection.end.row = end_row; 3461 selection.end.row = end_row;
3242 selection.end.col = end_col; 3462 selection.end.col = ROW(end_row).l;
3463# if !ENABLE_MINIMAL
3243 selection_remove_trailing_spaces (); 3464 selection_remove_trailing_spaces ();
3465# endif
3244 break; 3466 break;
3245 } 3467 }
3246 } 3468 }
3247 } 3469 }
3248 else 3470 else
3249#endif 3471#endif
3250
3251 { 3472 {
3252 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3473 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3253 selection.mark.col++; 3474 selection.mark.col++;
3475
3254 selection.beg.col = 0; 3476 selection.beg.col = 0;
3255 selection.end.col = ncol; 3477 selection.end.col = ncol;
3478
3479 // select a complete logical line
3480 while (selection.beg.row > -saveLines
3481 && ROW(selection.beg.row - 1).is_longer ())
3482 selection.beg.row--;
3483
3484 while (selection.end.row < nrow
3485 && ROW(selection.end.row).is_longer ())
3486 selection.end.row++;
3256 } 3487 }
3257 } 3488 }
3489
3258 if (button3 && buttonpress) 3490 if (button3 && buttonpress)
3491 {
3259 { /* mark may need to be changed */ 3492 /* mark may need to be changed */
3260 if (closeto == LEFT) 3493 if (closeto == LEFT)
3261 { 3494 {
3262 selection.mark.row = selection.end.row; 3495 selection.mark.row = selection.end.row;
3263 selection.mark.col = selection.end.col 3496 selection.mark.col = selection.end.col - (selection.clicks == 2);
3264 - (selection.clicks == 2);
3265 } 3497 }
3266 else 3498 else
3267 { 3499 {
3268 selection.mark.row = selection.beg.row; 3500 selection.mark.row = selection.beg.row;
3269 selection.mark.col = selection.beg.col; 3501 selection.mark.col = selection.beg.col;
3270 } 3502 }
3271 } 3503 }
3272 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3273#endif /* ! NO_NEW_SELECTION */
3274}
3275 3504
3276#ifndef NO_FRILLS 3505#if !ENABLE_MINIMAL
3506 if (selection.rect && selection.beg.col > selection.end.col)
3507 ::swap (selection.beg.col, selection.end.col);
3508#endif
3509}
3510
3511#if !ENABLE_MINIMAL
3277void 3512void
3278rxvt_term::selection_remove_trailing_spaces () 3513rxvt_term::selection_remove_trailing_spaces () NOTHROW
3279{ 3514{
3280 int32_t end_col, end_row; 3515 int32_t end_col, end_row;
3281 text_t *stp; 3516 text_t *stp;
3282 3517
3283 end_col = selection.end.col; 3518 end_col = selection.end.col;
3284 end_row = selection.end.row; 3519 end_row = selection.end.row;
3520
3285 for ( ; end_row >= selection.beg.row; ) 3521 for (; end_row >= selection.beg.row; )
3286 { 3522 {
3287 stp = screen.text[end_row + TermWin.saveLines]; 3523 stp = ROW(end_row).t;
3524
3288 while (--end_col >= 0) 3525 while (--end_col >= 0)
3289 { 3526 {
3290 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3527 if (stp[end_col] != NOCHAR
3528 && !unicode::is_space (stp[end_col]))
3291 break; 3529 break;
3292 } 3530 }
3531
3293 if (end_col >= 0 3532 if (end_col >= 0
3294 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3533 || !ROW(end_row - 1).is_longer ())
3295 { 3534 {
3296 selection.end.col = end_col + 1; 3535 selection.end.col = end_col + 1;
3297 selection.end.row = end_row; 3536 selection.end.row = end_row;
3298 break; 3537 break;
3299 } 3538 }
3539
3300 end_row--; 3540 end_row--;
3301 end_col = TermWin.ncol; 3541 end_col = ncol;
3302 } 3542 }
3543
3303 if (selection.mark.row > selection.end.row) 3544 if (selection.mark.row > selection.end.row)
3304 { 3545 {
3305 selection.mark.row = selection.end.row; 3546 selection.mark.row = selection.end.row;
3306 selection.mark.col = selection.end.col; 3547 selection.mark.col = selection.end.col;
3307 } 3548 }
… …
3315/* 3556/*
3316 * Double click on button 3 when already selected 3557 * Double click on button 3 when already selected
3317 * EXT: button 3 double click 3558 * EXT: button 3 double click
3318 */ 3559 */
3319void 3560void
3320rxvt_term::selection_rotate (int x, int y) 3561rxvt_term::selection_rotate (int x, int y) NOTHROW
3321{ 3562{
3322 selection.clicks = selection.clicks % 3 + 1; 3563 selection.clicks = selection.clicks % 3 + 1;
3323 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3564 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3324} 3565}
3325 3566
3326/* ------------------------------------------------------------------------- */ 3567/* ------------------------------------------------------------------------- */
3327/* 3568/*
3328 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3329 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3330 * the X11 protocol.
3331 */
3332typedef CARD32 Atom32;
3333
3334/* ------------------------------------------------------------------------- */
3335/*
3336 * Respond to a request for our current selection 3569 * Respond to a request for our current selection
3337 * EXT: SelectionRequest 3570 * EXT: SelectionRequest
3338 */ 3571 */
3339void 3572void
3340rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3341{ 3574{
3342 XSelectionEvent ev; 3575 XSelectionEvent ev;
3343 XTextProperty ct;
3344 XICCEncodingStyle style;
3345 Atom target;
3346 3576
3347 ev.type = SelectionNotify; 3577 ev.type = SelectionNotify;
3348 ev.property = None; 3578 ev.property = None;
3349 ev.display = rq.display; 3579 ev.display = rq.display;
3350 ev.requestor = rq.requestor; 3580 ev.requestor = rq.requestor;
… …
3352 ev.target = rq.target; 3582 ev.target = rq.target;
3353 ev.time = rq.time; 3583 ev.time = rq.time;
3354 3584
3355 if (rq.target == xa[XA_TARGETS]) 3585 if (rq.target == xa[XA_TARGETS])
3356 { 3586 {
3357 Atom32 target_list[5]; 3587 Atom target_list[6];
3358 Atom32 *target = target_list; 3588 Atom *target = target_list;
3359 3589
3360 *target++ = (Atom32) xa[XA_TARGETS]; 3590 *target++ = xa[XA_TARGETS];
3591 *target++ = xa[XA_TIMESTAMP];
3361 *target++ = (Atom32) XA_STRING; 3592 *target++ = XA_STRING;
3362 *target++ = (Atom32) xa[XA_TEXT]; 3593 *target++ = xa[XA_TEXT];
3363 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3594 *target++ = xa[XA_COMPOUND_TEXT];
3364#if X_HAVE_UTF8_STRING 3595#if X_HAVE_UTF8_STRING
3365 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3596 *target++ = xa[XA_UTF8_STRING];
3366#endif 3597#endif
3598
3367 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3368 (8 * sizeof (target_list[0])), PropModeReplace, 3600 32, PropModeReplace,
3369 (unsigned char *)target_list, 3601 (unsigned char *)target_list, target - target_list);
3370 target - target_list);
3371 ev.property = rq.property; 3602 ev.property = rq.property;
3372 } 3603 }
3604#if TODO // TODO
3373 else if (rq.target == xa[XA_MULTIPLE]) 3605 else if (rq.target == xa[XA_MULTIPLE])
3374 { 3606 {
3375 /* TODO: Handle MULTIPLE */ 3607 /* TODO: Handle MULTIPLE */
3376 } 3608 }
3609#endif
3377 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3378 { 3611 {
3379 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3380 (8 * sizeof (Time)), PropModeReplace,
3381 (unsigned char *)&selection_time, 1); 3613 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3382 ev.property = rq.property; 3614 ev.property = rq.property;
3383 } 3615 }
3384 else if (rq.target == XA_STRING 3616 else if (rq.target == XA_STRING
3385 || rq.target == xa[XA_TEXT] 3617 || rq.target == xa[XA_TEXT]
3386 || rq.target == xa[XA_COMPOUND_TEXT] 3618 || rq.target == xa[XA_COMPOUND_TEXT]
3387 || rq.target == xa[XA_UTF8_STRING] 3619 || rq.target == xa[XA_UTF8_STRING]
3388 ) 3620 )
3389 { 3621 {
3622 XTextProperty ct;
3623 Atom target = rq.target;
3390 short freect = 0; 3624 short freect = 0;
3391 int selectlen; 3625 int selectlen;
3392 char *cl; 3626 wchar_t *cl;
3393 3627 enum {
3394 target = rq.target; 3628 enc_string = XStringStyle,
3629 enc_text = XStdICCTextStyle,
3630 enc_compound_text = XCompoundTextStyle,
3631#ifdef X_HAVE_UTF8_STRING
3632 enc_utf8 = XUTF8StringStyle,
3633#else
3634 enc_utf8 = -1,
3635#endif
3636 } style;
3395 3637
3396 if (target == XA_STRING) 3638 if (target == XA_STRING)
3397 // we actually don't do XA_STRING, but who cares, as i18n clients 3639 // we actually don't do XA_STRING, but who cares, as i18n clients
3398 // will ask for another format anyways. 3640 // will ask for another format anyways.
3399 style = XStringStyle; 3641 style = enc_string;
3400 else if (target == xa[XA_TEXT]) 3642 else if (target == xa[XA_TEXT])
3401 style = XTextStyle; 3643 style = enc_text;
3402 else if (target == xa[XA_COMPOUND_TEXT]) 3644 else if (target == xa[XA_COMPOUND_TEXT])
3403 style = XCompoundTextStyle; 3645 style = enc_compound_text;
3404#if X_HAVE_UTF8_STRING 3646#if !ENABLE_MINIMAL
3405 else if (target == xa[XA_UTF8_STRING]) 3647 else if (target == xa[XA_UTF8_STRING])
3406 style = XUTF8StringStyle; 3648 style = enc_utf8;
3407#endif 3649#endif
3408 else 3650 else
3409 { 3651 {
3410 target = xa[XA_COMPOUND_TEXT]; 3652 target = xa[XA_COMPOUND_TEXT];
3411 style = XCompoundTextStyle; 3653 style = enc_compound_text;
3412 } 3654 }
3413 3655
3414 if (selection.text) 3656 if (selection.text)
3415 { 3657 {
3416 cl = (char *)selection.text; 3658 cl = selection.text;
3417 selectlen = selection.len; 3659 selectlen = selection.len;
3418 } 3660 }
3419 else 3661 else
3420 { 3662 {
3421 cl = ""; 3663 cl = L"";
3422 selectlen = 0; 3664 selectlen = 0;
3423 } 3665 }
3424 3666
3667#if !ENABLE_MINIMAL
3668 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3669 // so recode it manually
3670 if (style == enc_utf8)
3671 {
3672 freect = 1;
3673 ct.encoding = target;
3674 ct.format = 8;
3675 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3676 ct.nitems = strlen ((char *)ct.value);
3677 }
3678 else
3679#endif
3425 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3680 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3426 freect = 1; 3681 freect = 1;
3427 else 3682 else
3428 { 3683 {
3429 /* if we failed to convert then send it raw */ 3684 /* if we failed to convert then send it raw */
3430 ct.value = (unsigned char *)cl; 3685 ct.value = (unsigned char *)cl;
3431 ct.nitems = selectlen; 3686 ct.nitems = selectlen;
3687 ct.encoding = target;
3432 } 3688 }
3433 3689
3434 XChangeProperty (display->display, rq.requestor, rq.property, 3690 XChangeProperty (dpy, rq.requestor, rq.property,
3435 target, 8, PropModeReplace, 3691 ct.encoding, 8, PropModeReplace,
3436 ct.value, (int)ct.nitems); 3692 ct.value, (int)ct.nitems);
3437 ev.property = rq.property; 3693 ev.property = rq.property;
3438 3694
3439 if (freect) 3695 if (freect)
3440 XFree (ct.value); 3696 XFree (ct.value);
3441 } 3697 }
3698
3442 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3443}
3444
3445/* ------------------------------------------------------------------------- *
3446 * MOUSE ROUTINES *
3447 * ------------------------------------------------------------------------- */
3448
3449/*
3450 * return col/row values corresponding to x/y pixel values
3451 */
3452void
3453rxvt_term::pixel_position (int *x, int *y)
3454{
3455 *x = Pixel2Col (*x);
3456 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3457 *y = Pixel2Row (*y);
3458 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3459} 3700}
3460 3701
3461/* ------------------------------------------------------------------------- */ 3702/* ------------------------------------------------------------------------- */
3462#ifdef USE_XIM 3703#ifdef USE_XIM
3463void 3704void
3464rxvt_term::im_set_position (XPoint *pos) 3705rxvt_term::im_set_position (XPoint &pos) NOTHROW
3465{ 3706{
3466 XWindowAttributes xwa; 3707 XWindowAttributes xwa;
3467 3708
3468 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3709 XGetWindowAttributes (dpy, vt, &xwa);
3710
3469 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3711 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3470 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3712 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3471} 3713}
3472
3473#endif 3714#endif
3474/* ------------------------------------------------------------------------- */ 3715
3475 3716#if ENABLE_OVERLAY
3717void
3718rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3719{
3720 if (nrow < 1 || ncol < 1)
3721 return;
3722
3723 want_refresh = 1;
3724
3725 scr_overlay_off ();
3726
3727 if (x < 0) x = ncol - w;
3728 if (y < 0) y = nrow - h;
3729
3730 // make space for border
3731 w += 2; min_it (w, ncol);
3732 h += 2; min_it (h, nrow);
3733
3734 x -= 1; clamp_it (x, 0, ncol - w);
3735 y -= 1; clamp_it (y, 0, nrow - h);
3736
3737 ov_x = x; ov_y = y;
3738 ov_w = w; ov_h = h;
3739
3740 ov_text = new text_t *[h];
3741 ov_rend = new rend_t *[h];
3742
3743 for (y = 0; y < h; y++)
3744 {
3745 text_t *tp = ov_text[y] = new text_t[w];
3746 rend_t *rp = ov_rend[y] = new rend_t[w];
3747
3748 text_t t0, t1, t2;
3749 rend_t r = OVERLAY_RSTYLE;
3750
3751 if (y == 0)
3752 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3753 else if (y < h - 1)
3754 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3755 else
3756 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3757
3758 *tp++ = t0;
3759 *rp++ = r;
3760
3761 for (x = w - 2; x > 0; --x)
3762 {
3763 *tp++ = t1;
3764 *rp++ = r;
3765 }
3766
3767 *tp = t2;
3768 *rp = r;
3769 }
3770}
3771
3772void
3773rxvt_term::scr_overlay_off () NOTHROW
3774{
3775 if (!ov_text)
3776 return;
3777
3778 want_refresh = 1;
3779
3780 for (int y = 0; y < ov_h; y++)
3781 {
3782 delete [] ov_text[y];
3783 delete [] ov_rend[y];
3784 }
3785
3786 delete [] ov_text; ov_text = 0;
3787 delete [] ov_rend; ov_rend = 0;
3788}
3789
3790void
3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3792{
3793 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3794 return;
3795
3796 x++, y++;
3797
3798 ov_text[y][x] = text;
3799 ov_rend[y][x] = rend;
3800}
3801
3802void
3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3804{
3805 while (*s)
3806 scr_overlay_set (x++, y, *s++);
3807}
3808
3809void
3810rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3811{
3812 while (*s)
3813 {
3814 text_t t = *s++;
3815 int width = WCWIDTH (t);
3816
3817 while (width--)
3818 {
3819 scr_overlay_set (x++, y, t);
3820 t = NOCHAR;
3821 }
3822 }
3823}
3824
3825void
3826rxvt_term::scr_swap_overlay () NOTHROW
3827{
3828 if (!ov_text)
3829 return;
3830
3831 // swap screen mem with overlay
3832 for (int y = ov_h; y--; )
3833 {
3834 text_t *t1 = ov_text[y];
3835 rend_t *r1 = ov_rend[y];
3836
3837 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3838 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3839
3840 for (int x = ov_w; x--; )
3841 {
3842 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3843 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3844 }
3845 }
3846}
3847
3848#endif
3476/* ------------------------------------------------------------------------- * 3849/* ------------------------------------------------------------------------- */
3477 * DEBUG ROUTINES *
3478 * ------------------------------------------------------------------------- */
3479#if 0
3480void
3481rxvt_debug_colors (void)
3482{
3483 int color;
3484 const char *name[] =
3485 {
3486 "fg", "bg",
3487 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3488 };
3489 3850
3490 fprintf (stderr, "Color ( ");
3491 if (rstyle & RS_RVid)
3492 fprintf (stderr, "rvid ");
3493 if (rstyle & RS_Bold)
3494 fprintf (stderr, "bold ");
3495 if (rstyle & RS_Blink)
3496 fprintf (stderr, "blink ");
3497 if (rstyle & RS_Uline)
3498 fprintf (stderr, "uline ");
3499 fprintf (stderr, "): ");
3500
3501 color = GET_FGCOLOR (rstyle);
3502#ifndef NO_BRIGHTCOLOR
3503 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3504 {
3505 color -= (minBrightCOLOR - minCOLOR);
3506 fprintf (stderr, "bright ");
3507 }
3508#endif
3509 fprintf (stderr, "%s on ", name[color]);
3510
3511 color = GET_BGCOLOR (rstyle);
3512#ifndef NO_BRIGHTCOLOR
3513 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3514 {
3515 color -= (minBrightCOLOR - minCOLOR);
3516 fprintf (stderr, "bright ");
3517 }
3518#endif
3519 fprintf (stderr, "%s\n", name[color]);
3520}
3521#endif

Diff Legend

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