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

Diff Legend

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