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.26 by pcg, Sun Feb 1 20:12:53 2004 UTC vs.
Revision 1.71 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

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