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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.20 by pcg, Fri Jan 30 15:58:07 2004 UTC vs.
Revision 1.129 by root, Wed Aug 25 03:52:09 2004 UTC

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

Diff Legend

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