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.13 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.74 by pcg, Sun May 9 18:19:49 2004 UTC

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

Diff Legend

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