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

Diff Legend

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