ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 2006 UTC

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

Diff Legend

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