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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.19 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC

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

Diff Legend

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