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

Diff Legend

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