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

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

Diff Legend

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