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.20 by pcg, Fri Jan 30 15:58:07 2004 UTC vs.
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC

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

Diff Legend

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