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

Diff Legend

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