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.12 by pcg, Thu Dec 18 14:11:47 2003 UTC vs.
Revision 1.212 by root, Fri Jan 6 05:37:59 2006 UTC

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

Diff Legend

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