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

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

Diff Legend

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