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.31 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.186 by root, Wed Dec 21 19:50:17 2005 UTC

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

Diff Legend

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