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.13 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.243 by ayin, Thu Jan 19 23:15:21 2006 UTC

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

Diff Legend

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