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.21 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.329 by root, Sat Dec 26 10:24:04 2009 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);
1788#endif 1938#endif
1789} 1939}
1790 1940
1791/* ------------------------------------------------------------------------- */ 1941/* ------------------------------------------------------------------------- */
1792/* ARGSUSED */ 1942/* ARGSUSED */
1793void 1943void
1794rxvt_term::scr_printscreen (int fullhist) 1944rxvt_term::scr_printscreen (int fullhist) NOTHROW
1795{ 1945{
1796#ifdef PRINTPIPE 1946#ifdef PRINTPIPE
1797 int i, r1, nrows, row_offset; 1947 int nrows, row_start;
1798 text_t *t; 1948 FILE *fd = popen_printer ();
1799 FILE *fd;
1800 1949
1801 if ((fd = popen_printer ()) == NULL) 1950 if (!fd)
1802 return; 1951 return;
1803 nrows = TermWin.nrow; 1952
1804 row_offset = TermWin.saveLines;
1805 if (!fullhist) 1953 if (fullhist)
1806 row_offset -= TermWin.view_start;
1807 else {
1808 nrows += TermWin.nscrolled;
1809 row_offset -= TermWin.nscrolled;
1810 } 1954 {
1955 nrows = nrow - top_row;
1956 row_start = top_row;
1957 }
1958 else
1959 {
1960 nrows = nrow;
1961 row_start = view_start;
1962 }
1811 1963
1964 wctomb (0, 0);
1965
1812 for (r1 = 0; r1 < nrows; r1++) { 1966 for (int r1 = 0; r1 < nrows; r1++)
1813 t = screen.text[r1 + row_offset];
1814 for (i = TermWin.ncol - 1; i >= 0; i--)
1815 if (!isspace(t[i]))
1816 break;
1817 fprintf(fd, "%.*s\n", (i + 1), t);
1818 } 1967 {
1968 text_t *tp = ROW(r1).t;
1969 int len = ROW(r1).l;
1970
1971 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1972 {
1973 char mb[MB_LEN_MAX];
1974 text_t t = *tp++;
1975 if (t == NOCHAR)
1976 continue;
1977
1978 len = wctomb (mb, t);
1979
1980 if (len <= 0)
1981 {
1982 mb[0] = ' ';
1983 len = 1;
1984 }
1985
1986 fwrite (mb, 1, len, fd);
1987 }
1988
1989 fputc ('\n', fd);
1990 }
1991
1819 pclose_printer (fd); 1992 pclose_printer (fd);
1820#endif 1993#endif
1821} 1994}
1822 1995
1823/* ------------------------------------------------------------------------- */ 1996/* ------------------------------------------------------------------------- */
1824/* 1997/*
1825 * Refresh the screen 1998 * Refresh the screen
1826 * drawn_text/drawn_rend contain the screen information before the update. 1999 * drawn_text/drawn_rend contain the screen information before the update.
1827 * screen.text/screen.rend contain what the screen will change to. 2000 * screen.text/screen.rend contain what the screen will change to.
1828 */ 2001 */
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 2002void
1840rxvt_term::scr_refresh (unsigned char refresh_type) 2003rxvt_term::scr_refresh () NOTHROW
1841{ 2004{
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 */ 2005 int16_t col, row, /* column/row we're processing */
1848 ocrow; /* old cursor row */ 2006 ocrow; /* old cursor row */
1849 int cursorwidth;
1850 int i, /* tmp */ 2007 int i; /* tmp */
1851 row_offset; /* basic offset in screen structure */
1852#ifndef NO_CURSORCOLOR 2008#ifndef NO_CURSORCOLOR
1853 rend_t cc1; /* store colours at cursor position(s) */ 2009 rend_t cc1; /* store colours at cursor position (s) */
1854#endif 2010#endif
1855 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2011 rend_t *crp; // cursor rendition pointer
1856 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2012 rend_t ccol1, /* Cursor colour */
2013 ccol2; /* Cursor colour2 */
1857 2014
2015 want_refresh = 0; /* screen is current */
2016
1858 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2017 if (refresh_type == NO_REFRESH || !mapped)
1859 return; 2018 return;
1860 2019
1861 /* 2020 /*
1862 * A: set up vars 2021 * A: set up vars
1863 */ 2022 */
1864 clearfirst = clearlast = must_clear = 0;
1865
1866 refresh_count = 0; 2023 refresh_count = 0;
1867 2024
1868 row_offset = TermWin.saveLines - TermWin.view_start; 2025 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0;
2027#ifdef HAVE_BG_PIXMAP
2028 have_bg = bgPixmap.pixmap != None;
2029#endif
2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1869 2031
1870 if ((refresh_type & REFRESH_BOUNDS)) 2032 /*
2033 * B: reverse any characters which are selected
2034 */
2035 scr_reverse_selection ();
2036
2037 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY
2039 scr_swap_overlay ();
2040#endif
2041
2042 char showcursor = screen.flags & Screen_VisibleCursor;
2043
2044 /*
2045 * C: set the cursor character (s)
2046 */
2047 {
2048 unsigned char setoldcursor;
2049
2050#ifdef CURSOR_BLINK
2051 if (hidden_cursor)
2052 showcursor = 0;
2053#endif
2054
2055 if (showcursor)
1871 { 2056 {
1872 clearfirst = clearlast = 1; 2057 int col = screen.cur.col;
1873 refresh_type &= ~REFRESH_BOUNDS;
1874 }
1875 2058
1876#if defined(XPM_BACKGROUND) 2059 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1877 must_clear |= (bgPixmap.pixmap != None); 2060 col--;
1878#endif
1879#if defined(TRANSPARENT)
1880 must_clear |= ((Options & Opt_transparent) && am_transparent);
1881#endif
1882 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1883 2061
1884 /* 2062 crp = &ROW(screen.cur.row).r[col];
1885 * B: reverse any characters which are selected
1886 */
1887 scr_reverse_selection ();
1888 2063
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 2064#ifndef NO_CURSORCOLOR
1917 cc1 = *srp & (RS_fgMask | RS_bgMask); 2065 cc1 = *crp & (RS_fgMask | RS_bgMask);
1918 if (ISSET_PIXCOLOR (Color_cursor)) 2066 if (ISSET_PIXCOLOR (Color_cursor))
1919 ccol1 = Color_cursor; 2067 ccol1 = Color_cursor;
1920 else 2068 else
2069#endif
1921#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2070#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1922 ccol1 = GET_FGCOLOR(rstyle); 2071 ccol1 = fgcolor_of (rstyle);
1923#else 2072#else
1924 ccol1 = Color_fg; 2073 ccol1 = Color_fg;
1925#endif 2074#endif
2075
2076#ifndef NO_CURSORCOLOR
1926 if (ISSET_PIXCOLOR (Color_cursor2)) 2077 if (ISSET_PIXCOLOR (Color_cursor2))
1927 ccol2 = Color_cursor2; 2078 ccol2 = Color_cursor2;
1928 else 2079 else
2080#endif
1929#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2081#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1930 ccol2 = GET_BGCOLOR(rstyle); 2082 ccol2 = bgcolor_of (rstyle);
1931#else 2083#else
1932 ccol2 = Color_bg; 2084 ccol2 = Color_bg;
1933#endif 2085#endif
2086
2087 if (showcursor && focus)
2088 {
2089 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline;
2091 else
2092 {
2093 *crp ^= RS_RVid;
1934 *srp = SET_FGCOLOR(*srp, ccol1); 2094 *crp = SET_FGCOLOR (*crp, ccol1);
1935 *srp = SET_BGCOLOR(*srp, ccol2); 2095 *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 } 2096 }
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 } 2097 }
1963 } 2098 }
2099
2100 /* make sure no outline cursor is left around */
2101 setoldcursor = 0;
2102 if (ocrow != -1)
2103 {
2104 if (screen.cur.row - view_start != ocrow
2105 || screen.cur.col != oldcursor.col)
2106 {
2107 if (ocrow < nrow
2108 && oldcursor.col < ncol)
2109 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2110
2111 if (focus || !showcursor)
2112 oldcursor.row = -1;
2113 else
2114 setoldcursor = 1;
2115 }
1964 } 2116 }
2117 else if (!focus)
2118 setoldcursor = 1;
2119
2120 if (setoldcursor)
2121 {
2122 if (screen.cur.row - view_start >= nrow)
2123 oldcursor.row = -1;
2124 else
2125 {
2126 oldcursor.row = screen.cur.row - view_start;
2127 oldcursor.col = screen.cur.col;
2128 }
2129 }
2130 }
1965 2131
1966#ifndef NO_SLOW_LINK_SUPPORT 2132#ifndef NO_SLOW_LINK_SUPPORT
1967 /* 2133 /*
1968 * D: CopyArea pass - very useful for slower links 2134 * D: CopyArea pass - very useful for slower links
1969 * This has been deliberately kept simple. 2135 * This has been deliberately kept simple.
1970 */ 2136 */
1971 i = num_scr; 2137 if (!display->is_local
1972 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2138 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
1973 && abs(i) < TermWin.nrow && !must_clear) 2139 && abs (num_scr) < nrow && !have_bg)
1974 { 2140 {
1975 int16_t nits; 2141 int16_t nits;
1976 int j; 2142 int i = num_scr;
1977 rend_t *drp2; 2143 int j;
1978 text_t *dtp2; 2144 int len, wlen;
1979 int len, wlen; 2145 dLocal (int, num_scr);
1980 2146
1981 j = TermWin.nrow; 2147 j = nrow;
1982 wlen = len = -1; 2148 wlen = len = -1;
1983 row = i > 0 ? 0 : j - 1; 2149 row = i > 0 ? 0 : j - 1;
2150
1984 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2151 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1985 { 2152 {
1986 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2153 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
1987 { 2154 {
1988 stp = screen.text[row + row_offset]; 2155 line_t s = ROW(view_start + row);
1989 srp = screen.rend[row + row_offset];
1990 dtp = drawn_text[row]; 2156 line_t d = drawn_buf[row];
1991 dtp2 = drawn_text[row + i]; 2157 line_t d2 = drawn_buf[row + i];
1992 drp = drawn_rend[row];
1993 drp2 = drawn_rend[row + i];
1994 2158
1995 for (nits = 0, col = TermWin.ncol; col--; ) 2159 for (nits = 0, col = ncol; col--; )
1996 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2160 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
1997 nits--; 2161 nits--;
1998 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2162 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
1999 nits++; 2163 nits++;
2000 2164
2001 if (nits > 8) /* XXX: arbitrary choice */ 2165 if (nits > 8) /* XXX: arbitrary choice */
2166 {
2167 for (col = ncol; col--; )
2168 {
2169 *d.t++ = *d2.t++;
2170 *d.r++ = *d2.r++;
2171 }
2172
2173 if (len == -1)
2174 len = row;
2175
2176 wlen = row;
2177 continue;
2178 }
2179 }
2180
2181 if (len >= 0)
2182 {
2183 /* also comes here at end if needed because of >= above */
2184 if (wlen < len)
2185 ::swap (wlen, len);
2186
2187 XGCValues gcv;
2188
2189 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2190 XCopyArea (dpy, vt, vt,
2191 gc, 0, Row2Pixel (len + i),
2192 (unsigned int)this->width,
2193 (unsigned int)Height2Pixel (wlen - len + 1),
2194 0, Row2Pixel (len));
2195 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2196
2197 len = -1;
2198 }
2199 }
2200 }
2201#endif
2202
2203 /*
2204 * E: main pass across every character
2205 */
2206 for (row = 0; row < nrow; row++)
2207 {
2208 text_t *stp = ROW(view_start + row).t;
2209 rend_t *srp = ROW(view_start + row).r;
2210 text_t *dtp = drawn_buf[row].t;
2211 rend_t *drp = drawn_buf[row].r;
2212
2213 /*
2214 * E2: OK, now the real pass
2215 */
2216 int ypixel = (int)Row2Pixel (row);
2217
2218 for (col = 0; col < ncol; col++)
2219 {
2220 /* compare new text with old - if exactly the same then continue */
2221 if (stp[col] == dtp[col] /* Must match characters to skip. */
2222 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2223 || (stp[col] == ' ' /* space w/ no background change */
2224 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2225 continue;
2226
2227 // redraw one or more characters
2228
2229 // seek to the beginning of wide characters
2230 while (expect_false (stp[col] == NOCHAR && col > 0))
2231 --col;
2232
2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2234 text_t *text = stp + col;
2235 int count = 1;
2236
2237 dtp[col] = stp[col];
2238 drp[col] = rend;
2239
2240 int xpixel = Col2Pixel (col);
2241
2242 for (i = 0; ++col < ncol; )
2243 {
2244 if (stp[col] == NOCHAR)
2245 {
2246 dtp[col] = stp[col];
2247 drp[col] = srp[col];
2248
2249 count++;
2250 i++;
2251
2252 continue;
2253 }
2254
2255 if (!RS_SAME (rend, srp[col]))
2256 break;
2257
2258 count++;
2259
2260 if (stp[col] != dtp[col]
2261 || !RS_SAME (srp[col], drp[col]))
2262 {
2263 if (have_bg && (i++ > count / 2))
2264 break;
2265
2266 dtp[col] = stp[col];
2267 drp[col] = rend;
2268 i = 0;
2269 }
2270 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2271 break;
2272 }
2273
2274 col--; /* went one too far. move back */
2275 count -= i; /* dump any matching trailing chars */
2276
2277 // sometimes we optimize away the trailing NOCHAR's, add them back
2278 while (expect_false (i && text[count] == NOCHAR))
2279 count++, i--;
2280
2281 /*
2282 * Determine the attributes for the string
2283 */
2284 int fore = fgcolor_of (rend); // desired foreground
2285 int back = bgcolor_of (rend); // desired background
2286
2287 // only do special processing if any attributes are set, which is unlikely
2288 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2289 {
2290 bool invert = rend & RS_RVid;
2291
2292#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (rend & RS_Bold && fore == Color_fg)
2294 {
2295 if (ISSET_PIXCOLOR (Color_BD))
2296 fore = Color_BD;
2297# if !ENABLE_STYLES
2298 else
2299 invert = !invert;
2300# endif
2301 }
2302
2303 if (rend & RS_Italic && fore == Color_fg)
2304 {
2305 if (ISSET_PIXCOLOR (Color_IT))
2306 fore = Color_IT;
2307# if !ENABLE_STYLES
2308 else
2309 invert = !invert;
2310# endif
2311 }
2312
2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2314 fore = Color_UL;
2315#endif
2316
2317 if (invert)
2318 {
2319#ifdef OPTION_HC
2320 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2321 || !ISSET_PIXCOLOR (Color_HC))
2322#endif
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2330
2331#ifndef NO_BOLD_UNDERLINE_REVERSE
2332# ifndef OPTION_HC
2333 if (ISSET_PIXCOLOR (Color_RV))
2334 back = Color_RV;
2335# endif
2336 if (fore == back)
2337 {
2338 fore = Color_bg;
2339 back = Color_fg;
2340 }
2341#endif
2342 }
2343
2344#ifdef TEXT_BLINK
2345 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2346 {
2347 if (!text_blink_ev.is_active ())
2348 {
2349 text_blink_ev.again ();
2350 hidden_text = 0;
2351 }
2352 else if (hidden_text)
2353 fore = back;
2354 }
2355#endif
2356
2357#if ENABLE_STYLES
2358 // "careful" (too wide) character handling
2359
2360 // include previous careful character(s) if possible, looks nicer (best effort...)
2361 while (text > stp
2362 && srp[text - stp - 1] & RS_Careful
2363 && RS_SAME (rend, srp[text - stp - 1]))
2364 text--, count++, xpixel -= fwidth;
2365
2366 // force redraw after "careful" characters to avoid pixel droppings
2367 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2368 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2369
2370 // force redraw before "careful" characters to avoid pixel droppings
2371 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2372 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2373#endif
2374 }
2375
2376 /*
2377 * Actually do the drawing of the string here
2378 */
2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2380
2381 if (expect_true (have_bg && back == Color_bg))
2382 {
2383 // this is very ugly, maybe push it into ->draw?
2384
2385 for (i = 0; i < count; i++) /* don't draw empty strings */
2386 if (text[i] != ' ')
2002 { 2387 {
2003 for (col = TermWin.ncol; col--; ) 2388 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2004 { 2389 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 } 2390 }
2015 }
2016 2391
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 for (i = 0; i < count; i++) /* don't draw empty strings */
2172 if (text[i] != ' ')
2173 {
2174 font->draw (xpixel, ypixel, text, count, fore, -1);
2175 goto nodraw;
2176 }
2177
2178 CLEAR_CHARS (xpixel, ypixel, count); 2392 CLEAR_CHARS (xpixel, ypixel, count);
2179nodraw: ; 2393 did_clear: ;
2180 } 2394 }
2395 else
2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2397
2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2399 {
2400#if ENABLE_FRILLS
2401 if (ISSET_PIXCOLOR (Color_underline))
2402 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2181 else 2403 else
2182 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2404#endif
2183 } 2405 XSetForeground (dpy, gc, pix_colors[fore]);
2184 else
2185 font->draw (xpixel, ypixel, text, count, fore, back);
2186 2406
2187 if ((rend & RS_Uline) && (font->descent > 1)) 2407 XDrawLine (dpy, vt, gc,
2188 XDrawLine(Xdisplay, drawBuffer, TermWin.gc,
2189 xpixel, ypixel + font->ascent + 1, 2408 xpixel, ypixel + font->ascent + 1,
2190 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2409 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2410 }
2191 } /* for (col....) */ 2411 } /* for (col....) */
2192 } /* for (row....) */ 2412 } /* for (row....) */
2193 2413
2194 /* 2414 /*
2195 * G: cleanup cursor and display outline cursor if necessary 2415 * G: cleanup cursor and display outline cursor if necessary
2196 */ 2416 */
2197 if (showcursor) { 2417 if (showcursor)
2198 if (TermWin.focus) { 2418 {
2199 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 2419 if (focus)
2200 [screen.cur.col]); 2420 {
2421 if (option (Opt_cursorUnderline))
2422 *crp ^= RS_Uline;
2423 else
2424 {
2201 *srp ^= RS_RVid; 2425 *crp ^= RS_RVid;
2202#ifndef NO_CURSORCOLOR 2426#ifndef NO_CURSORCOLOR
2203 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2427 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2204#endif 2428#endif
2429 }
2430 }
2205 } else if (oldcursor.row >= 0) { 2431 else if (oldcursor.row >= 0)
2432 {
2433 int cursorwidth = 1;
2434 int col = oldcursor.col;
2435
2436 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2437 col--;
2438
2439 while (col + cursorwidth < ncol
2440 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2441 cursorwidth++;
2442
2206#ifndef NO_CURSORCOLOR 2443#ifndef NO_CURSORCOLOR
2207 if (ISSET_PIXCOLOR (Color_cursor)) 2444 if (ISSET_PIXCOLOR (Color_cursor))
2208 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]); 2445 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2446 else
2209#endif 2447#endif
2210 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc, 2448 XSetForeground (dpy, gc, pix_colors[ccol1]);
2449
2450 XDrawRectangle (dpy, vt, gc,
2211 Col2Pixel(oldcursor.col), 2451 Col2Pixel (col),
2212 Row2Pixel(oldcursor.row), 2452 Row2Pixel (oldcursor.row),
2213 (unsigned int)(Width2Pixel(cursorwidth) - 1), 2453 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2214 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1)); 2454 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2215 } 2455 }
2216 } 2456 }
2217 2457
2218 /* 2458 /*
2219 * H: cleanup selection 2459 * H: cleanup selection
2220 */ 2460 */
2461#if ENABLE_OVERLAY
2462 scr_swap_overlay ();
2463#endif
2464 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2465
2221 scr_reverse_selection (); 2466 scr_reverse_selection ();
2222 2467
2223 /* 2468 screen.flags = old_screen_flags;
2224 * I: other general cleanup
2225 */
2226 if (clearfirst && TermWin.int_bwidth)
2227 /*
2228 * clear the whole screen height, note that width == 0 is treated
2229 * specially by XClearArea
2230 */
2231 XClearArea(Xdisplay, TermWin.vt, 0, 0,
2232 (unsigned int)TermWin.int_bwidth,
2233 (unsigned int)TermWin_TotalHeight(), False);
2234 if (clearlast && TermWin.int_bwidth)
2235 /*
2236 * clear the whole screen height, note that width == 0 is treated
2237 * specially by XClearArea
2238 */
2239 XClearArea(Xdisplay, TermWin.vt,
2240 TermWin.width + TermWin.int_bwidth, 0,
2241 (unsigned int)TermWin.int_bwidth,
2242 (unsigned int)TermWin_TotalHeight(), False);
2243 if (refresh_type & SMOOTH_REFRESH)
2244 XSync(Xdisplay, False);
2245
2246 num_scr = 0; 2469 num_scr = 0;
2247 num_scr_allow = 1; 2470 num_scr_allow = 1;
2248 want_refresh = 0; /* screen is current */
2249} 2471}
2250 2472
2251/* ------------------------------------------------------------------------- */
2252void 2473void
2253rxvt_term::scr_clear() 2474rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2254{ 2475{
2476 if (!l.t)
2477 return;
2478
2479 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2480
2481 for (int i = ncol; i--; )
2482 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2483}
2484
2485void
2486rxvt_term::scr_remap_chars () NOTHROW
2487{
2488 for (int i = total_rows; i--; )
2489 scr_remap_chars (row_buf [i]);
2490
2491 for (int i = nrow; i--; )
2492 {
2493 scr_remap_chars (drawn_buf [i]);
2494 scr_remap_chars (swap_buf [i]);
2495 }
2496}
2497
2498void
2499rxvt_term::scr_recolour () NOTHROW
2500{
2501#ifdef HAVE_BG_PIXMAP
2502 bgPixmap.apply ();
2503#else
2504
2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2506 XClearWindow (dpy, parent[0]);
2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2508
2509 if (scrollBar.win)
2510 {
2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2512 scrollBar.state = STATE_IDLE;
2513 scrollBar.show (0);
2514 }
2515
2516#endif
2517
2518 /* bgPixmap.apply () does not do the following : */
2519 scr_clear ();
2520 scr_touch (true);
2521 want_refresh = 1;
2522}
2523
2524/* ------------------------------------------------------------------------- */
2525void
2526rxvt_term::scr_clear (bool really) NOTHROW
2527{
2255 if (!TermWin.mapped) 2528 if (!mapped)
2256 return; 2529 return;
2257 2530
2258 num_scr_allow = 0; 2531 num_scr_allow = 0;
2259 want_refresh = 1; 2532 want_refresh = 1;
2260#ifdef TRANSPARENT 2533
2261 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2534 if (really)
2535 XClearWindow (dpy, vt);
2536}
2537
2538void
2539rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2540{
2541 int view_end = view_start + nrow;
2542 int row, col;
2543
2544 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2545 {
2546 text_t *stp = ROW(row).t;
2547 rend_t *srp = ROW(row).r;
2548
2549 for (col = beg_col; col < end_col; col++)
2550 srp[col] ^= rstyle1;
2551
2552 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2553 srp[col] ^= rstyle2;
2554
2555 if (++col < end_col)
2556 srp[col] ^= rstyle2;
2262 { 2557 }
2263 int i; 2558}
2264 2559
2265 if (!(Options & Opt_transparent_all)) 2560void
2561rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2562{
2563 int view_end = view_start + nrow;
2564 int row, col;
2565
2566 if (beg_row >= view_start)
2567 {
2568 col = beg_col;
2569 row = beg_row;
2570 }
2571 else
2572 {
2266 i = 0; 2573 col = 0;
2574 row = view_start;
2575 }
2576
2577 for (; row < min (end_row, view_end); row++, col = 0)
2578 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2579 srp[col] ^= rstyle;
2580
2581 if (row == end_row)
2582 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2583 srp[col] ^= rstyle;
2584}
2585
2586/* ------------------------------------------------------------------------- */
2587void
2588rxvt_term::scr_reverse_selection () NOTHROW
2589{
2590 if (selection.op
2591 && current_screen == selection.screen
2592 && selection.end.row >= view_start)
2593 {
2594#if !ENABLE_MINIMAL
2595 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline);
2267 else 2599 else
2268 i = (int)(sizeof(TermWin.parent) / sizeof(Window));
2269
2270 while (i--)
2271 if (TermWin.parent[i] != None)
2272 XClearWindow(Xdisplay, TermWin.parent[i]);
2273 }
2274#endif 2600#endif
2275 2601 scr_xor_span (selection.beg.row, selection.beg.col,
2276 XClearWindow (Xdisplay, TermWin.vt); 2602 selection.end.row, selection.end.col,
2277} 2603 RS_RVid);
2278
2279/* ------------------------------------------------------------------------- */
2280void
2281rxvt_term::scr_reverse_selection ()
2282{
2283 int i, col, row, end_row;
2284 rend_t *srp;
2285
2286 if (selection.op && current_screen == selection.screen) {
2287 end_row = TermWin.saveLines - TermWin.view_start;
2288 i = selection.beg.row + TermWin.saveLines;
2289 row = selection.end.row + TermWin.saveLines;
2290 if (i >= end_row)
2291 col = selection.beg.col;
2292 else {
2293 col = 0;
2294 i = end_row;
2295 }
2296 end_row += TermWin.nrow;
2297 for (; i < row && i < end_row; i++, col = 0)
2298 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2299 srp[col] ^= RS_RVid;
2300 if (i == row && i < end_row)
2301 for (srp = screen.rend[i]; col < selection.end.col; col++)
2302 srp[col] ^= RS_RVid;
2303 } 2604 }
2304} 2605}
2305 2606
2306/* ------------------------------------------------------------------------- */ 2607/* ------------------------------------------------------------------------- */
2307/* 2608/*
2308 * Dump the whole scrollback and screen to the passed filedescriptor. The 2609 * Dump the whole scrollback and screen to the passed filedescriptor. The
2309 * invoking routine must close the fd. 2610 * invoking routine must close the fd.
2310 */ 2611 */
2311#if 0 2612#if 0
2312void 2613void
2313rxvt_term::scr_dump (int fd) 2614rxvt_term::scr_dump (int fd) NOTHROW
2314{ 2615{
2315 int row, wrote; 2616 int row, wrote;
2316 unsigned int width, towrite; 2617 unsigned int width, towrite;
2317 char r1[] = "\n"; 2618 char r1[] = "\n";
2318 2619
2319 for (row = TermWin.saveLines - TermWin.nscrolled; 2620 for (row = saveLines + top_row;
2320 row < TermWin.saveLines + TermWin.nrow - 1; row++) { 2621 row < saveLines + nrow - 1; row++)
2321 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2622 {
2322 : TermWin.ncol; 2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2624 : ncol;
2323 for (towrite = width; towrite; towrite -= wrote) { 2625 for (towrite = width; towrite; towrite -= wrote)
2626 {
2324 wrote = write(fd, &(screen.text[row][width - towrite]), 2627 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2325 towrite); 2628 towrite);
2326 if (wrote < 0) 2629 if (wrote < 0)
2327 return; /* XXX: death, no report */ 2630 return; /* XXX: death, no report */
2328 } 2631 }
2329 if (screen.tlen[row] >= 0) 2632 if (row_buf[row].l >= 0)
2330 if (write(fd, r1, 1) <= 0) 2633 if (write (fd, r1, 1) <= 0)
2331 return; /* XXX: death, no report */ 2634 return; /* XXX: death, no report */
2332 } 2635 }
2333} 2636}
2334#endif 2637#endif
2335 2638
2336/* ------------------------------------------------------------------------- * 2639/* ------------------------------------------------------------------------- *
2337 * CHARACTER SELECTION * 2640 * CHARACTER SELECTION *
2338 * ------------------------------------------------------------------------- */ 2641 * ------------------------------------------------------------------------- */
2339
2340/*
2341 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2342 */
2343void 2642void
2344rxvt_term::selection_check (int check_more) 2643rxvt_term::selection_check (int check_more) NOTHROW
2345{ 2644{
2346 row_col_t pos; 2645 row_col_t pos;
2347 2646
2348 if (!selection.op) 2647 if (!selection.op)
2349 return; 2648 return;
2350 2649
2351 pos.row = pos.col = 0; 2650 pos.row = pos.col = 0;
2352 if ((selection.beg.row < -(int32_t)TermWin.nscrolled) 2651 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2353 || (selection.beg.row >= TermWin.nrow) 2652 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2354 || (selection.mark.row < -(int32_t)TermWin.nscrolled) 2653 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2355 || (selection.mark.row >= TermWin.nrow)
2356 || (selection.end.row < -(int32_t)TermWin.nscrolled)
2357 || (selection.end.row >= TermWin.nrow)
2358 || (check_more == 1 2654 || (check_more == 1
2359 && current_screen == selection.screen 2655 && current_screen == selection.screen
2360 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) 2656 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2361 && ROWCOL_IS_BEFORE(screen.cur, selection.end)) 2657 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2362 || (check_more == 2 2658 || (check_more == 2
2363 && ROWCOL_IS_BEFORE(selection.beg, pos) 2659 && ROWCOL_IS_BEFORE (selection.beg, pos)
2364 && ROWCOL_IS_AFTER(selection.end, pos)) 2660 && ROWCOL_IS_AFTER (selection.end, pos))
2365 || (check_more == 3 2661 || (check_more == 3
2366 && ROWCOL_IS_AFTER(selection.end, pos)) 2662 && ROWCOL_IS_AFTER (selection.end, pos))
2367 || (check_more == 4 /* screen width change */ 2663 || (check_more == 4 /* screen width change */
2368 && (selection.beg.row != selection.end.row 2664 && (selection.beg.row != selection.end.row
2369 || selection.end.col > TermWin.ncol))) 2665 || selection.end.col > ncol)))
2370 CLEAR_SELECTION(); 2666 CLEAR_SELECTION ();
2371} 2667}
2372 2668
2373/* ------------------------------------------------------------------------- */ 2669/* ------------------------------------------------------------------------- */
2374/* 2670/*
2375 * Paste a selection direct to the command fd 2671 * Paste a selection direct to the command fd
2376 */ 2672 */
2377void 2673void
2378rxvt_term::paste (const unsigned char *data, unsigned int len) 2674rxvt_term::paste (char *data, unsigned int len) NOTHROW
2379{ 2675{
2380 unsigned int i, j, n;
2381 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2382
2383#if 0
2384 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2385 ZERO_SCROLLBACK (r);
2386#endif
2387
2388 /* convert normal newline chars into common keyboard Return key sequence */ 2676 /* convert normal newline chars into common keyboard Return key sequence */
2389 for (i = 0; i < len; i += PROP_SIZE) 2677 for (unsigned int i = 0; i < len; i++)
2390 { 2678 if (data[i] == C0_LF)
2391 n = min (len - i, PROP_SIZE); 2679 data[i] = C0_CR;
2392 MEMCPY (ds, data + i, n);
2393 2680
2394 for (j = 0; j < n; j++) 2681 if (priv_modes & PrivMode_BracketPaste)
2395 if (ds[j] == '\n') 2682 tt_printf ("\e[200~");
2396 ds[j] = '\r';
2397 2683
2398 tt_write (ds, (int)n); 2684 tt_write (data, len);
2399 }
2400 2685
2401 free(ds); 2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~");
2402} 2688}
2403 2689
2404/* ------------------------------------------------------------------------- */ 2690/* ------------------------------------------------------------------------- */
2405/* 2691/*
2406 * Respond to a notification that a primary selection has been sent 2692 * Respond to a notification that a primary selection has been sent
2407 * EXT: SelectionNotify 2693 * EXT: SelectionNotify
2408 */ 2694 */
2409int 2695void
2410rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2411{ 2697{
2412 long nread = 0;
2413 unsigned long bytes_after;
2414 XTextProperty ct;
2415
2416 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2417
2418 if (prop == None) /* check for failed XConvertSelection */ 2698 if (prop == None) /* check for failed XConvertSelection */
2419 { 2699 {
2420 if ((selection_type & Sel_CompoundText)) 2700 if ((selection_type & Sel_CompoundText))
2421 { 2701 {
2422 int selnum = selection_type & Sel_whereMask; 2702 int selnum = selection_type & Sel_whereMask;
2423 2703
2424 selection_type = 0; 2704 selection_type = 0;
2425 if (selnum != Sel_direct) 2705 if (selnum != Sel_direct)
2426 selection_request_other (XA_STRING, selnum); 2706 selection_request_other (XA_STRING, selnum);
2427 } 2707 }
2428 2708
2429 if ((selection_type & Sel_UTF8String)) 2709 if ((selection_type & Sel_UTF8String))
2430 { 2710 {
2431 int selnum = selection_type & Sel_whereMask; 2711 int selnum = selection_type & Sel_whereMask;
2432 2712
2433 selection_type = Sel_CompoundText; 2713 selection_type = Sel_CompoundText;
2434 if (selnum != Sel_direct) 2714 if (selnum != Sel_direct)
2435 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2715 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2436 else 2716 else
2437 selection_type = 0; 2717 selection_type = 0;
2438 } 2718 }
2439 2719
2440 return 0; 2720 return;
2441 }
2442
2443 for (;;)
2444 { 2721 }
2722
2723 unsigned long bytes_after;
2724 XTextProperty ct;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 0, PROP_SIZE / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct.encoding, &ct.format,
2730 &ct.nitems, &bytes_after,
2731 &ct.value) != Success)
2732 {
2733 ct.value = 0;
2734 goto bailout;
2735 }
2736
2737 if (ct.encoding == None)
2738 goto bailout;
2739
2740 if (bytes_after)
2741 {
2742 // fetch and append remaining data
2743 XTextProperty ct2;
2744
2445 if (XGetWindowProperty(Xdisplay, win, prop, (long)(nread / 4), 2745 if (XGetWindowProperty (dpy, win, prop,
2446 (long)(PROP_SIZE / 4), delete_prop, 2746 ct.nitems / 4, (bytes_after + 3) / 4,
2747 delete_prop, AnyPropertyType,
2447 AnyPropertyType, &ct.encoding, &ct.format, 2748 &ct2.encoding, &ct2.format,
2448 &ct.nitems, &bytes_after, 2749 &ct2.nitems, &bytes_after,
2449 &ct.value) != Success) 2750 &ct2.value) != Success)
2450 break; 2751 goto bailout;
2451 2752
2452 if (ct.encoding == 0) 2753 // realloc should be compatible to XFree, here, and elsewhere, too
2453 { 2754 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2454 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2755 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2455 break; 2756 ct.nitems += ct2.nitems;
2456 }
2457 2757
2758 XFree (ct2.value);
2759 }
2760
2458 if (ct.value == NULL) 2761 if (ct.value == 0)
2459 { 2762 goto bailout;
2460 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!"));
2461 continue;
2462 }
2463 2763
2764 if (ct.encoding == xa[XA_INCR])
2765 {
2766 // INCR selection, start handshake
2767 if (!delete_prop)
2768 XDeleteProperty (dpy, win, prop);
2769
2770 selection_wait = Sel_incr;
2771 incr_buf_fill = 0;
2772 incr_ev.start (10);
2773
2774 goto bailout;
2775 }
2776
2464 if (ct.nitems == 0) 2777 if (ct.nitems == 0)
2778 {
2779 if (selection_wait == Sel_incr)
2780 {
2781 XFree (ct.value);
2782
2783 // finally complete, now paste the whole thing
2784 selection_wait = Sel_normal;
2785 ct.value = (unsigned char *)incr_buf;
2786 ct.nitems = incr_buf_fill;
2787 incr_buf = 0;
2788 incr_buf_size = 0;
2789 incr_ev.stop ();
2465 { 2790 }
2466 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2791 else
2792 {
2467 if (selection_wait == Sel_normal && nread == 0) 2793 if (selection_wait == Sel_normal
2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2468 { 2795 {
2469 /* 2796 /*
2470 * pass through again trying CUT_BUFFER0 if we've come from 2797 * pass through again trying CUT_BUFFER0 if we've come from
2471 * XConvertSelection() but nothing was presented 2798 * XConvertSelection () but nothing was presented
2472 */ 2799 */
2473 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2474 selection_paste (Xroot, XA_CUT_BUFFER0, False); 2800 selection_paste (display->root, XA_CUT_BUFFER0, False);
2475 } 2801 }
2476 2802
2477 nread = -1; /* discount any previous stuff */ 2803 goto bailout;
2478 break;
2479 }
2480
2481 nread += ct.nitems;
2482
2483 char **cl;
2484 int cr;
2485 if (XmbTextPropertyToTextList (Xdisplay, &ct, &cl,
2486 &cr) >= 0 && cl)
2487 { 2804 }
2805 }
2806 else if (selection_wait == Sel_incr)
2807 {
2808 incr_ev.start (10);
2809
2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2811 {
2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2814 }
2815
2816 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2817 incr_buf_fill += ct.nitems;
2818
2819 goto bailout;
2820 }
2821
2822 char **cl;
2823 int cr;
2824
2825#if !ENABLE_MINIMAL
2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2827 // so recode it manually
2828 if (ct.encoding == xa[XA_UTF8_STRING])
2829 {
2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2831 char *s = rxvt_wcstombs (w);
2832 free (w);
2833 // TODO: strlen == only the first element will be converted. well...
2834 paste (s, strlen (s));
2835 free (s);
2836 }
2837 else
2838#endif
2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2840 && cl)
2841 {
2488 for (int i = 0; i < cr; i++) 2842 for (int i = 0; i < cr; i++)
2489 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2843 paste (cl[i], strlen (cl[i]));
2490 2844
2491 XFreeStringList (cl); 2845 XFreeStringList (cl);
2492 } 2846 }
2493 else 2847 else
2494 paste (ct.value, ct.nitems); 2848 paste ((char *)ct.value, ct.nitems); // paste raw
2495 2849
2496 if (bytes_after == 0) 2850bailout:
2497 break;
2498
2499 XFree (ct.value);
2500 }
2501
2502 if (ct.value)
2503 XFree (ct.value); 2851 XFree (ct.value);
2504 2852
2505 if (selection_wait == Sel_normal) 2853 if (selection_wait == Sel_normal)
2506 selection_wait = Sel_none; 2854 selection_wait = Sel_none;
2507
2508 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2509 return (int)nread;
2510} 2855}
2511 2856
2512void 2857void
2513rxvt_term::incr_cb (time_watcher &w) 2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2514{ 2859{
2515 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2516 2861
2862 incr_buf_size = 0;
2863 free (incr_buf);
2864
2517 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2865 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2518} 2866}
2519 2867
2520/*
2521 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2522 */
2523void 2868void
2524rxvt_term::selection_property (Window win, Atom prop) 2869rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2525{ 2870{
2526 int reget_time = 0; 2871 if (prop == None || selection_wait != Sel_incr)
2527
2528 if (prop == None)
2529 return; 2872 return;
2530 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2531 if (selection_wait == Sel_normal) {
2532 int a, afmt;
2533 Atom atype;
2534 unsigned long bytes_after, nitems;
2535 unsigned char *s = NULL;
2536 2873
2537 a = XGetWindowProperty(Xdisplay, win, prop, 0L, 1L, False,
2538 xa[XA_INCR], &atype, &afmt, &nitems,
2539 &bytes_after, &s);
2540 if (s)
2541 XFree(s);
2542 if (a != Success)
2543 return;
2544#ifndef __CYGWIN32__
2545 if (atype == xa[XA_INCR]) { /* start an INCR transfer */
2546 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2547 XDeleteProperty(Xdisplay, win, prop);
2548 XFlush(Xdisplay);
2549 reget_time = 1;
2550 selection_wait = Sel_incr;
2551 }
2552#endif
2553 } else if (selection_wait == Sel_incr) {
2554 reget_time = 1;
2555 if (selection_paste (win, prop, True) == -1) { 2874 selection_paste (win, prop, true);
2556 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2557 selection_wait = Sel_none;
2558 incr_ev.stop ();
2559 }
2560 }
2561 if (reget_time) /* received more data so reget time */
2562 incr_ev.start (NOW + 10);
2563} 2875}
2876
2564/* ------------------------------------------------------------------------- */ 2877/* ------------------------------------------------------------------------- */
2565/* 2878/*
2566 * Request the current selection: 2879 * Request the current selection:
2567 * Order: > internal selection if available 2880 * Order: > internal selection if available
2568 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2569 * > CUT_BUFFER0 2882 * > CUT_BUFFER0
2570 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2571 * will auto fallback to CUT_BUFFER0 2884 * will auto fallback to CUT_BUFFER0
2572 * EXT: button 2 release 2885 * EXT: button 2 release
2573 */ 2886 */
2574void 2887void
2575rxvt_term::selection_request (Time tm, int x, int y) 2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2576{ 2889{
2577 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2890 if (selection.text && selnum == Sel_Primary)
2578 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2891 {
2579 return; /* outside window */ 2892 /* internal selection */
2580
2581 if (selection.text != NULL) { /* internal selection */
2582 D_SELECT((stderr, "rxvt_selection_request: pasting internal"));
2583 paste (selection.text, selection.len); 2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2894 paste (str, strlen (str));
2895 free (str);
2584 return; 2896 return;
2585 } else { 2897 }
2586 int i; 2898 else
2587 2899 {
2588 selection_request_time = tm; 2900 selection_request_time = tm;
2589 selection_wait = Sel_normal; 2901 selection_wait = Sel_normal;
2590 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2902
2591#if X_HAVE_UTF8_STRING 2903#if X_HAVE_UTF8_STRING
2592 selection_type = Sel_UTF8String; 2904 selection_type = Sel_UTF8String;
2593 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2594 return; 2906 return;
2595#else 2907#else
2596 selection_type = Sel_CompoundText; 2908 selection_type = Sel_CompoundText;
2597 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2598 return; 2910 return;
2599#endif 2911#endif
2600 }
2601 } 2912 }
2913
2602 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2914 selection_wait = Sel_none; /* don't loop in selection_paste () */
2603 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2604 selection_paste (Xroot, XA_CUT_BUFFER0, False); 2915 selection_paste (display->root, XA_CUT_BUFFER0, false);
2605} 2916}
2606 2917
2607int 2918int
2608rxvt_term::selection_request_other (Atom target, int selnum) 2919rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2609{ 2920{
2610 Atom sel; 2921 Atom sel;
2611#ifdef DEBUG_SELECT
2612 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2613#endif
2614 2922
2615 selection_type |= selnum; 2923 selection_type |= selnum;
2924
2616 if (selnum == Sel_Primary) 2925 if (selnum == Sel_Primary)
2617 sel = XA_PRIMARY; 2926 sel = XA_PRIMARY;
2618 else if (selnum == Sel_Secondary) 2927 else if (selnum == Sel_Secondary)
2619 sel = XA_SECONDARY; 2928 sel = XA_SECONDARY;
2620 else 2929 else
2621 sel = xa[XA_CLIPBOARD]; 2930 sel = xa[XA_CLIPBOARD];
2931
2622 if (XGetSelectionOwner(Xdisplay, sel) != None) { 2932 if (XGetSelectionOwner (dpy, sel) != None)
2623 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2933 {
2624 XConvertSelection(Xdisplay, sel, target, xa[XA_VT_SELECTION], 2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2625 TermWin.vt, selection_request_time); 2935 vt, selection_request_time);
2626 return 1; 2936 return 1;
2627 } 2937 }
2938
2628 return 0; 2939 return 0;
2629} 2940}
2630 2941
2631/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2632/* 2943/*
2633 * Clear all selected text 2944 * Clear all selected text
2634 * EXT: SelectionClear 2945 * EXT: SelectionClear
2635 */ 2946 */
2636void 2947void
2637rxvt_term::selection_clear () 2948rxvt_term::selection_clear () NOTHROW
2638{ 2949{
2639 D_SELECT((stderr, "rxvt_selection_clear()"));
2640
2641 want_refresh = 1; 2950 want_refresh = 1;
2642 if (selection.text)
2643 free(selection.text); 2951 free (selection.text);
2644 selection.text = NULL; 2952 selection.text = NULL;
2645 selection.len = 0; 2953 selection.len = 0;
2646 CLEAR_SELECTION(); 2954 CLEAR_SELECTION ();
2955
2956 if (display->selection_owner == this)
2957 display->selection_owner = 0;
2647} 2958}
2648 2959
2649/* ------------------------------------------------------------------------- */ 2960/* ------------------------------------------------------------------------- */
2650/* 2961/*
2651 * Copy a selection into the cut buffer 2962 * Copy a selection into the cut buffer
2652 * EXT: button 1 or 3 release 2963 * EXT: button 1 or 3 release
2653 */ 2964 */
2654void 2965void
2655rxvt_term::selection_make (Time tm) 2966rxvt_term::selection_make (Time tm)
2656{ 2967{
2657 int i, col, end_col, row, end_row; 2968 int i;
2658 unsigned char *new_selection_text; 2969 wchar_t *new_selection_text;
2659 char *str; 2970 text_t *t;
2660 text_t *t;
2661#ifdef ACS_ASCII
2662 rend_t *re;
2663#endif
2664 2971
2665 D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2666 switch (selection.op) { 2972 switch (selection.op)
2973 {
2667 case SELECTION_CONT: 2974 case SELECTION_CONT:
2668 break; 2975 break;
2669 case SELECTION_INIT: 2976 case SELECTION_INIT:
2670 CLEAR_SELECTION(); 2977 CLEAR_SELECTION ();
2671 /* FALLTHROUGH */ 2978 /* FALLTHROUGH */
2672 case SELECTION_BEGIN: 2979 case SELECTION_BEGIN:
2673 selection.op = SELECTION_DONE; 2980 selection.op = SELECTION_DONE;
2674 /* FALLTHROUGH */ 2981 /* FALLTHROUGH */
2675 default: 2982 default:
2676 return; 2983 return;
2677 } 2984 }
2985
2678 selection.op = SELECTION_DONE; 2986 selection.op = SELECTION_DONE;
2679 2987
2680 if (selection.clicks == 4) 2988 if (selection.clicks == 4)
2681 return; /* nothing selected, go away */ 2989 return; /* nothing selected, go away */
2682 2990
2991 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2992 return;
2993
2683 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2684 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2995 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2685 2996
2686 new_selection_text = (unsigned char *)str; 2997 int ofs = 0;
2998 int extra = 0;
2687 2999
2688 col = selection.beg.col; 3000 int col = selection.beg.col;
2689 MAX_IT(col, 0); 3001 int row = selection.beg.row;
2690 row = selection.beg.row + TermWin.saveLines;
2691 end_row = selection.end.row + TermWin.saveLines;
2692 3002
3003 int end_col;
3004
2693 for (; row <= end_row; row++, col = 0) 3005 for (; row <= selection.end.row; row++, col = 0)
3006 {
3007#if !ENABLE_MINIMAL
3008 if (selection.rect)
2694 { 3009 {
2695 t = &(screen.text[row][col]); 3010 col = selection.beg.col;
2696
2697 end_col = screen.tlen[row];
2698
2699 if (end_col == -1)
2700 end_col = TermWin.ncol; 3011 end_col = ncol + 1;
3012 }
3013 else
3014#endif
3015 end_col = ROW(row).l;
2701 3016
3017 col = max (col, 0);
3018
2702 if (row == end_row) 3019 if (row == selection.end.row
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
2703 MIN_IT (end_col, selection.end.col); 3024 min_it (end_col, selection.end.col);
2704 3025
3026 t = ROW(row).t + col;
3027
2705 for (; col < end_col; col++) 3028 for (; col < end_col; col++)
3029 {
2706 if (*t == NOCHAR) 3030 if (*t == NOCHAR)
2707 t++; 3031 t++;
3032#if ENABLE_COMBINING
3033 else if (IS_COMPOSE (*t))
3034 {
3035 int len = rxvt_composite.expand (*t, 0);
3036
3037 extra -= (len - 1);
3038
3039 if (extra < 0)
3040 {
3041 extra += i;
3042 i += i;
3043 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
3044 }
3045
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 }
3048#endif
2708 else 3049 else
2709 { 3050 new_selection_text[ofs++] = *t++;
2710 int len = wctomb (str, *t++);
2711 if (len > 0)
2712 str += len;
2713 }
2714
2715 if (screen.tlen[row] != -1 && row != end_row)
2716 *str++ = '\n';
2717 }
2718
2719#ifndef NO_OLD_SELECTION
2720 if (selection_style == OLD_SELECT)
2721 if (end_col == TermWin.ncol)
2722 *str++ = '\n';
2723#endif
2724#ifndef NO_NEW_SELECTION
2725 if (selection_style != OLD_SELECT)
2726 if (end_col != selection.end.col)
2727 *str++ = '\n';
2728#endif
2729 *str = '\0';
2730
2731 i = str - (char *)new_selection_text;
2732 if (i == 0)
2733 {
2734 free (new_selection_text);
2735 return;
2736 }
2737
2738 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2739 if (str - (char *)new_selection_text > 1024)
2740 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2741
2742 selection.len = i;
2743
2744 if (selection.text)
2745 free (selection.text);
2746
2747 selection.text = new_selection_text;
2748
2749 XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm);
2750 if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt)
2751 rxvt_print_error("can't get primary selection");
2752
2753
2754 {
2755 XTextProperty ct;
2756 char *cl = (char *)selection.text;
2757
2758 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, XStringStyle, &ct) >= 0)
2759 { 3051 }
2760 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 3052
2761 PropModeReplace, ct.value, ct.nitems); 3053#if !ENABLE_MINIMAL
2762 XFree (ct.value); 3054 if (selection.rect)
3055 {
3056 while (ofs
3057 && new_selection_text[ofs - 1] != C0_LF
3058 && unicode::is_space (new_selection_text[ofs - 1]))
3059 --ofs;
3060
3061 new_selection_text[ofs++] = C0_LF;
2763 } 3062 }
2764 else 3063 else
2765 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 3064#endif
2766 PropModeReplace, selection.text, (int)selection.len); 3065 if (!ROW(row).is_longer () && row != selection.end.row)
3066 new_selection_text[ofs++] = C0_LF;
3067 }
3068
3069 if (end_col != selection.end.col)
3070 new_selection_text[ofs++] = C0_LF;
3071
3072 new_selection_text[ofs] = 0;
3073
3074 if (ofs == 0)
2767 } 3075 {
3076 free (new_selection_text);
3077 return;
3078 }
2768 3079
3080 free (selection.text);
3081
3082 // we usually allocate much more than necessary, so realloc it smaller again
3083 selection.len = ofs;
3084 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3085
3086 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3087 return;
3088
3089 selection_grab (tm);
3090}
3091
3092bool
3093rxvt_term::selection_grab (Time tm) NOTHROW
3094{
2769 selection_time = tm; 3095 selection_time = tm;
2770 D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len)); 3096
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3099 {
3100 display->set_selection_owner (this);
3101 return true;
3102 }
3103 else
3104 {
3105 selection_clear ();
3106 return false;
3107 }
3108
3109#if 0
3110 XTextProperty ct;
3111
3112 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3113 {
3114 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3115 XFree (ct.value);
3116 }
3117#endif
2771} 3118}
2772 3119
2773/* ------------------------------------------------------------------------- */ 3120/* ------------------------------------------------------------------------- */
2774/* 3121/*
2775 * Mark or select text based upon number of clicks: 1, 2, or 3 3122 * Mark or select text based upon number of clicks: 1, 2, or 3
2776 * EXT: button 1 press 3123 * EXT: button 1 press
2777 */ 3124 */
2778void 3125void
2779rxvt_term::selection_click (int clicks, int x, int y) 3126rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2780{ 3127{
2781 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2782
2783 clicks = ((clicks - 1) % 3) + 1; 3128 clicks = ((clicks - 1) % 3) + 1;
2784 selection.clicks = clicks; /* save clicks so extend will work */ 3129 selection.clicks = clicks; /* save clicks so extend will work */
2785 3130
3131 if (clicks == 2 && !selection.rect
3132 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3133 {
3134 MEvent.clicks = 1; // what a mess
3135 selection.screen = current_screen;
3136 selection.op = SELECTION_CONT;
3137 return;
3138 }
3139
2786 selection_start_colrow (Pixel2Col(x), Pixel2Row(y)); 3140 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2787 3141
2788 if (clicks == 2 || clicks == 3) 3142 if (clicks == 2 || clicks == 3)
2789 selection_extend_colrow (selection.mark.col, 3143 selection_extend_colrow (selection.mark.col,
2790 selection.mark.row + TermWin.view_start, 3144 selection.mark.row - view_start,
2791 0, /* button 3 */ 3145 0, /* button 3 */
2792 1, /* button press */ 3146 1, /* button press */
2793 0); /* click change */ 3147 0); /* click change */
2794} 3148}
2795 3149
2796/* ------------------------------------------------------------------------- */ 3150/* ------------------------------------------------------------------------- */
2797/* 3151/*
2798 * Mark a selection at the specified col/row 3152 * Mark a selection at the specified col/row
2799 */ 3153 */
2800void 3154void
2801rxvt_term::selection_start_colrow (int col, int row) 3155rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2802{ 3156{
2803 want_refresh = 1; 3157 want_refresh = 1;
3158
3159 selection.mark.row = row + view_start;
2804 selection.mark.col = col; 3160 selection.mark.col = col;
2805 selection.mark.row = row - TermWin.view_start; 3161
2806 MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled); 3162 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2807 MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1); 3163 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3164
3165 while (selection.mark.col > 0
3166 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2808 MAX_IT(selection.mark.col, 0); 3167 --selection.mark.col;
2809 MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1);
2810 3168
2811 if (selection.op) { /* clear the old selection */ 3169 if (selection.op)
3170 {
3171 /* clear the old selection */
2812 selection.beg.row = selection.end.row = selection.mark.row; 3172 selection.beg.row = selection.end.row = selection.mark.row;
2813 selection.beg.col = selection.end.col = selection.mark.col; 3173 selection.beg.col = selection.end.col = selection.mark.col;
2814 } 3174 }
3175
2815 selection.op = SELECTION_INIT; 3176 selection.op = SELECTION_INIT;
2816 selection.screen = current_screen; 3177 selection.screen = current_screen;
2817} 3178}
2818 3179
2819/* ------------------------------------------------------------------------- */ 3180/* ------------------------------------------------------------------------- */
2820/* 3181/*
2821 * Word select: select text for 2 clicks 3182 * Word select: select text for 2 clicks
2822 * We now only find out the boundary in one direction 3183 * We now only find out the boundary in one direction
2823 */ 3184 */
2824 3185
2825/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3186/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2826#define DELIMIT_TEXT(x) \ 3187#define DELIMIT_TEXT(x) \
2827 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(rs[Rs_cutchars], (x)) != NULL)) 3188 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2828#define DELIMIT_REND(x) 1 3189#define DELIMIT_REND(x) 1
2829 3190
2830void 3191void
2831rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3192rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
2832{ 3193{
2833 int col, row, dirnadd, tcol, trow, w1, w2; 3194 int col, row, dirnadd, tcol, trow, w1, w2;
2834 row_col_t bound; 3195 row_col_t bound;
2835 text_t *stp; 3196 text_t *stp;
2836 rend_t *srp; 3197 rend_t *srp;
2837 3198
2838 if (dirn == UP) { 3199 if (dirn == UP)
2839 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3200 {
3201 bound.row = top_row - 1;
2840 bound.col = 0; 3202 bound.col = 0;
2841 dirnadd = -1; 3203 dirnadd = -1;
2842 } else { 3204 }
2843 bound.row = TermWin.saveLines + TermWin.nrow; 3205 else
3206 {
3207 bound.row = nrow;
2844 bound.col = TermWin.ncol - 1; 3208 bound.col = ncol - 1;
2845 dirnadd = 1; 3209 dirnadd = 1;
2846 } 3210 }
2847 row = mark->row + TermWin.saveLines; 3211
3212 row = mark->row;
2848 col = mark->col; 3213 col = max (mark->col, 0);
2849 MAX_IT(col, 0); 3214
2850/* find the edge of a word */ 3215 /* find the edge of a word */
2851 stp = &(screen.text[row][col]); 3216 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
2852 w1 = DELIMIT_TEXT(*stp); 3217 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
2853 3218
2854 if (selection_style != NEW_SELECT) { 3219 for (;;)
2855 if (w1 == 1) { 3220 {
3221 for (; col != bound.col; col += dirnadd)
3222 {
2856 stp += dirnadd; 3223 stp += dirnadd;
2857 if (DELIMIT_TEXT(*stp) == 1)
2858 goto Old_Word_Selection_You_Die;
2859 col += dirnadd;
2860 }
2861 w1 = 0;
2862 }
2863 srp = (&screen.rend[row][col]);
2864 w2 = DELIMIT_REND(*srp);
2865
2866 for (;;) {
2867 for (; col != bound.col; col += dirnadd) {
2868 stp += dirnadd; 3224 srp += dirnadd;
3225
3226 if (*stp == NOCHAR)
3227 continue;
3228
2869 if (DELIMIT_TEXT(*stp) != w1) 3229 if (DELIMIT_TEXT (*stp) != w1)
3230 break;
3231 if (DELIMIT_REND (*srp) != w2)
3232 break;
3233 }
3234
3235 if ((col == bound.col) && (row != bound.row))
3236 {
3237 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3238 {
3239 trow = row + dirnadd;
3240 tcol = dirn == UP ? ncol - 1 : 0;
3241
3242 if (!ROW(trow).t)
2870 break; 3243 break;
2871 srp += dirnadd; 3244
2872 if (DELIMIT_REND(*srp) != w2) 3245 stp = ROW(trow).t + tcol;
3246 srp = ROW(trow).r + tcol;
3247
3248 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2873 break; 3249 break;
2874 } 3250
2875 if ((col == bound.col) && (row != bound.row)) {
2876 if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2877 trow = row + dirnadd;
2878 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2879 if (screen.text[trow] == NULL)
2880 break;
2881 stp = &(screen.text[trow][tcol]);
2882 srp = &(screen.rend[trow][tcol]);
2883 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2884 break;
2885 row = trow; 3251 row = trow;
2886 col = tcol; 3252 col = tcol;
2887 continue; 3253 continue;
2888 } 3254 }
2889 } 3255 }
2890 break; 3256 break;
2891 } 3257 }
2892 Old_Word_Selection_You_Die:
2893 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));
2894 3258
2895 if (dirn == DN) 3259 if (dirn == DN)
2896 col++; /* put us on one past the end */ 3260 col++; /* put us on one past the end */
2897 3261
2898/* Poke the values back in */ 3262 /* Poke the values back in */
2899 ret->row = row - TermWin.saveLines; 3263 ret->row = row;
2900 ret->col = col; 3264 ret->col = col;
2901} 3265}
2902 3266
2903/* ------------------------------------------------------------------------- */ 3267/* ------------------------------------------------------------------------- */
2904/* 3268/*
2905 * Extend the selection to the specified x/y pixel location 3269 * Extend the selection to the specified x/y pixel location
… …
2907 * flag == 0 ==> button 1 3271 * flag == 0 ==> button 1
2908 * flag == 1 ==> button 3 press 3272 * flag == 1 ==> button 3 press
2909 * flag == 2 ==> button 3 motion 3273 * flag == 2 ==> button 3 motion
2910 */ 3274 */
2911void 3275void
2912rxvt_term::selection_extend (int x, int y, int flag) 3276rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
2913{ 3277{
2914 int col, row; 3278 int col = clamp (Pixel2Col (x), 0, ncol);
3279 int row = clamp (Pixel2Row (y), 0, nrow - 1);
2915 3280
2916 col = Pixel2Col(x);
2917 row = Pixel2Row(y);
2918 MAX_IT(row, 0);
2919 MIN_IT(row, (int)TermWin.nrow - 1);
2920 MAX_IT(col, 0);
2921 MIN_IT(col, (int)TermWin.ncol);
2922
2923#ifndef NO_NEW_SELECTION
2924 /* 3281 /*
2925 * If we're selecting characters (single click) then we must check first 3282 * If we're selecting characters (single click) then we must check first
2926 * if we are at the same place as the original mark. If we are then 3283 * if we are at the same place as the original mark. If we are then
2927 * select nothing. Otherwise, if we're to the right of the mark, you have to 3284 * select nothing. Otherwise, if we're to the right of the mark, you have to
2928 * be _past_ a character for it to be selected. 3285 * be _past_ a character for it to be selected.
2929 */ 3286 */
2930 if (selection_style != OLD_SELECT)
2931 {
2932 if (((selection.clicks % 3) == 1) && !flag 3287 if (((selection.clicks % 3) == 1) && !flag
2933 && (col == selection.mark.col 3288 && (col == selection.mark.col
2934 && (row == selection.mark.row + TermWin.view_start))) 3289 && (row == selection.mark.row - view_start)))
2935 { 3290 {
2936 /* select nothing */ 3291 /* select nothing */
2937 selection.beg.row = selection.end.row = 0; 3292 selection.beg.row = selection.end.row = 0;
2938 selection.beg.col = selection.end.col = 0; 3293 selection.beg.col = selection.end.col = 0;
2939 selection.clicks = 4; 3294 selection.clicks = 4;
2940 want_refresh = 1; 3295 want_refresh = 1;
2941 D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4"));
2942 return; 3296 return;
2943 }
2944 } 3297 }
2945#endif 3298
2946 if (selection.clicks == 4) 3299 if (selection.clicks == 4)
2947 selection.clicks = 1; 3300 selection.clicks = 1;
2948 3301
2949 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3302 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2950 flag == 1 ? 1 : 0, /* ? button press */ 3303 flag == 1 ? 1 : 0, /* ? button press */
2951 0); /* no click change */ 3304 0); /* no click change */
2952} 3305}
2953 3306
2954/* ------------------------------------------------------------------------- */ 3307/* ------------------------------------------------------------------------- */
2955/* 3308/*
2956 * Extend the selection to the specified col/row 3309 * Extend the selection to the specified col/row
2957 */ 3310 */
2958void 3311void
2959rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3312rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
2960{ 3313{
2961 int16_t ncol = TermWin.ncol;
2962 int end_col;
2963 row_col_t pos; 3314 row_col_t pos;
2964 enum { 3315 enum {
2965 LEFT, RIGHT 3316 LEFT, RIGHT
2966 } closeto = RIGHT; 3317 } closeto = RIGHT;
2967 3318
2968 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));
2969 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));
2970
2971 want_refresh = 1; 3319 want_refresh = 1;
3320
2972 switch (selection.op) { 3321 switch (selection.op)
3322 {
2973 case SELECTION_INIT: 3323 case SELECTION_INIT:
2974 CLEAR_SELECTION(); 3324 CLEAR_SELECTION ();
2975 selection.op = SELECTION_BEGIN; 3325 selection.op = SELECTION_BEGIN;
2976 /* FALLTHROUGH */ 3326 /* FALLTHROUGH */
2977 case SELECTION_BEGIN: 3327 case SELECTION_BEGIN:
2978 if (row != selection.mark.row || col != selection.mark.col 3328 if (row != selection.mark.row || col != selection.mark.col
2979 || (!button3 && buttonpress)) 3329 || (!button3 && buttonpress))
2980 selection.op = SELECTION_CONT; 3330 selection.op = SELECTION_CONT;
2981 break; 3331 break;
2982 case SELECTION_DONE: 3332 case SELECTION_DONE:
2983 selection.op = SELECTION_CONT; 3333 selection.op = SELECTION_CONT;
2984 /* FALLTHROUGH */ 3334 /* FALLTHROUGH */
2985 case SELECTION_CONT: 3335 case SELECTION_CONT:
2986 break; 3336 break;
2987 case SELECTION_CLEAR: 3337 case SELECTION_CLEAR:
2988 selection_start_colrow (col, row); 3338 selection_start_colrow (col, row);
2989 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
2990 default: 3340 default:
2991 return; 3341 return;
2992 } 3342 }
3343
2993 if (selection.beg.col == selection.end.col 3344 if (selection.beg.col == selection.end.col
2994 && selection.beg.col != selection.mark.col 3345 && selection.beg.col != selection.mark.col
2995 && selection.beg.row == selection.end.row 3346 && selection.beg.row == selection.end.row
2996 && selection.beg.row != selection.mark.row) { 3347 && selection.beg.row != selection.mark.row)
3348 {
2997 selection.beg.col = selection.end.col = selection.mark.col; 3349 selection.beg.col = selection.end.col = selection.mark.col;
2998 selection.beg.row = selection.end.row = selection.mark.row; 3350 selection.beg.row = selection.end.row = selection.mark.row;
2999 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));
3000 } 3351 }
3001 3352
3002 pos.col = col; 3353 pos.col = col;
3003 pos.row = row; 3354 pos.row = view_start + row;
3004 3355
3005 pos.row -= TermWin.view_start; /* adjust for scroll */ 3356 /*
3006 3357 * This is mainly xterm style selection with a couple of differences, mainly
3007#ifndef NO_OLD_SELECTION 3358 * in the way button3 drag extension works.
3008/* 3359 * We're either doing: button1 drag; button3 press; or button3 drag
3009 * This mimics some of the selection behaviour of version 2.20 and before. 3360 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3010 * There are no ``selection modes'', button3 is always character extension. 3361 * is always at the left/right edge of the selection.
3011 * Note: button3 drag is always available, c.f. v2.20 3362 * b) button3 press: extend/contract character/word/line at whichever edge of
3012 * Selection always terminates (left or right as appropriate) at the mark. 3363 * the selection we are closest to.
3364 * c) button3 drag : extend/contract character/word/line - we select around
3365 * a point/word/line which is either the start or end of the selection
3366 * and it was decided by whichever point/word/line was `fixed' at the
3367 * time of the most recent button3 press
3013 */ 3368 */
3014 if (selection_style == OLD_SELECT) { 3369 if (button3 && buttonpress)
3015 if (selection.clicks == 1 || button3) { 3370 {
3016 if (hate_those_clicks) { 3371 /* button3 press */
3017 hate_those_clicks = 0; 3372 /*
3018 if (selection.clicks == 1) { 3373 * first determine which edge of the selection we are closest to
3019 selection.beg.row = selection.mark.row; 3374 */
3020 selection.beg.col = selection.mark.col; 3375 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3021 } else { 3376 || (!ROWCOL_IS_AFTER (pos, selection.end)
3377 && (((pos.col - selection.beg.col)
3378 + ((pos.row - selection.beg.row) * ncol))
3379 < ((selection.end.col - pos.col)
3380 + ((selection.end.row - pos.row) * ncol)))))
3381 closeto = LEFT;
3382
3383 if (closeto == LEFT)
3384 {
3385 selection.beg.row = pos.row;
3386 selection.beg.col = pos.col;
3387 selection.mark.row = selection.end.row;
3388 selection.mark.col = selection.end.col - (selection.clicks == 2);
3389 }
3390 else
3391 {
3392 selection.end.row = pos.row;
3393 selection.end.col = pos.col;
3022 selection.mark.row = selection.beg.row; 3394 selection.mark.row = selection.beg.row;
3023 selection.mark.col = selection.beg.col; 3395 selection.mark.col = selection.beg.col;
3396 }
3397 }
3398 else
3399 {
3400 /* button1 drag or button3 drag */
3401 if (ROWCOL_IS_AFTER (selection.mark, pos))
3402 {
3403 if (selection.mark.row == selection.end.row
3404 && selection.mark.col == selection.end.col
3405 && clickchange
3406 && selection.clicks == 2)
3407 selection.mark.col--;
3408
3409 selection.beg.row = pos.row;
3410 selection.beg.col = pos.col;
3411 selection.end.row = selection.mark.row;
3412 selection.end.col = selection.mark.col + (selection.clicks == 2);
3413 }
3414 else
3415 {
3416 selection.beg.row = selection.mark.row;
3417 selection.beg.col = selection.mark.col;
3418 selection.end.row = pos.row;
3419 selection.end.col = pos.col;
3420 }
3421 }
3422
3423 if (selection.clicks == 1)
3424 {
3425 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3426 && !ROW(selection.beg.row).is_longer ()
3427#if !ENABLE_MINIMAL
3428 && !selection.rect
3429#endif
3430 )
3431 selection.beg.col = ncol;
3432
3433 if (
3434 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3435 && !ROW(selection.end.row).is_longer ()
3436#if !ENABLE_MINIMAL
3437 && !selection.rect
3438#endif
3439 )
3440 selection.end.col = ncol;
3441 }
3442 else if (selection.clicks == 2)
3443 {
3444 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3445 selection.end.col--;
3446
3447 selection_delimit_word (UP, &selection.beg, &selection.beg);
3448 selection_delimit_word (DN, &selection.end, &selection.end);
3449 }
3450 else if (selection.clicks == 3)
3451 {
3452#if ENABLE_FRILLS
3453 if (option (Opt_tripleclickwords))
3454 {
3455 selection_delimit_word (UP, &selection.beg, &selection.beg);
3456
3457 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3458 {
3459 if (!ROW(end_row).is_longer ())
3460 {
3461 selection.end.row = end_row;
3462 selection.end.col = ROW(end_row).l;
3463# if !ENABLE_MINIMAL
3464 selection_remove_trailing_spaces ();
3465# endif
3466 break;
3024 } 3467 }
3025 } 3468 }
3026 if (ROWCOL_IS_BEFORE(pos, selection.mark)) {
3027 selection.end.row = selection.mark.row;
3028 selection.end.col = selection.mark.col + 1;
3029 selection.beg.row = pos.row;
3030 selection.beg.col = pos.col;
3031 } else {
3032 selection.beg.row = selection.mark.row;
3033 selection.beg.col = selection.mark.col;
3034 selection.end.row = pos.row;
3035 selection.end.col = pos.col + 1;
3036 } 3469 }
3037 } else if (selection.clicks == 2) { 3470 else
3038 selection_delimit_word (UP, &(selection.mark), 3471#endif
3039 &(selection.beg)); 3472 {
3040 selection_delimit_word (DN, &(selection.mark), 3473 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3041 &(selection.end)); 3474 selection.mark.col++;
3042 hate_those_clicks = 1; 3475
3043 } else if (selection.clicks == 3) {
3044 selection.beg.row = selection.end.row = selection.mark.row;
3045 selection.beg.col = 0; 3476 selection.beg.col = 0;
3046 selection.end.col = ncol; 3477 selection.end.col = ncol;
3047 hate_those_clicks = 1; 3478
3048 } 3479 // select a complete logical line
3049 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)); 3480 while (selection.beg.row > -saveLines
3050 return; 3481 && ROW(selection.beg.row - 1).is_longer ())
3051 } 3482 selection.beg.row--;
3052#endif /* ! NO_OLD_SELECTION */ 3483
3053#ifndef NO_NEW_SELECTION 3484 while (selection.end.row < nrow
3054/* selection_style must not be OLD_SELECT to get here */ 3485 && ROW(selection.end.row).is_longer ())
3055/* 3486 selection.end.row++;
3056 * This is mainly xterm style selection with a couple of differences, mainly
3057 * in the way button3 drag extension works.
3058 * We're either doing: button1 drag; button3 press; or button3 drag
3059 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3060 * is always at the left/right edge of the selection.
3061 * b) button3 press: extend/contract character/word/line at whichever edge of
3062 * the selection we are closest to.
3063 * c) button3 drag : extend/contract character/word/line - we select around
3064 * a point/word/line which is either the start or end of the selection
3065 * and it was decided by whichever point/word/line was `fixed' at the
3066 * time of the most recent button3 press
3067 */
3068 if (button3 && buttonpress) { /* button3 press */
3069 /* 3487 }
3070 * first determine which edge of the selection we are closest to 3488 }
3071 */ 3489
3072 if (ROWCOL_IS_BEFORE(pos, selection.beg) 3490 if (button3 && buttonpress)
3073 || (!ROWCOL_IS_AFTER(pos, selection.end) 3491 {
3074 && (((pos.col - selection.beg.col) 3492 /* mark may need to be changed */
3075 + ((pos.row - selection.beg.row) * ncol))
3076 < ((selection.end.col - pos.col)
3077 + ((selection.end.row - pos.row) * ncol)))))
3078 closeto = LEFT;
3079 if (closeto == LEFT) { 3493 if (closeto == LEFT)
3080 selection.beg.row = pos.row; 3494 {
3081 selection.beg.col = pos.col;
3082 selection.mark.row = selection.end.row; 3495 selection.mark.row = selection.end.row;
3083 selection.mark.col = selection.end.col 3496 selection.mark.col = selection.end.col - (selection.clicks == 2);
3084 - (selection.clicks == 2); 3497 }
3085 } else { 3498 else
3086 selection.end.row = pos.row; 3499 {
3087 selection.end.col = pos.col;
3088 selection.mark.row = selection.beg.row; 3500 selection.mark.row = selection.beg.row;
3089 selection.mark.col = selection.beg.col; 3501 selection.mark.col = selection.beg.col;
3090 }
3091 } else { /* button1 drag or button3 drag */
3092 if (ROWCOL_IS_AFTER(selection.mark, pos)) {
3093 if ((selection.mark.row == selection.end.row)
3094 && (selection.mark.col == selection.end.col)
3095 && clickchange && selection.clicks == 2)
3096 selection.mark.col--;
3097 selection.beg.row = pos.row;
3098 selection.beg.col = pos.col;
3099 selection.end.row = selection.mark.row;
3100 selection.end.col = selection.mark.col
3101 + (selection.clicks == 2);
3102 } else {
3103 selection.beg.row = selection.mark.row;
3104 selection.beg.col = selection.mark.col;
3105 selection.end.row = pos.row;
3106 selection.end.col = pos.col;
3107 }
3108 }
3109
3110 if (selection.clicks == 1) {
3111 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3112 if (end_col != -1 && selection.beg.col > end_col) {
3113#if 1
3114 selection.beg.col = ncol;
3115#else
3116 if (selection.beg.row != selection.end.row)
3117 selection.beg.col = ncol;
3118 else
3119 selection.beg.col = selection.mark.col;
3120#endif
3121 }
3122 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3123 if (end_col != -1 && selection.end.col > end_col)
3124 selection.end.col = ncol;
3125
3126 } else if (selection.clicks == 2) {
3127 if (ROWCOL_IS_AFTER(selection.end, selection.beg))
3128 selection.end.col--;
3129 selection_delimit_word (UP, &(selection.beg),
3130 &(selection.beg));
3131 selection_delimit_word (DN, &(selection.end),
3132 &(selection.end));
3133 } else if (selection.clicks == 3) {
3134#ifndef NO_FRILLS
3135 if ((Options & Opt_tripleclickwords)) {
3136 int end_row;
3137
3138 selection_delimit_word (UP, &(selection.beg),
3139 &(selection.beg));
3140 end_row = screen.tlen[selection.mark.row
3141 + TermWin.saveLines];
3142 for (end_row = selection.mark.row; end_row < TermWin.nrow;
3143 end_row++) {
3144 end_col = screen.tlen[end_row + TermWin.saveLines];
3145 if (end_col != -1) {
3146 selection.end.row = end_row;
3147 selection.end.col = end_col;
3148 selection_remove_trailing_spaces ();
3149 break;
3150 }
3151 }
3152 } else
3153#endif
3154 { 3502 }
3155 if (ROWCOL_IS_AFTER(selection.mark, selection.beg))
3156 selection.mark.col++;
3157 selection.beg.col = 0;
3158 selection.end.col = ncol;
3159 }
3160 } 3503 }
3161 if (button3 && buttonpress) { /* mark may need to be changed */
3162 if (closeto == LEFT) {
3163 selection.mark.row = selection.end.row;
3164 selection.mark.col = selection.end.col
3165 - (selection.clicks == 2);
3166 } else {
3167 selection.mark.row = selection.beg.row;
3168 selection.mark.col = selection.beg.col;
3169 }
3170 }
3171 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));
3172#endif /* ! NO_NEW_SELECTION */
3173}
3174 3504
3175#ifndef NO_FRILLS 3505#if !ENABLE_MINIMAL
3506 if (selection.rect && selection.beg.col > selection.end.col)
3507 ::swap (selection.beg.col, selection.end.col);
3508#endif
3509}
3510
3511#if !ENABLE_MINIMAL
3176void 3512void
3177rxvt_term::selection_remove_trailing_spaces () 3513rxvt_term::selection_remove_trailing_spaces () NOTHROW
3178{ 3514{
3179 int32_t end_col, end_row; 3515 int32_t end_col, end_row;
3180 text_t *stp; 3516 text_t *stp;
3181 3517
3182 end_col = selection.end.col; 3518 end_col = selection.end.col;
3183 end_row = selection.end.row; 3519 end_row = selection.end.row;
3520
3184 for ( ; end_row >= selection.beg.row; ) { 3521 for (; end_row >= selection.beg.row; )
3185 stp = screen.text[end_row + TermWin.saveLines]; 3522 {
3523 stp = ROW(end_row).t;
3524
3186 while (--end_col >= 0) { 3525 while (--end_col >= 0)
3187 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3188 break;
3189 } 3526 {
3190 if (end_col >= 0 3527 if (stp[end_col] != NOCHAR
3191 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) { 3528 && !unicode::is_space (stp[end_col]))
3192 selection.end.col = end_col + 1;
3193 selection.end.row = end_row;
3194 break; 3529 break;
3195 } 3530 }
3531
3532 if (end_col >= 0
3533 || !ROW(end_row - 1).is_longer ())
3534 {
3535 selection.end.col = end_col + 1;
3536 selection.end.row = end_row;
3537 break;
3538 }
3539
3196 end_row--; 3540 end_row--;
3197 end_col = TermWin.ncol; 3541 end_col = ncol;
3198 } 3542 }
3543
3199 if (selection.mark.row > selection.end.row) { 3544 if (selection.mark.row > selection.end.row)
3545 {
3200 selection.mark.row = selection.end.row; 3546 selection.mark.row = selection.end.row;
3201 selection.mark.col = selection.end.col; 3547 selection.mark.col = selection.end.col;
3548 }
3202 } else if (selection.mark.row == selection.end.row 3549 else if (selection.mark.row == selection.end.row
3203 && selection.mark.col > selection.end.col) 3550 && selection.mark.col > selection.end.col)
3204 selection.mark.col = selection.end.col; 3551 selection.mark.col = selection.end.col;
3205} 3552}
3206#endif 3553#endif
3207 3554
3208/* ------------------------------------------------------------------------- */ 3555/* ------------------------------------------------------------------------- */
3209/* 3556/*
3210 * Double click on button 3 when already selected 3557 * Double click on button 3 when already selected
3211 * EXT: button 3 double click 3558 * EXT: button 3 double click
3212 */ 3559 */
3213void 3560void
3214rxvt_term::selection_rotate (int x, int y) 3561rxvt_term::selection_rotate (int x, int y) NOTHROW
3215{ 3562{
3216 selection.clicks = selection.clicks % 3 + 1; 3563 selection.clicks = selection.clicks % 3 + 1;
3217 selection_extend_colrow (Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3564 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3218} 3565}
3219
3220/* ------------------------------------------------------------------------- */
3221/*
3222 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3223 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3224 * the X11 protocol.
3225 */
3226typedef CARD32 Atom32;
3227 3566
3228/* ------------------------------------------------------------------------- */ 3567/* ------------------------------------------------------------------------- */
3229/* 3568/*
3230 * Respond to a request for our current selection 3569 * Respond to a request for our current selection
3231 * EXT: SelectionRequest 3570 * EXT: SelectionRequest
3232 */ 3571 */
3233void 3572void
3234rxvt_term::selection_send (const XSelectionRequestEvent *rq) 3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3235{ 3574{
3236 XSelectionEvent ev; 3575 XSelectionEvent ev;
3237 XTextProperty ct;
3238 XICCEncodingStyle style;
3239 Atom target;
3240 3576
3241 ev.type = SelectionNotify; 3577 ev.type = SelectionNotify;
3242 ev.property = None; 3578 ev.property = None;
3243 ev.display = rq->display; 3579 ev.display = rq.display;
3244 ev.requestor = rq->requestor; 3580 ev.requestor = rq.requestor;
3245 ev.selection = rq->selection; 3581 ev.selection = rq.selection;
3246 ev.target = rq->target; 3582 ev.target = rq.target;
3247 ev.time = rq->time; 3583 ev.time = rq.time;
3248 3584
3249 if (rq->target == xa[XA_TARGETS]) { 3585 if (rq.target == xa[XA_TARGETS])
3586 {
3250 Atom32 target_list[5]; 3587 Atom target_list[6];
3251 Atom32 *target = target_list; 3588 Atom *target = target_list;
3252 3589
3253 *target++ = (Atom32) xa[XA_TARGETS]; 3590 *target++ = xa[XA_TARGETS];
3591 *target++ = xa[XA_TIMESTAMP];
3254 *target++ = (Atom32) XA_STRING; 3592 *target++ = XA_STRING;
3255 *target++ = (Atom32) xa[XA_TEXT]; 3593 *target++ = xa[XA_TEXT];
3256 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3594 *target++ = xa[XA_COMPOUND_TEXT];
3257#if X_HAVE_UTF8_STRING 3595#if X_HAVE_UTF8_STRING
3258 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3596 *target++ = xa[XA_UTF8_STRING];
3259#endif 3597#endif
3598
3260 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_ATOM, 3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3261 (8 * sizeof(target_list[0])), PropModeReplace, 3600 32, PropModeReplace,
3262 (unsigned char *)target_list, 3601 (unsigned char *)target_list, target - target_list);
3263 target - target_list);
3264 ev.property = rq->property; 3602 ev.property = rq.property;
3603 }
3604#if TODO // TODO
3265 } else if (rq->target == xa[XA_MULTIPLE]) { 3605 else if (rq.target == xa[XA_MULTIPLE])
3606 {
3266 /* TODO: Handle MULTIPLE */ 3607 /* TODO: Handle MULTIPLE */
3608 }
3609#endif
3267 } else if (rq->target == xa[XA_TIMESTAMP] && selection.text) { 3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3611 {
3268 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3269 (8 * sizeof(Time)), PropModeReplace,
3270 (unsigned char *)&selection_time, 1); 3613 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3271 ev.property = rq->property; 3614 ev.property = rq.property;
3615 }
3272 } else if (rq->target == XA_STRING 3616 else if (rq.target == XA_STRING
3273 || rq->target == xa[XA_TEXT] 3617 || rq.target == xa[XA_TEXT]
3274 || rq->target == xa[XA_COMPOUND_TEXT] 3618 || rq.target == xa[XA_COMPOUND_TEXT]
3275 || rq->target == xa[XA_UTF8_STRING] 3619 || rq.target == xa[XA_UTF8_STRING]
3276 ) { 3620 )
3621 {
3622 XTextProperty ct;
3623 Atom target = rq.target;
3277 short freect = 0; 3624 short freect = 0;
3278 int selectlen; 3625 int selectlen;
3279 char *cl; 3626 wchar_t *cl;
3627 enum {
3628 enc_string = XStringStyle,
3629 enc_text = XStdICCTextStyle,
3630 enc_compound_text = XCompoundTextStyle,
3631#ifdef X_HAVE_UTF8_STRING
3632 enc_utf8 = XUTF8StringStyle,
3633#else
3634 enc_utf8 = -1,
3635#endif
3636 } style;
3280 3637
3281 target = rq->target;
3282
3283 if (target == XA_STRING) 3638 if (target == XA_STRING)
3284 // we actually don't do XA_STRING, but who cares, as i18n clients 3639 // we actually don't do XA_STRING, but who cares, as i18n clients
3285 // will ask for another format anyways. 3640 // will ask for another format anyways.
3286 style = XStringStyle; 3641 style = enc_string;
3287 else if (target == xa[XA_TEXT]) 3642 else if (target == xa[XA_TEXT])
3288 style = XTextStyle; 3643 style = enc_text;
3289 else if (target == xa[XA_COMPOUND_TEXT]) 3644 else if (target == xa[XA_COMPOUND_TEXT])
3290 style = XCompoundTextStyle; 3645 style = enc_compound_text;
3291#if X_HAVE_UTF8_STRING 3646#if !ENABLE_MINIMAL
3292 else if (target == xa[XA_UTF8_STRING]) 3647 else if (target == xa[XA_UTF8_STRING])
3293 style = XUTF8StringStyle; 3648 style = enc_utf8;
3294#endif 3649#endif
3295 else 3650 else
3296 { 3651 {
3297 target = xa[XA_COMPOUND_TEXT]; 3652 target = xa[XA_COMPOUND_TEXT];
3298 style = XCompoundTextStyle; 3653 style = enc_compound_text;
3299 } 3654 }
3300 3655
3301 if (selection.text) { 3656 if (selection.text)
3657 {
3302 cl = (char *)selection.text; 3658 cl = selection.text;
3303 selectlen = selection.len; 3659 selectlen = selection.len;
3660 }
3304 } else { 3661 else
3662 {
3305 cl = ""; 3663 cl = L"";
3306 selectlen = 0; 3664 selectlen = 0;
3665 }
3666
3667#if !ENABLE_MINIMAL
3668 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3669 // so recode it manually
3670 if (style == enc_utf8)
3307 } 3671 {
3308
3309 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, style, &ct) >= 0)
3310 freect = 1; 3672 freect = 1;
3673 ct.encoding = target;
3674 ct.format = 8;
3675 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3676 ct.nitems = strlen ((char *)ct.value);
3677 }
3311 else 3678 else
3679#endif
3680 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3681 freect = 1;
3682 else
3312 { 3683 {
3313 /* if we failed to convert then send it raw */ 3684 /* if we failed to convert then send it raw */
3314 ct.value = (unsigned char *)cl; 3685 ct.value = (unsigned char *)cl;
3315 ct.nitems = selectlen; 3686 ct.nitems = selectlen;
3687 ct.encoding = target;
3316 } 3688 }
3317 3689
3318 XChangeProperty(Xdisplay, rq->requestor, rq->property, 3690 XChangeProperty (dpy, rq.requestor, rq.property,
3319 target, 8, PropModeReplace, 3691 ct.encoding, 8, PropModeReplace,
3320 ct.value, (int)ct.nitems); 3692 ct.value, (int)ct.nitems);
3321 ev.property = rq->property; 3693 ev.property = rq.property;
3322 3694
3323 if (freect) 3695 if (freect)
3324 XFree (ct.value); 3696 XFree (ct.value);
3325 } 3697 }
3698
3326 XSendEvent(Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3327}
3328
3329/* ------------------------------------------------------------------------- *
3330 * MOUSE ROUTINES *
3331 * ------------------------------------------------------------------------- */
3332
3333/*
3334 * return col/row values corresponding to x/y pixel values
3335 */
3336void
3337rxvt_term::pixel_position (int *x, int *y)
3338{
3339 *x = Pixel2Col(*x);
3340 /* MAX_IT(*x, 0); MIN_IT(*x, (int)TermWin.ncol - 1); */
3341 *y = Pixel2Row(*y);
3342 /* MAX_IT(*y, 0); MIN_IT(*y, (int)TermWin.nrow - 1); */
3343} 3700}
3344 3701
3345/* ------------------------------------------------------------------------- */ 3702/* ------------------------------------------------------------------------- */
3346#ifdef USE_XIM 3703#ifdef USE_XIM
3347void 3704void
3348rxvt_term::set_position (XPoint *pos) 3705rxvt_term::im_set_position (XPoint &pos) NOTHROW
3349{ 3706{
3350 XWindowAttributes xwa; 3707 XWindowAttributes xwa;
3351 3708
3352 XGetWindowAttributes (Xdisplay, TermWin.vt, &xwa); 3709 XGetWindowAttributes (dpy, vt, &xwa);
3710
3353 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3711 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3354 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3712 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3355} 3713}
3356
3357#endif 3714#endif
3358/* ------------------------------------------------------------------------- */ 3715
3359 3716#if ENABLE_OVERLAY
3717void
3718rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3719{
3720 if (nrow < 1 || ncol < 1)
3721 return;
3722
3723 want_refresh = 1;
3724
3725 scr_overlay_off ();
3726
3727 if (x < 0) x = ncol - w;
3728 if (y < 0) y = nrow - h;
3729
3730 // make space for border
3731 w += 2; min_it (w, ncol);
3732 h += 2; min_it (h, nrow);
3733
3734 x -= 1; clamp_it (x, 0, ncol - w);
3735 y -= 1; clamp_it (y, 0, nrow - h);
3736
3737 ov.x = x; ov.y = y;
3738 ov.w = w; ov.h = h;
3739
3740 ov.text = new text_t *[h];
3741 ov.rend = new rend_t *[h];
3742
3743 for (y = 0; y < h; y++)
3744 {
3745 text_t *tp = ov.text[y] = new text_t[w];
3746 rend_t *rp = ov.rend[y] = new rend_t[w];
3747
3748 text_t t0, t1, t2;
3749 rend_t r = OVERLAY_RSTYLE;
3750
3751 if (y == 0)
3752 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3753 else if (y < h - 1)
3754 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3755 else
3756 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3757
3758 *tp++ = t0;
3759 *rp++ = r;
3760
3761 for (x = w - 2; x > 0; --x)
3762 {
3763 *tp++ = t1;
3764 *rp++ = r;
3765 }
3766
3767 *tp = t2;
3768 *rp = r;
3769 }
3770}
3771
3772void
3773rxvt_term::scr_overlay_off () NOTHROW
3774{
3775 if (!ov.text)
3776 return;
3777
3778 want_refresh = 1;
3779
3780 for (int y = 0; y < ov.h; y++)
3781 {
3782 delete [] ov.text[y];
3783 delete [] ov.rend[y];
3784 }
3785
3786 delete [] ov.text; ov.text = 0;
3787 delete [] ov.rend; ov.rend = 0;
3788}
3789
3790void
3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3792{
3793 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3794 return;
3795
3796 x++, y++;
3797
3798 ov.text[y][x] = text;
3799 ov.rend[y][x] = rend;
3800}
3801
3802void
3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3804{
3805 while (*s)
3806 scr_overlay_set (x++, y, *s++);
3807}
3808
3809void
3810rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3811{
3812 while (*s)
3813 {
3814 text_t t = *s++;
3815 int width = WCWIDTH (t);
3816
3817 while (width--)
3818 {
3819 scr_overlay_set (x++, y, t);
3820 t = NOCHAR;
3821 }
3822 }
3823}
3824
3825void
3826rxvt_term::scr_swap_overlay () NOTHROW
3827{
3828 if (!ov.text)
3829 return;
3830
3831 // hide cursor if it is within the overlay area
3832 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3833 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3834 screen.flags &= ~Screen_VisibleCursor;
3835
3836 // swap screen mem with overlay
3837 for (int y = ov.h; y--; )
3838 {
3839 text_t *t1 = ov.text[y];
3840 rend_t *r1 = ov.rend[y];
3841
3842 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3843 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3844
3845 for (int x = ov.w; x--; )
3846 {
3847 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3848 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3849 }
3850 }
3851}
3852
3853#endif
3360/* ------------------------------------------------------------------------- * 3854/* ------------------------------------------------------------------------- */
3361 * DEBUG ROUTINES *
3362 * ------------------------------------------------------------------------- */
3363#if 0
3364void
3365rxvt_debug_colors(void)
3366{
3367 int color;
3368 const char *name[] = {
3369 "fg", "bg",
3370 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3371 };
3372 3855
3373 fprintf(stderr, "Color ( ");
3374 if (rstyle & RS_RVid)
3375 fprintf(stderr, "rvid ");
3376 if (rstyle & RS_Bold)
3377 fprintf(stderr, "bold ");
3378 if (rstyle & RS_Blink)
3379 fprintf(stderr, "blink ");
3380 if (rstyle & RS_Uline)
3381 fprintf(stderr, "uline ");
3382 fprintf(stderr, "): ");
3383
3384 color = GET_FGCOLOR(rstyle);
3385#ifndef NO_BRIGHTCOLOR
3386 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3387 color -= (minBrightCOLOR - minCOLOR);
3388 fprintf(stderr, "bright ");
3389 }
3390#endif
3391 fprintf(stderr, "%s on ", name[color]);
3392
3393 color = GET_BGCOLOR(rstyle);
3394#ifndef NO_BRIGHTCOLOR
3395 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3396 color -= (minBrightCOLOR - minCOLOR);
3397 fprintf(stderr, "bright ");
3398 }
3399#endif
3400 fprintf(stderr, "%s\n", name[color]);
3401}
3402#endif

Diff Legend

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