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.14 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC

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

Diff Legend

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