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.14 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.192 by root, Thu Dec 22 19:25:58 2005 UTC

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

Diff Legend

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