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.16 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.141 by root, Wed Dec 1 02:12:18 2004 UTC

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

Diff Legend

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