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.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.190 by root, Thu Dec 22 15:52:57 2005 UTC

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

Diff Legend

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