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

Diff Legend

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