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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines