ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.23 by pcg, Sat Jan 31 02:31:17 2004 UTC vs.
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC

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

Diff Legend

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