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

Diff Legend

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