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.34 by pcg, Tue Feb 24 00:44:23 2004 UTC vs.
Revision 1.188 by root, Thu Dec 22 00:07:47 2005 UTC

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

Diff Legend

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