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

Diff Legend

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