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.23 by pcg, Sat Jan 31 02:31:17 2004 UTC vs.
Revision 1.41 by pcg, Sun Feb 29 15:31:56 2004 UTC

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

Diff Legend

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