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

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

Diff Legend

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