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.19 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC

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

Diff Legend

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