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.22 by pcg, Sat Jan 31 02:14:58 2004 UTC vs.
Revision 1.331 by sf-exg, Wed Jan 6 17:52:43 2010 UTC

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

Diff Legend

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