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

Diff Legend

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