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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC

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

Diff Legend

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