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.27 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.57 by pcg, Sun Mar 14 17:33:08 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
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 (display->display, 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 (display->display, 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 (display->display, 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;
442#ifdef DEBUG_STRICT 444#ifdef DEBUG_STRICT
443 for (i = 0; i < total_rows; i++) 445 for (i = 0; i < total_rows; i++)
444 { 446 {
445 if (screen.text[i]) 447 if (screen.text[i])
446 /* then so is screen.rend[i] */ 448 /* then so is screen.rend[i] */
447 assert(screen.rend[i]); 449 assert (screen.rend[i]);
448 } 450 }
449#endif 451#endif
450 452
451 delete talloc; talloc = 0; 453 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 454 delete ralloc; ralloc = 0;
477 * Hard reset 479 * Hard reset
478 */ 480 */
479void 481void
480rxvt_term::scr_poweron () 482rxvt_term::scr_poweron ()
481{ 483{
482 D_SCREEN((stderr, "rxvt_scr_poweron()")); 484 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
483 485
484 scr_release (); 486 scr_release ();
485 prev_nrow = prev_ncol = 0; 487 prev_nrow = prev_ncol = 0;
486 scr_reset (); 488 scr_reset ();
487 489
488 scr_clear (); 490 scr_clear ();
489 scr_refresh (SLOW_REFRESH); 491 scr_refresh (SLOW_REFRESH);
490#ifdef RXVT_GRAPHICS
491 Gr_reset ();
492#endif
493} 492}
494 493
495/* ------------------------------------------------------------------------- * 494/* ------------------------------------------------------------------------- *
496 * PROCESS SCREEN COMMANDS * 495 * PROCESS SCREEN COMMANDS *
497 * ------------------------------------------------------------------------- */ 496 * ------------------------------------------------------------------------- */
503void 502void
504rxvt_term::scr_cursor (int mode) 503rxvt_term::scr_cursor (int mode)
505{ 504{
506 screen_t *s; 505 screen_t *s;
507 506
508 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); 507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
509 508
510#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
511 if (current_screen == SECONDARY) 510 if (current_screen == SECONDARY)
512 s = &(swap); 511 s = & (swap);
513 else 512 else
514#endif 513#endif
515 s = &(screen); 514 s = & (screen);
516 switch (mode) 515 switch (mode)
517 { 516 {
518 case SAVE: 517 case SAVE:
519 s->s_cur.row = s->cur.row; 518 s->s_cur.row = s->cur.row;
520 s->s_cur.col = s->cur.col; 519 s->s_cur.col = s->cur.col;
532 charsets[s->charset] = s->s_charset_char; 531 charsets[s->charset] = s->s_charset_char;
533 set_font_style (); 532 set_font_style ();
534 break; 533 break;
535 } 534 }
536 /* boundary check in case screen size changed between SAVE and RESTORE */ 535 /* boundary check in case screen size changed between SAVE and RESTORE */
537 MIN_IT(s->cur.row, TermWin.nrow - 1); 536 MIN_IT (s->cur.row, TermWin.nrow - 1);
538 MIN_IT(s->cur.col, TermWin.ncol - 1); 537 MIN_IT (s->cur.col, TermWin.ncol - 1);
539#ifdef DEBUG_STRICT 538#ifdef DEBUG_STRICT
540 assert(s->cur.row >= 0); 539 assert (s->cur.row >= 0);
541 assert(s->cur.col >= 0); 540 assert (s->cur.col >= 0);
542#else /* drive with your eyes closed */ 541#else /* drive with your eyes closed */
543 MAX_IT(s->cur.row, 0); 542 MAX_IT (s->cur.row, 0);
544 MAX_IT(s->cur.col, 0); 543 MAX_IT (s->cur.col, 0);
545#endif 544#endif
546} 545}
547 546
548/* ------------------------------------------------------------------------- */ 547/* ------------------------------------------------------------------------- */
549/* 548/*
559 int offset; 558 int offset;
560#endif 559#endif
561 560
562 want_refresh = 1; 561 want_refresh = 1;
563 562
564 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); 563 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
565 564
566 TermWin.view_start = 0; 565 TermWin.view_start = 0;
567 566
568 if (current_screen == scrn) 567 if (current_screen == scrn)
569 return current_screen; 568 return current_screen;
570 569
571 selection_check (2); /* check for boundary cross */ 570 selection_check (2); /* check for boundary cross */
572 571
573 SWAP_IT(current_screen, scrn, int); 572 SWAP_IT (current_screen, scrn, int);
574#if NSCREENS 573#if NSCREENS
575 num_scr = 0; 574 num_scr = 0;
576 offset = TermWin.saveLines; 575 offset = TermWin.saveLines;
577 for (i = prev_nrow; i--;) 576 for (i = prev_nrow; i--;)
578 { 577 {
579 SWAP_IT(screen.text[i + offset], swap.text[i], text_t *); 578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
580 SWAP_IT(screen.tlen[i + offset], swap.tlen[i], int16_t); 579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
581 SWAP_IT(screen.rend[i + offset], swap.rend[i], rend_t *); 580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
582 } 581 }
583 SWAP_IT(screen.cur.row, swap.cur.row, int16_t); 582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
584 SWAP_IT(screen.cur.col, swap.cur.col, int16_t); 583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
585# ifdef DEBUG_STRICT 584# ifdef DEBUG_STRICT
586 assert((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
587 assert((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
588# else /* drive with your eyes closed */ 587# else /* drive with your eyes closed */
589 MAX_IT(screen.cur.row, 0); 588 MAX_IT (screen.cur.row, 0);
590 MIN_IT(screen.cur.row, (int32_t)prev_nrow - 1); 589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
591 MAX_IT(screen.cur.col, 0); 590 MAX_IT (screen.cur.col, 0);
592 MIN_IT(screen.cur.col, (int32_t)prev_ncol - 1); 591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
593# endif 592# endif
594 SWAP_IT(screen.charset, swap.charset, int16_t); 593 SWAP_IT (screen.charset, swap.charset, int16_t);
595 SWAP_IT(screen.flags, swap.flags, int); 594 SWAP_IT (screen.flags, swap.flags, int);
596 screen.flags |= Screen_VisibleCursor; 595 screen.flags |= Screen_VisibleCursor;
597 swap.flags |= Screen_VisibleCursor; 596 swap.flags |= Screen_VisibleCursor;
598
599# ifdef RXVT_GRAPHICS
600
601 if (Gr_Displayed ())
602 {
603 Gr_scroll (0);
604 Gr_ChangeScreen ();
605 }
606# endif
607#else 597#else
608# ifdef SCROLL_ON_NO_SECONDARY 598# ifdef SCROLL_ON_NO_SECONDARY
609# ifdef RXVT_GRAPHICS
610 if (Gr_Displayed ())
611 Gr_ClearScreen ();
612# endif
613 if (current_screen == PRIMARY 599 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); 600 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
619# endif 601# endif
620#endif 602#endif
621 return scrn; 603 return scrn;
622} 604}
623 605
628void 610void
629rxvt_term::scr_color (unsigned int color, int fgbg) 611rxvt_term::scr_color (unsigned int color, int fgbg)
630{ 612{
631 color &= RS_fgMask; 613 color &= RS_fgMask;
632 if (fgbg == Color_fg) 614 if (fgbg == Color_fg)
633 rstyle = SET_FGCOLOR(rstyle, color); 615 rstyle = SET_FGCOLOR (rstyle, color);
634 else 616 else
635 rstyle = SET_BGCOLOR(rstyle, color); 617 rstyle = SET_BGCOLOR (rstyle, color);
636} 618}
637 619
638/* ------------------------------------------------------------------------- */ 620/* ------------------------------------------------------------------------- */
639/* 621/*
640 * Change the rendition style for following text 622 * Change the rendition style for following text
665 647
666 if (count == 0 || (row1 > row2)) 648 if (count == 0 || (row1 > row2))
667 return 0; 649 return 0;
668 650
669 want_refresh = 1; 651 want_refresh = 1;
670 D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 652 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
671 653
672 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 654 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY))
673 { 655 {
674 nscrolled = (long)TermWin.nscrolled + (long)count; 656 nscrolled = (long)TermWin.nscrolled + (long)count;
675 657
718 700
719 if (count < 0) 701 if (count < 0)
720 count = -count; 702 count = -count;
721 703
722 i = row2 - row1 + 1; 704 i = row2 - row1 + 1;
723 MIN_IT(count, i); 705 MIN_IT (count, i);
724 706
725 if (j > 0) 707 if (j > 0)
726 { 708 {
727 /* A: scroll up */ 709 /* A: scroll up */
728 710
772 if (!spec) /* line length may not equal TermWin.ncol */ 754 if (!spec) /* line length may not equal TermWin.ncol */
773 scr_blank_screen_mem (screen.text, screen.rend, 755 scr_blank_screen_mem (screen.text, screen.rend,
774 (unsigned int)j, rstyle); 756 (unsigned int)j, rstyle);
775 } 757 }
776 758
777#ifdef RXVT_GRAPHICS
778 if (Gr_Displayed ())
779 Gr_scroll (count);
780#endif
781
782 return count; 759 return count;
783} 760}
784 761
785/* ------------------------------------------------------------------------- */ 762/* ------------------------------------------------------------------------- */
786/* 763/*
787 * Add text given in <str> of length <len> to screen struct 764 * Add text given in <str> of length <len> to screen struct
788 */ 765 */
789void 766void
790rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len)
791{ 768{
792 unsigned char checksel, clearsel; 769 unsigned char checksel, clearsel;
793 uint32_t c; 770 uint32_t c;
794 int i, row, last_col; 771 int i, row, last_col;
795 text_t *stp; 772 text_t *stp;
796 rend_t *srp; 773 rend_t *srp;
797 774
798 if (len <= 0) /* sanity */ 775 if (len <= 0) /* sanity */
799 return; 776 return;
800 777
801 want_refresh = 1; 778 want_refresh = 1;
802 last_col = TermWin.ncol; 779 last_col = TermWin.ncol;
803 780
804 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); 781 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
805 ZERO_SCROLLBACK(); 782 ZERO_SCROLLBACK ();
806 if (nlines > 0) 783 if (nlines > 0)
807 { 784 {
808 nlines += (screen.cur.row - screen.bscroll); 785 nlines += (screen.cur.row - screen.bscroll);
809 if ((nlines > 0) 786 if ((nlines > 0)
810 && (screen.tscroll == 0) 787 && (screen.tscroll == 0)
811 && (screen.bscroll == (TermWin.nrow - 1))) 788 && (screen.bscroll == (TermWin.nrow - 1)))
812 { 789 {
813 /* _at least_ this many lines need to be scrolled */ 790 /* _at least_ this many lines need to be scrolled */
814 scr_scroll_text(screen.tscroll, screen.bscroll, nlines, 0); 791 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
815 screen.cur.row -= nlines; 792 screen.cur.row -= nlines;
816 } 793 }
817 } 794 }
818#ifdef DEBUG_STRICT 795#ifdef DEBUG_STRICT
819 assert(screen.cur.col < last_col); 796 assert (screen.cur.col < last_col);
820 assert((screen.cur.row < TermWin.nrow) 797 assert ((screen.cur.row < TermWin.nrow)
821 && (screen.cur.row >= -(int32_t)TermWin.nscrolled)); 798 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
822#else /* drive with your eyes closed */ 799#else /* drive with your eyes closed */
823 MIN_IT(screen.cur.col, last_col - 1); 800 MIN_IT (screen.cur.col, last_col - 1);
824 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
825 MAX_IT(screen.cur.row, -(int32_t)TermWin.nscrolled); 802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
826#endif 803#endif
827 row = screen.cur.row + TermWin.saveLines; 804 row = screen.cur.row + TermWin.saveLines;
828 805
829 checksel = (selection.op 806 checksel = (selection.op
830 && current_screen == selection.screen) ? 1 : 0; 807 && current_screen == selection.screen) ? 1 : 0;
841 case '\t': 818 case '\t':
842 scr_tab (1); 819 scr_tab (1);
843 continue; 820 continue;
844 case '\n': 821 case '\n':
845 if (screen.tlen[row] != -1) /* XXX: think about this */ 822 if (screen.tlen[row] != -1) /* XXX: think about this */
846 MAX_IT(screen.tlen[row], screen.cur.col); 823 MAX_IT (screen.tlen[row], screen.cur.col);
847 screen.flags &= ~Screen_WrapNext; 824 screen.flags &= ~Screen_WrapNext;
848 if (screen.cur.row == screen.bscroll) 825 if (screen.cur.row == screen.bscroll)
849 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
850 else if (screen.cur.row < (TermWin.nrow - 1)) 827 else if (screen.cur.row < (TermWin.nrow - 1))
851 row = (++screen.cur.row) + TermWin.saveLines; 828 row = (++screen.cur.row) + TermWin.saveLines;
852 stp = screen.text[row]; /* _must_ refresh */ 829 stp = screen.text[row]; /* _must_ refresh */
853 srp = screen.rend[row]; /* _must_ refresh */ 830 srp = screen.rend[row]; /* _must_ refresh */
854 continue; 831 continue;
855 case '\r': 832 case '\r':
856 if (screen.tlen[row] != -1) /* XXX: think about this */ 833 if (screen.tlen[row] != -1) /* XXX: think about this */
857 MAX_IT(screen.tlen[row], screen.cur.col); 834 MAX_IT (screen.tlen[row], screen.cur.col);
858 screen.flags &= ~Screen_WrapNext; 835 screen.flags &= ~Screen_WrapNext;
859 screen.cur.col = 0; 836 screen.cur.col = 0;
860 continue; 837 continue;
861 default: 838 default:
862 if (c == 127) 839 if (c == 127)
863 continue; /* yummmm..... */ 840 continue; /* yummmm..... */
864 break; 841 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);
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);
888 873
889 if (charsets[screen.charset] == '0') // DEC SPECIAL 874 if (charsets[screen.charset] == '0') // DEC SPECIAL
890 switch (c) 875 switch (c)
891 { 876 {
892 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 877 // vt100 special graphics and line drawing
893 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 878 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
894 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 879 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
895 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
896 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 880 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
881 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
897 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 882 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break;
898 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; 883 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
899 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; 884 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
900 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; 885 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
901 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 886 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
887 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
902 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 888 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
903 } 889 }
904 890
905 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
906 // rely on wcwidth to tell us the character width, at least for non-ascii
907 int width = c <= 128 ? 1 : wcwidth (c);
908
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 uint32_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/*
983void 1016void
984rxvt_term::scr_tab (int count) 1017rxvt_term::scr_tab (int count)
985{ 1018{
986 int i, x; 1019 int i, x;
987 1020
988 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); 1021 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
989 want_refresh = 1; 1022 want_refresh = 1;
990 i = x = screen.cur.col; 1023 i = x = screen.cur.col;
991 if (count == 0) 1024 if (count == 0)
992 return; 1025 return;
993 else if (count > 0) 1026 else if (count > 0)
1074 */ 1107 */
1075void 1108void
1076rxvt_term::scr_gotorc (int row, int col, int relative) 1109rxvt_term::scr_gotorc (int row, int col, int relative)
1077{ 1110{
1078 want_refresh = 1; 1111 want_refresh = 1;
1079 ZERO_SCROLLBACK(); 1112 ZERO_SCROLLBACK ();
1080#ifdef RXVT_GRAPHICS
1081 if (Gr_Displayed ())
1082 Gr_scroll (0);
1083#endif
1084 1113
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)); 1114 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 1115
1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1116 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col)
1088 : col); 1117 : col);
1089 MAX_IT(screen.cur.col, 0); 1118 MAX_IT (screen.cur.col, 0);
1090 MIN_IT(screen.cur.col, (int32_t)TermWin.ncol - 1); 1119 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1091 1120
1092 screen.flags &= ~Screen_WrapNext; 1121 screen.flags &= ~Screen_WrapNext;
1093 if (relative & R_RELATIVE) 1122 if (relative & R_RELATIVE)
1094 { 1123 {
1095 if (row > 0) 1124 if (row > 0)
1112 else 1141 else
1113 { 1142 {
1114 if (screen.flags & Screen_Relative) 1143 if (screen.flags & Screen_Relative)
1115 { /* relative origin mode */ 1144 { /* relative origin mode */
1116 screen.cur.row = row + screen.tscroll; 1145 screen.cur.row = row + screen.tscroll;
1117 MIN_IT(screen.cur.row, screen.bscroll); 1146 MIN_IT (screen.cur.row, screen.bscroll);
1118 } 1147 }
1119 else 1148 else
1120 screen.cur.row = row; 1149 screen.cur.row = row;
1121 } 1150 }
1122 MAX_IT(screen.cur.row, 0); 1151 MAX_IT (screen.cur.row, 0);
1123 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1152 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1153
1154 while (screen.cur.col > 0
1155 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1156 screen.cur.col--;
1124} 1157}
1125 1158
1126/* ------------------------------------------------------------------------- */ 1159/* ------------------------------------------------------------------------- */
1127/* 1160/*
1128 * direction should be UP or DN 1161 * direction should be UP or DN
1132{ 1165{
1133 int dirn; 1166 int dirn;
1134 1167
1135 want_refresh = 1; 1168 want_refresh = 1;
1136 dirn = ((direction == UP) ? 1 : -1); 1169 dirn = ((direction == UP) ? 1 : -1);
1137 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); 1170 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1138 1171
1139 ZERO_SCROLLBACK(); 1172 ZERO_SCROLLBACK ();
1140
1141#ifdef RXVT_GRAPHICS
1142 if (Gr_Displayed ())
1143 Gr_scroll (0);
1144#endif
1145 1173
1146 screen.flags &= ~Screen_WrapNext; 1174 screen.flags &= ~Screen_WrapNext;
1147 if ((screen.cur.row == screen.bscroll && direction == UP) 1175 if ((screen.cur.row == screen.bscroll && direction == UP)
1148 || (screen.cur.row == screen.tscroll && direction == DN)) 1176 || (screen.cur.row == screen.tscroll && direction == DN))
1149 scr_scroll_text(screen.tscroll, screen.bscroll, dirn, 0); 1177 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1150 else 1178 else
1151 screen.cur.row += dirn; 1179 screen.cur.row += dirn;
1152 MAX_IT(screen.cur.row, 0); 1180 MAX_IT (screen.cur.row, 0);
1153 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1181 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1154 selection_check (0); 1182 selection_check (0);
1155} 1183}
1156 1184
1157/* ------------------------------------------------------------------------- */ 1185/* ------------------------------------------------------------------------- */
1158/* 1186/*
1165rxvt_term::scr_erase_line (int mode) 1193rxvt_term::scr_erase_line (int mode)
1166{ 1194{
1167 unsigned int row, col, num; 1195 unsigned int row, col, num;
1168 1196
1169 want_refresh = 1; 1197 want_refresh = 1;
1170 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, screen.cur.row)); 1198 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1171 ZERO_SCROLLBACK (); 1199 ZERO_SCROLLBACK ();
1172
1173#ifdef RXVT_GRAPHICS
1174 if (Gr_Displayed ())
1175 Gr_scroll (0);
1176#endif
1177 1200
1178 selection_check (1); 1201 selection_check (1);
1179 1202
1180 screen.flags &= ~Screen_WrapNext; 1203 screen.flags &= ~Screen_WrapNext;
1181 1204
1183 switch (mode) 1206 switch (mode)
1184 { 1207 {
1185 case 0: /* erase to end of line */ 1208 case 0: /* erase to end of line */
1186 col = screen.cur.col; 1209 col = screen.cur.col;
1187 num = TermWin.ncol - col; 1210 num = TermWin.ncol - col;
1188 MIN_IT(screen.tlen[row], (int16_t)col); 1211 MIN_IT (screen.tlen[row], (int16_t)col);
1189 if (ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur) 1212 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1190 || ROWCOL_IN_ROW_AT_OR_AFTER(selection.end, screen.cur)) 1213 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1191 CLEAR_SELECTION(); 1214 CLEAR_SELECTION ();
1192 break; 1215 break;
1193 case 1: /* erase to beginning of line */ 1216 case 1: /* erase to beginning of line */
1194 col = 0; 1217 col = 0;
1195 num = screen.cur.col + 1; 1218 num = screen.cur.col + 1;
1196 if (ROWCOL_IN_ROW_AT_OR_BEFORE(selection.beg, screen.cur) 1219 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1197 || ROWCOL_IN_ROW_AT_OR_BEFORE(selection.end, screen.cur)) 1220 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1198 CLEAR_SELECTION(); 1221 CLEAR_SELECTION ();
1199 break; 1222 break;
1200 case 2: /* erase whole line */ 1223 case 2: /* erase whole line */
1201 col = 0; 1224 col = 0;
1202 num = TermWin.ncol; 1225 num = TermWin.ncol;
1203 screen.tlen[row] = 0; 1226 screen.tlen[row] = 0;
1204 if (selection.beg.row <= screen.cur.row 1227 if (selection.beg.row <= screen.cur.row
1205 && selection.end.row >= screen.cur.row) 1228 && selection.end.row >= screen.cur.row)
1206 CLEAR_SELECTION(); 1229 CLEAR_SELECTION ();
1207 break; 1230 break;
1208 default: 1231 default:
1209 return; 1232 return;
1210 } 1233 }
1211 1234
1212 if (screen.text[row]) 1235 if (screen.text[row])
1213 scr_blank_line (&(screen.text[row][col]), 1236 scr_blank_line (& (screen.text[row][col]),
1214 &(screen.rend[row][col]), num, rstyle); 1237 & (screen.rend[row][col]), num, rstyle);
1215 else 1238 else
1216 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1239 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1217} 1240}
1218 1241
1219/* ------------------------------------------------------------------------- */ 1242/* ------------------------------------------------------------------------- */
1230 int32_t row, row_offset; 1253 int32_t row, row_offset;
1231 rend_t ren; 1254 rend_t ren;
1232 XGCValues gcvalue; 1255 XGCValues gcvalue;
1233 1256
1234 want_refresh = 1; 1257 want_refresh = 1;
1235 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row)); 1258 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1236 ZERO_SCROLLBACK (); 1259 ZERO_SCROLLBACK ();
1237 row_offset = (int32_t)TermWin.saveLines; 1260 row_offset = (int32_t)TermWin.saveLines;
1238 1261
1239 switch (mode) 1262 switch (mode)
1240 { 1263 {
1250 row = 0; 1273 row = 0;
1251 num = screen.cur.row; 1274 num = screen.cur.row;
1252 break; 1275 break;
1253 case 2: /* erase whole screen */ 1276 case 2: /* erase whole screen */
1254 selection_check (3); 1277 selection_check (3);
1255#ifdef RXVT_GRAPHICS
1256 Gr_ClearScreen ();
1257#endif
1258 row = 0; 1278 row = 0;
1259 num = TermWin.nrow; 1279 num = TermWin.nrow;
1260 break; 1280 break;
1261 default: 1281 default:
1262 return; 1282 return;
1267 || (selection.end.row >= row 1287 || (selection.end.row >= row
1268 && selection.end.row <= row + num))) 1288 && selection.end.row <= row + num)))
1269 CLEAR_SELECTION (); 1289 CLEAR_SELECTION ();
1270 if (row >= TermWin.nrow) /* Out Of Bounds */ 1290 if (row >= TermWin.nrow) /* Out Of Bounds */
1271 return; 1291 return;
1272 MIN_IT(num, (TermWin.nrow - row)); 1292 MIN_IT (num, (TermWin.nrow - row));
1273 if (rstyle & (RS_RVid | RS_Uline)) 1293 if (rstyle & (RS_RVid | RS_Uline))
1274 ren = (rend_t) ~RS_None; 1294 ren = (rend_t) ~RS_None;
1275 else if (GET_BASEBG(rstyle) == Color_bg) 1295 else if (GET_BASEBG (rstyle) == Color_bg)
1276 { 1296 {
1277 ren = DEFAULT_RSTYLE; 1297 ren = DEFAULT_RSTYLE;
1278 CLEAR_ROWS(row, num); 1298 CLEAR_ROWS (row, num);
1279 } 1299 }
1280 else 1300 else
1281 { 1301 {
1282 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1302 ren = (rstyle & (RS_fgMask | RS_bgMask));
1283 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; 1303 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)];
1284 XChangeGC(display->display, TermWin.gc, GCForeground, &gcvalue); 1304 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1285 ERASE_ROWS(row, num); 1305 ERASE_ROWS (row, num);
1286 gcvalue.foreground = PixColors[Color_fg]; 1306 gcvalue.foreground = PixColors[Color_fg];
1287 XChangeGC(display->display, TermWin.gc, GCForeground, &gcvalue); 1307 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1288 } 1308 }
1289 for (; num--; row++) 1309 for (; num--; row++)
1290 { 1310 {
1291 scr_blank_screen_mem (screen.text, screen.rend, 1311 scr_blank_screen_mem (screen.text, screen.rend,
1292 (unsigned int)(row + row_offset), rstyle); 1312 (unsigned int) (row + row_offset), rstyle);
1293 screen.tlen[row + row_offset] = 0; 1313 screen.tlen[row + row_offset] = 0;
1294 scr_blank_line (drawn_text[row], drawn_rend[row], 1314 scr_blank_line (drawn_text[row], drawn_rend[row],
1295 (unsigned int)TermWin.ncol, ren); 1315 (unsigned int)TermWin.ncol, ren);
1296 } 1316 }
1297} 1317}
1307 int i, j, k; 1327 int i, j, k;
1308 rend_t *r1, fs; 1328 rend_t *r1, fs;
1309 1329
1310 want_refresh = 1; 1330 want_refresh = 1;
1311 num_scr_allow = 0; 1331 num_scr_allow = 0;
1312 ZERO_SCROLLBACK(); 1332 ZERO_SCROLLBACK ();
1313 selection_check (3); 1333 selection_check (3);
1314 1334
1315 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1335 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1316 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1336 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1317 { 1337 {
1329void 1349void
1330rxvt_term::scr_insdel_lines (int count, int insdel) 1350rxvt_term::scr_insdel_lines (int count, int insdel)
1331{ 1351{
1332 int end; 1352 int end;
1333 1353
1334 ZERO_SCROLLBACK(); 1354 ZERO_SCROLLBACK ();
1335
1336#ifdef RXVT_GRAPHICS
1337 if (Gr_Displayed ())
1338 Gr_scroll (0);
1339#endif
1340 1355
1341 selection_check (1); 1356 selection_check (1);
1342 1357
1343 if (screen.cur.row > screen.bscroll) 1358 if (screen.cur.row > screen.bscroll)
1344 return; 1359 return;
1351 else if (insdel == INSERT) 1366 else if (insdel == INSERT)
1352 count = end; 1367 count = end;
1353 } 1368 }
1354 screen.flags &= ~Screen_WrapNext; 1369 screen.flags &= ~Screen_WrapNext;
1355 1370
1356 scr_scroll_text(screen.cur.row, screen.bscroll, insdel * count, 0); 1371 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1357} 1372}
1358 1373
1359/* ------------------------------------------------------------------------- */ 1374/* ------------------------------------------------------------------------- */
1360/* 1375/*
1361 * Insert/Delete <count> characters from the current position 1376 * Insert/Delete <count> characters from the current position
1368 text_t *stp; 1383 text_t *stp;
1369 rend_t *srp; 1384 rend_t *srp;
1370 int16_t *slp; 1385 int16_t *slp;
1371 1386
1372 want_refresh = 1; 1387 want_refresh = 1;
1373 ZERO_SCROLLBACK(); 1388 ZERO_SCROLLBACK ();
1374
1375#ifdef RXVT_GRAPHICS
1376 if (Gr_Displayed ())
1377 Gr_scroll (0);
1378#endif
1379 1389
1380 if (count <= 0) 1390 if (count <= 0)
1381 return; 1391 return;
1382 1392
1383 selection_check (1); 1393 selection_check (1);
1384 MIN_IT(count, (TermWin.ncol - screen.cur.col)); 1394 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1385 1395
1386 row = screen.cur.row + TermWin.saveLines; 1396 row = screen.cur.row + TermWin.saveLines;
1387 screen.flags &= ~Screen_WrapNext; 1397 screen.flags &= ~Screen_WrapNext;
1388 1398
1389 stp = screen.text[row]; 1399 stp = screen.text[row];
1390 srp = screen.rend[row]; 1400 srp = screen.rend[row];
1391 slp = &(screen.tlen[row]); 1401 slp = & (screen.tlen[row]);
1392 switch (insdel) 1402 switch (insdel)
1393 { 1403 {
1394 case INSERT: 1404 case INSERT:
1395 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1405 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1396 col--) 1406 col--)
1399 srp[col] = srp[col - count]; 1409 srp[col] = srp[col - count];
1400 } 1410 }
1401 if (*slp != -1) 1411 if (*slp != -1)
1402 { 1412 {
1403 *slp += count; 1413 *slp += count;
1404 MIN_IT(*slp, TermWin.ncol); 1414 MIN_IT (*slp, TermWin.ncol);
1405 } 1415 }
1406 if (selection.op && current_screen == selection.screen 1416 if (selection.op && current_screen == selection.screen
1407 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) 1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1408 { 1418 {
1409 if (selection.end.row != screen.cur.row 1419 if (selection.end.row != screen.cur.row
1410 || (selection.end.col + count >= TermWin.ncol)) 1420 || (selection.end.col + count >= TermWin.ncol))
1411 CLEAR_SELECTION(); 1421 CLEAR_SELECTION ();
1412 else 1422 else
1413 { /* shift selection */ 1423 { /* shift selection */
1414 selection.beg.col += count; 1424 selection.beg.col += count;
1415 selection.mark.col += count; /* XXX: yes? */ 1425 selection.mark.col += count; /* XXX: yes? */
1416 selection.end.col += count; 1426 selection.end.col += count;
1417 } 1427 }
1418 } 1428 }
1419 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1429 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1420 (unsigned int)count, rstyle); 1430 (unsigned int)count, rstyle);
1421 break; 1431 break;
1422 case ERASE: 1432 case ERASE:
1423 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1433 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1424 selection_check (1); 1434 selection_check (1);
1425 screen.cur.col -= count; 1435 screen.cur.col -= count;
1426 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1436 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1427 (unsigned int)count, rstyle); 1437 (unsigned int)count, rstyle);
1428 break; 1438 break;
1429 case DELETE: 1439 case DELETE:
1430 tr = srp[TermWin.ncol - 1] 1440 tr = srp[TermWin.ncol - 1]
1431 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1441 & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1432 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1442 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1433 { 1443 {
1434 stp[col] = stp[col + count]; 1444 stp[col] = stp[col + count];
1435 srp[col] = srp[col + count]; 1445 srp[col] = srp[col + count];
1436 } 1446 }
1437 scr_blank_line (&(stp[TermWin.ncol - count]), 1447 scr_blank_line (& (stp[TermWin.ncol - count]),
1438 &(srp[TermWin.ncol - count]), 1448 & (srp[TermWin.ncol - count]),
1439 (unsigned int)count, tr); 1449 (unsigned int)count, tr);
1440 if (*slp == -1) /* break line continuation */ 1450 if (*slp == -1) /* break line continuation */
1441 *slp = TermWin.ncol; 1451 *slp = TermWin.ncol;
1442 *slp -= count; 1452 *slp -= count;
1443 MAX_IT(*slp, 0); 1453 MAX_IT (*slp, 0);
1444 if (selection.op && current_screen == selection.screen 1454 if (selection.op && current_screen == selection.screen
1445 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) 1455 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1446 { 1456 {
1447 if (selection.end.row != screen.cur.row 1457 if (selection.end.row != screen.cur.row
1448 || (screen.cur.col >= selection.beg.col - count) 1458 || (screen.cur.col >= selection.beg.col - count)
1449 || selection.end.col >= TermWin.ncol) 1459 || selection.end.col >= TermWin.ncol)
1450 CLEAR_SELECTION(); 1460 CLEAR_SELECTION ();
1451 else 1461 else
1452 { 1462 {
1453 /* shift selection */ 1463 /* shift selection */
1454 selection.beg.col -= count; 1464 selection.beg.col -= count;
1455 selection.mark.col -= count; /* XXX: yes? */ 1465 selection.mark.col -= count; /* XXX: yes? */
1466 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1476 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1467 */ 1477 */
1468void 1478void
1469rxvt_term::scr_scroll_region (int top, int bot) 1479rxvt_term::scr_scroll_region (int top, int bot)
1470{ 1480{
1471 MAX_IT(top, 0); 1481 MAX_IT (top, 0);
1472 MIN_IT(bot, (int)TermWin.nrow - 1); 1482 MIN_IT (bot, (int)TermWin.nrow - 1);
1473 if (top > bot) 1483 if (top > bot)
1474 return; 1484 return;
1475 screen.tscroll = top; 1485 screen.tscroll = top;
1476 screen.bscroll = bot; 1486 screen.bscroll = bot;
1477 scr_gotorc (0, 0, 0); 1487 scr_gotorc (0, 0, 0);
1503rxvt_term::scr_autowrap (int mode) 1513rxvt_term::scr_autowrap (int mode)
1504{ 1514{
1505 if (mode) 1515 if (mode)
1506 screen.flags |= Screen_Autowrap; 1516 screen.flags |= Screen_Autowrap;
1507 else 1517 else
1508 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1518 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext);
1509} 1519}
1510 1520
1511/* ------------------------------------------------------------------------- */ 1521/* ------------------------------------------------------------------------- */
1512/* 1522/*
1513 * Set/unset margin origin mode 1523 * Set/unset margin origin mode
1552 */ 1562 */
1553void 1563void
1554rxvt_term::scr_set_tab (int mode) 1564rxvt_term::scr_set_tab (int mode)
1555{ 1565{
1556 if (mode < 0) 1566 if (mode < 0)
1557 MEMSET(tabs, 0, TermWin.ncol * sizeof(char)); 1567 MEMSET (tabs, 0, TermWin.ncol * sizeof (char));
1558 else if (screen.cur.col < TermWin.ncol) 1568 else if (screen.cur.col < TermWin.ncol)
1559 tabs[screen.cur.col] = (mode ? 1 : 0); 1569 tabs[screen.cur.col] = (mode ? 1 : 0);
1560} 1570}
1561 1571
1562/* ------------------------------------------------------------------------- */ 1572/* ------------------------------------------------------------------------- */
1571 XGCValues gcvalue; 1581 XGCValues gcvalue;
1572 1582
1573 if (rvideo != mode) 1583 if (rvideo != mode)
1574 { 1584 {
1575 rvideo = mode; 1585 rvideo = mode;
1576 SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1586 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color);
1577#if defined(XPM_BACKGROUND) 1587#if defined(XPM_BACKGROUND)
1578 if (bgPixmap.pixmap == None) 1588 if (bgPixmap.pixmap == None)
1579#endif 1589#endif
1580#if defined(TRANSPARENT) 1590#if defined(TRANSPARENT)
1581 if (!(Options & Opt_transparent) || am_transparent == 0) 1591 if (! (Options & Opt_transparent) || am_transparent == 0)
1582#endif 1592#endif
1583 XSetWindowBackground(display->display, TermWin.vt, 1593 XSetWindowBackground (display->display, TermWin.vt,
1584 PixColors[Color_bg]); 1594 PixColors[Color_bg]);
1585 1595
1586 gcvalue.foreground = PixColors[Color_fg]; 1596 gcvalue.foreground = PixColors[Color_fg];
1587 gcvalue.background = PixColors[Color_bg]; 1597 gcvalue.background = PixColors[Color_bg];
1588 XChangeGC(display->display, TermWin.gc, GCBackground | GCForeground, 1598 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1589 &gcvalue); 1599 &gcvalue);
1590 scr_clear (); 1600 scr_clear ();
1591 scr_touch (true); 1601 scr_touch (true);
1592 } 1602 }
1593} 1603}
1598 * XTERM_SEQ: Report position: ESC [ 6 n 1608 * XTERM_SEQ: Report position: ESC [ 6 n
1599 */ 1609 */
1600void 1610void
1601rxvt_term::scr_report_position () 1611rxvt_term::scr_report_position ()
1602{ 1612{
1603 tt_printf("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1613 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1604} 1614}
1605 1615
1606/* ------------------------------------------------------------------------- * 1616/* ------------------------------------------------------------------------- *
1607 * FONTS * 1617 * FONTS *
1608 * ------------------------------------------------------------------------- */ 1618 * ------------------------------------------------------------------------- */
1709 1719
1710 if (drawn_text == NULL) /* sanity check */ 1720 if (drawn_text == NULL) /* sanity check */
1711 return; 1721 return;
1712 1722
1713#ifdef DEBUG_STRICT 1723#ifdef DEBUG_STRICT
1714 x = max(x, (int)TermWin.int_bwidth); 1724 x = max (x, (int)TermWin.int_bwidth);
1715 x = min(x, (int)TermWin.width); 1725 x = min (x, (int)TermWin.width);
1716 y = max(y, (int)TermWin.int_bwidth); 1726 y = max (y, (int)TermWin.int_bwidth);
1717 y = min(y, (int)TermWin.height); 1727 y = min (y, (int)TermWin.height);
1718#endif 1728#endif
1719 1729
1720 /* round down */ 1730 /* round down */
1721 rc[PART_BEG].col = Pixel2Col(x); 1731 rc[PART_BEG].col = Pixel2Col (x);
1722 rc[PART_BEG].row = Pixel2Row(y); 1732 rc[PART_BEG].row = Pixel2Row (y);
1723 /* round up */ 1733 /* round up */
1724 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); 1734 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);
1725 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); 1735 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);
1726 1736
1727 /* sanity checks */ 1737 /* sanity checks */
1728 for (i = PART_BEG; i < RC_COUNT; i++) 1738 for (i = PART_BEG; i < RC_COUNT; i++)
1729 { 1739 {
1730 MIN_IT(rc[i].col, TermWin.ncol - 1); 1740 MIN_IT (rc[i].col, TermWin.ncol - 1);
1731 MIN_IT(rc[i].row, TermWin.nrow - 1); 1741 MIN_IT (rc[i].row, TermWin.nrow - 1);
1732 } 1742 }
1733 1743
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)); 1744 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 1745
1736 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1746 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1737 fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0, 1747 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0,
1738 (rc[PART_END].col - rc[PART_BEG].col + 1)); 1748 (rc[PART_END].col - rc[PART_BEG].col + 1));
1739 1749
1740 if (refresh) 1750 if (refresh)
1741 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1751 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1742} 1752}
1764 1774
1765 oldviewstart = TermWin.view_start; 1775 oldviewstart = TermWin.view_start;
1766 if (y < len) 1776 if (y < len)
1767 { 1777 {
1768 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1778 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1769 p -= (long)(TermWin.nrow - 1); 1779 p -= (long) (TermWin.nrow - 1);
1770 p = max(p, 0); 1780 p = max (p, 0);
1771 } 1781 }
1772 TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled); 1782 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)); 1783 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1774 1784
1775 return scr_changeview (oldviewstart); 1785 return scr_changeview (oldviewstart);
1776} 1786}
1777 1787
1778/* ------------------------------------------------------------------------- */ 1788/* ------------------------------------------------------------------------- */
1784rxvt_term::scr_page (enum page_dirn direction, int nlines) 1794rxvt_term::scr_page (enum page_dirn direction, int nlines)
1785{ 1795{
1786 int n; 1796 int n;
1787 uint16_t oldviewstart; 1797 uint16_t oldviewstart;
1788 1798
1789 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1799 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1790#ifdef DEBUG_STRICT 1800#ifdef DEBUG_STRICT
1791 assert((nlines >= 0) && (nlines <= TermWin.nrow)); 1801 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1792#endif 1802#endif
1793 oldviewstart = TermWin.view_start; 1803 oldviewstart = TermWin.view_start;
1794 if (direction == UP) 1804 if (direction == UP)
1795 { 1805 {
1796 n = TermWin.view_start + nlines; 1806 n = TermWin.view_start + nlines;
1797 TermWin.view_start = min(n, TermWin.nscrolled); 1807 TermWin.view_start = min (n, TermWin.nscrolled);
1798 } 1808 }
1799 else 1809 else
1800 { 1810 {
1801 n = TermWin.view_start - nlines; 1811 n = TermWin.view_start - nlines;
1802 TermWin.view_start = max(n, 0); 1812 TermWin.view_start = max (n, 0);
1803 } 1813 }
1804 return scr_changeview (oldviewstart); 1814 return scr_changeview (oldviewstart);
1805} 1815}
1806 1816
1807int 1817int
1808rxvt_term::scr_changeview (uint16_t oldviewstart) 1818rxvt_term::scr_changeview (uint16_t oldviewstart)
1809{ 1819{
1810 if (TermWin.view_start != oldviewstart) 1820 if (TermWin.view_start != oldviewstart)
1811 { 1821 {
1812 want_refresh = 1; 1822 want_refresh = 1;
1813#ifdef RXVT_GRAPHICS
1814 if (Gr_Displayed ())
1815 Gr_scroll (0);
1816#endif
1817 num_scr -= (TermWin.view_start - oldviewstart); 1823 num_scr -= (TermWin.view_start - oldviewstart);
1818 } 1824 }
1819 return (int)(TermWin.view_start - oldviewstart); 1825 return (int) (TermWin.view_start - oldviewstart);
1820} 1826}
1821 1827
1822/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1823void 1829void
1824rxvt_term::scr_bell () 1830rxvt_term::scr_bell ()
1826#ifndef NO_BELL 1832#ifndef NO_BELL
1827# ifndef NO_MAPALERT 1833# ifndef NO_MAPALERT
1828# ifdef MAPALERT_OPTION 1834# ifdef MAPALERT_OPTION
1829 if (Options & Opt_mapAlert) 1835 if (Options & Opt_mapAlert)
1830# endif 1836# endif
1831 XMapWindow(display->display, TermWin.parent[0]); 1837 XMapWindow (display->display, TermWin.parent[0]);
1832# endif 1838# endif
1833 if (Options & Opt_visualBell) 1839 if (Options & Opt_visualBell)
1834 { 1840 {
1835 scr_rvideo_mode (!rvideo); /* refresh also done */ 1841 scr_rvideo_mode (!rvideo); /* refresh also done */
1836 scr_rvideo_mode (!rvideo); /* refresh also done */ 1842 scr_rvideo_mode (!rvideo); /* refresh also done */
1837 } 1843 }
1838 else 1844 else
1839 XBell(display->display, 0); 1845 XBell (display->display, 0);
1840#endif 1846#endif
1841} 1847}
1842 1848
1843/* ------------------------------------------------------------------------- */ 1849/* ------------------------------------------------------------------------- */
1844/* ARGSUSED */ 1850/* ARGSUSED */
1864 1870
1865 for (r1 = 0; r1 < nrows; r1++) 1871 for (r1 = 0; r1 < nrows; r1++)
1866 { 1872 {
1867 t = screen.text[r1 + row_offset]; 1873 t = screen.text[r1 + row_offset];
1868 for (i = TermWin.ncol - 1; i >= 0; i--) 1874 for (i = TermWin.ncol - 1; i >= 0; i--)
1869 if (!isspace(t[i])) 1875 if (!isspace (t[i]))
1870 break; 1876 break;
1871 fprintf(fd, "%.*s\n", (i + 1), t); 1877 fprintf (fd, "%.*s\n", (i + 1), t);
1872 } 1878 }
1873 pclose_printer (fd); 1879 pclose_printer (fd);
1874#endif 1880#endif
1875} 1881}
1876 1882
1880 * drawn_text/drawn_rend contain the screen information before the update. 1886 * drawn_text/drawn_rend contain the screen information before the update.
1881 * screen.text/screen.rend contain what the screen will change to. 1887 * screen.text/screen.rend contain what the screen will change to.
1882 */ 1888 */
1883 1889
1884#define FONT_WIDTH(X, Y) \ 1890#define FONT_WIDTH(X, Y) \
1885 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1891 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1886#define FONT_RBEAR(X, Y) \ 1892#define FONT_RBEAR(X, Y) \
1887 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1893 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1888#define FONT_LBEAR(X, Y) \ 1894#define FONT_LBEAR(X, Y) \
1889 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing 1895 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1890#define IS_FONT_CHAR(X, Y) \ 1896#define IS_FONT_CHAR(X, Y) \
1891 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1897 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1892 1898
1893void 1899void
1894rxvt_term::scr_refresh (unsigned char refresh_type) 1900rxvt_term::scr_refresh (unsigned char refresh_type)
1895{ 1901{
1896 unsigned char clearfirst, /* first character writes before cell */ 1902 unsigned char clearfirst, /* first character writes before cell */
1897 clearlast, /* last character writes beyond cell */ 1903 clearlast, /* last character writes beyond cell */
1898 must_clear, /* use draw_string not draw_image_string */ 1904 must_clear, /* use draw_string not draw_image_string */
1899 rvid, /* reverse video this position */ 1905 rvid, /* reverse video this position */
1900 showcursor; /* show the cursor */ 1906 showcursor; /* show the cursor */
1901 int16_t col, row, /* column/row we're processing */ 1907 int16_t col, row, /* column/row we're processing */
1902 ocrow; /* old cursor row */ 1908 ocrow; /* old cursor row */
1903 int cursorwidth;
1904 int i, /* tmp */ 1909 int i, /* tmp */
1905 row_offset; /* basic offset in screen structure */ 1910 row_offset; /* basic offset in screen structure */
1906#ifndef NO_CURSORCOLOR 1911#ifndef NO_CURSORCOLOR
1907 rend_t cc1; /* store colours at cursor position(s) */ 1912 rend_t cc1; /* store colours at cursor position (s) */
1908#endif 1913#endif
1909 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1914 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1910 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1915 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1911 1916
1912 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1917 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1913 return; 1918 return;
1914 1919
1915 /* 1920 /*
1939 * B: reverse any characters which are selected 1944 * B: reverse any characters which are selected
1940 */ 1945 */
1941 scr_reverse_selection (); 1946 scr_reverse_selection ();
1942 1947
1943 /* 1948 /*
1944 * C: set the cursor character(s) 1949 * C: set the cursor character (s)
1945 */ 1950 */
1946 { 1951 {
1947 unsigned char setoldcursor; 1952 unsigned char setoldcursor;
1948 rend_t ccol1, /* Cursor colour */ 1953 rend_t ccol1, /* Cursor colour */
1949 ccol2; /* Cursor colour2 */ 1954 ccol2; /* Cursor colour2 */
1950 1955
1951 showcursor = (screen.flags & Screen_VisibleCursor); 1956 showcursor = (screen.flags & Screen_VisibleCursor);
1952 cursorwidth = 0;
1953#ifdef CURSOR_BLINK 1957#ifdef CURSOR_BLINK
1954 if (hidden_cursor) 1958 if (hidden_cursor)
1955 showcursor = 0; 1959 showcursor = 0;
1956#endif 1960#endif
1957 1961
1958 cursorwidth = 0;
1959
1960 if (showcursor) 1962 if (showcursor)
1961 { 1963 {
1962 cursorwidth++;
1963
1964 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 1964 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
1965 [screen.cur.col]); 1965 [screen.cur.col]);
1966 1966
1967 if (showcursor && TermWin.focus) 1967 if (showcursor && TermWin.focus)
1968 { 1968 {
1969 *srp ^= RS_RVid; 1969 *srp ^= RS_RVid;
1971 cc1 = *srp & (RS_fgMask | RS_bgMask); 1971 cc1 = *srp & (RS_fgMask | RS_bgMask);
1972 if (ISSET_PIXCOLOR (Color_cursor)) 1972 if (ISSET_PIXCOLOR (Color_cursor))
1973 ccol1 = Color_cursor; 1973 ccol1 = Color_cursor;
1974 else 1974 else
1975#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1975#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1976 ccol1 = GET_FGCOLOR(rstyle); 1976 ccol1 = GET_FGCOLOR (rstyle);
1977#else 1977#else
1978 ccol1 = Color_fg; 1978 ccol1 = Color_fg;
1979#endif 1979#endif
1980 if (ISSET_PIXCOLOR (Color_cursor2)) 1980 if (ISSET_PIXCOLOR (Color_cursor2))
1981 ccol2 = Color_cursor2; 1981 ccol2 = Color_cursor2;
1982 else 1982 else
1983#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1983#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1984 ccol2 = GET_BGCOLOR(rstyle); 1984 ccol2 = GET_BGCOLOR (rstyle);
1985#else 1985#else
1986 ccol2 = Color_bg; 1986 ccol2 = Color_bg;
1987#endif 1987#endif
1988 *srp = SET_FGCOLOR(*srp, ccol1); 1988 *srp = SET_FGCOLOR (*srp, ccol1);
1989 *srp = SET_BGCOLOR(*srp, ccol2); 1989 *srp = SET_BGCOLOR (*srp, ccol2);
1990#endif 1990#endif
1991
1992 } 1991 }
1993 } 1992 }
1994 1993
1995 /* make sure no outline cursor is left around */ 1994 /* make sure no outline cursor is left around */
1996 setoldcursor = 0; 1995 setoldcursor = 0;
2029 * D: CopyArea pass - very useful for slower links 2028 * D: CopyArea pass - very useful for slower links
2030 * This has been deliberately kept simple. 2029 * This has been deliberately kept simple.
2031 */ 2030 */
2032 i = num_scr; 2031 i = num_scr;
2033 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2032 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2034 && abs(i) < TermWin.nrow && !must_clear) 2033 && abs (i) < TermWin.nrow && !must_clear)
2035 { 2034 {
2036 int16_t nits; 2035 int16_t nits;
2037 int j; 2036 int j;
2038 rend_t *drp2; 2037 rend_t *drp2;
2039 text_t *dtp2; 2038 text_t *dtp2;
2077 2076
2078 if (len != -1) 2077 if (len != -1)
2079 { 2078 {
2080 /* also comes here at end if needed because of >= above */ 2079 /* also comes here at end if needed because of >= above */
2081 if (wlen < len) 2080 if (wlen < len)
2082 SWAP_IT(wlen, len, int); 2081 SWAP_IT (wlen, len, int);
2083 2082
2084 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); 2083 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2085 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2084 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2086 TermWin.gc, 0, Row2Pixel (len + i), 2085 TermWin.gc, 0, Row2Pixel (len + i),
2087 (unsigned int)TermWin_TotalWidth (), 2086 (unsigned int)TermWin_TotalWidth (),
2088 (unsigned int)Height2Pixel (wlen - len + 1), 2087 (unsigned int)Height2Pixel (wlen - len + 1),
2089 0, Row2Pixel (len)); 2088 0, Row2Pixel (len));
2104 drp = drawn_rend[row]; 2103 drp = drawn_rend[row];
2105 2104
2106 /* 2105 /*
2107 * E2: OK, now the real pass 2106 * E2: OK, now the real pass
2108 */ 2107 */
2109 int ypixel = (int)Row2Pixel(row); 2108 int ypixel = (int)Row2Pixel (row);
2110 2109
2111 for (col = 0; col < TermWin.ncol; col++) 2110 for (col = 0; col < TermWin.ncol; col++)
2112 { 2111 {
2113 /* compare new text with old - if exactly the same then continue */ 2112 /* compare new text with old - if exactly the same then continue */
2113 if (stp[col] == dtp[col] /* Must match characters to skip. */
2114 && (srp[col] == drp[col] /* Either rendition the same or */
2115 || (stp[col] == ' ' /* space w/ no background change */
2116 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2117 continue;
2118
2119 // redraw one or more characters
2120
2121 // seek to the beginning if wide characters
2122 while (stp[col] == NOCHAR && col > 0)
2123 --col;
2124
2114 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2125 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; 2126 text_t *text = stp + col;
2123 int count = 1; 2127 int count = 1;
2124 2128
2125 /* redraw one or more characters */
2126
2127 dtp[col] = stp[col]; 2129 dtp[col] = stp[col];
2128 drp[col] = rend; 2130 drp[col] = rend;
2129 2131
2130 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2131 continue;
2132
2133 int xpixel = Col2Pixel(col); 2132 int xpixel = Col2Pixel (col);
2134 2133
2135 // this loop looks very messy, it can probably be optimized 2134 // this loop looks very messy, it can probably be optimized
2136 // and cleaned a bit by you? 2135 // and cleaned a bit by you?
2137 for (i = 0; ++col < TermWin.ncol; ) 2136 for (i = 0; ++col < TermWin.ncol; )
2138 { 2137 {
2178 int back = GET_BGCOLOR (rend); // desired background 2177 int back = GET_BGCOLOR (rend); // desired background
2179 2178
2180 rend = GET_ATTR (rend); 2179 rend = GET_ATTR (rend);
2181 2180
2182 rvid = !!(rend & RS_RVid); 2181 rvid = !!(rend & RS_RVid);
2182
2183#ifndef NO_BOLD_UNDERLINE_REVERSE
2184 if (rend & RS_Bold && fore == Color_fg)
2185 {
2186 if (ISSET_PIXCOLOR (Color_BD))
2187 fore = Color_BD;
2188 else
2189 rvid = !rvid;
2190 }
2191
2192 if (rend & RS_Uline)
2193 if (ISSET_PIXCOLOR (Color_UL))
2194 fore = Color_UL;
2195#endif
2196
2183 if (rvid) 2197 if (rvid)
2184 { 2198 {
2185 SWAP_IT(fore, back, int); 2199 SWAP_IT (fore, back, int);
2186 2200
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2201#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (ISSET_PIXCOLOR (Color_RV) 2202 if (ISSET_PIXCOLOR (Color_RV)
2189# ifndef NO_CURSORCOLOR 2203# ifndef NO_CURSORCOLOR
2190 && !ISSET_PIXCOLOR (Color_cursor) 2204 && !ISSET_PIXCOLOR (Color_cursor)
2191# endif 2205# endif
2192 ) 2206 )
2193 back = Color_RV; 2207 back = Color_RV;
2194#endif 2208#endif
2195
2196 } 2209 }
2210
2197#ifdef TEXT_BLINK 2211#ifdef TEXT_BLINK
2198 if (rend & RS_Blink) 2212 if (rend & RS_Blink && back == Color_bg)
2199 { 2213 {
2200 if (!text_blink_ev.active) 2214 if (!text_blink_ev.active)
2201 { 2215 {
2202 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2216 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2203 hidden_text = 0; 2217 hidden_text = 0;
2204 } 2218 }
2205 else if (hidden_text) 2219 else if (hidden_text)
2206 fore = back; 2220 fore = back;
2207 } 2221 }
2208#endif 2222#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 2223
2224 /* 2224 /*
2225 * Actually do the drawing of the string here 2225 * Actually do the drawing of the string here
2226 */ 2226 */
2227 rxvt_font *font = (*TermWin.fontset)[fid]; 2227 rxvt_font *font = (*TermWin.fontset)[fid];
2228 2228
2229 if (back == fore) 2229 if (back == fore)
2230 font->clear_rect (xpixel, ypixel, 2230 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2231 TermWin.fwidth * count, TermWin.fheight, 2231 TermWin.fwidth * count, TermWin.fheight,
2232 back); 2232 back);
2233 else if (back == Color_bg) 2233 else if (back == Color_bg)
2234 { 2234 {
2235 if (must_clear) 2235 if (must_clear)
2237 CLEAR_CHARS (xpixel, ypixel, count); 2237 CLEAR_CHARS (xpixel, ypixel, count);
2238 2238
2239 for (i = 0; i < count; i++) /* don't draw empty strings */ 2239 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ') 2240 if (text[i] != ' ')
2241 { 2241 {
2242 font->draw (xpixel, ypixel, text, count, fore, -1); 2242 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2243 break; 2243 break;
2244 } 2244 }
2245 } 2245 }
2246 else 2246 else
2247 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2247 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2248 } 2248 }
2249 else 2249 else
2250 font->draw (xpixel, ypixel, text, count, fore, back); 2250 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2251 2251
2252 if ((rend & RS_Uline) && (font->descent > 1)) 2252 if ((rend & RS_Uline) && (font->descent > 1))
2253 XDrawLine(display->display, drawBuffer, TermWin.gc, 2253 XDrawLine (display->display, drawBuffer, TermWin.gc,
2254 xpixel, ypixel + font->ascent + 1, 2254 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2256 } /* for (col....) */ 2256 } /* for (col....) */
2257 } /* for (row....) */ 2257 } /* for (row....) */
2258 2258
2259 /* 2259 /*
2260 * G: cleanup cursor and display outline cursor if necessary 2260 * G: cleanup cursor and display outline cursor if necessary
2261 */ 2261 */
2262 if (showcursor) 2262 if (showcursor)
2263 { 2263 {
2264 if (TermWin.focus) 2264 if (TermWin.focus)
2265 { 2265 {
2266 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 2266 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2267 [screen.cur.col]); 2267 [screen.cur.col]);
2268 *srp ^= RS_RVid; 2268 *srp ^= RS_RVid;
2269#ifndef NO_CURSORCOLOR 2269#ifndef NO_CURSORCOLOR
2270 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2270 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2271#endif 2271#endif
2272
2273 } 2272 }
2274 else if (oldcursor.row >= 0) 2273 else if (oldcursor.row >= 0)
2275 { 2274 {
2276#ifndef NO_CURSORCOLOR 2275#ifndef NO_CURSORCOLOR
2277 if (ISSET_PIXCOLOR (Color_cursor)) 2276 if (ISSET_PIXCOLOR (Color_cursor))
2278 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2277 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2279#endif 2278#endif
2279 int cursorwidth = 1;
2280 while (oldcursor.col + cursorwidth < TermWin.ncol
2281 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2282 cursorwidth++;
2283
2280 XDrawRectangle(display->display, drawBuffer, TermWin.gc, 2284 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2281 Col2Pixel(oldcursor.col), 2285 Col2Pixel (oldcursor.col),
2282 Row2Pixel(oldcursor.row), 2286 Row2Pixel (oldcursor.row),
2283 (unsigned int)(Width2Pixel(cursorwidth) - 1), 2287 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2284 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1)); 2288 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2285 } 2289 }
2286 } 2290 }
2287 2291
2288 /* 2292 /*
2289 * H: cleanup selection 2293 * H: cleanup selection
2296 if (clearfirst && TermWin.int_bwidth) 2300 if (clearfirst && TermWin.int_bwidth)
2297 /* 2301 /*
2298 * clear the whole screen height, note that width == 0 is treated 2302 * clear the whole screen height, note that width == 0 is treated
2299 * specially by XClearArea 2303 * specially by XClearArea
2300 */ 2304 */
2301 XClearArea(display->display, TermWin.vt, 0, 0, 2305 XClearArea (display->display, TermWin.vt, 0, 0,
2302 (unsigned int)TermWin.int_bwidth, 2306 (unsigned int)TermWin.int_bwidth,
2303 (unsigned int)TermWin_TotalHeight(), False); 2307 (unsigned int)TermWin_TotalHeight (), False);
2308
2304 if (clearlast && TermWin.int_bwidth) 2309 if (clearlast && TermWin.int_bwidth)
2305 /* 2310 /*
2306 * clear the whole screen height, note that width == 0 is treated 2311 * clear the whole screen height, note that width == 0 is treated
2307 * specially by XClearArea 2312 * specially by XClearArea
2308 */ 2313 */
2309 XClearArea(display->display, TermWin.vt, 2314 XClearArea (display->display, TermWin.vt,
2310 TermWin.width + TermWin.int_bwidth, 0, 2315 TermWin.width + TermWin.int_bwidth, 0,
2311 (unsigned int)TermWin.int_bwidth, 2316 (unsigned int)TermWin.int_bwidth,
2312 (unsigned int)TermWin_TotalHeight(), False); 2317 (unsigned int)TermWin_TotalHeight (), False);
2318
2313 if (refresh_type & SMOOTH_REFRESH) 2319 if (refresh_type & SMOOTH_REFRESH)
2314 XSync(display->display, False); 2320 XSync (display->display, False);
2315 2321
2316 num_scr = 0; 2322 num_scr = 0;
2317 num_scr_allow = 1; 2323 num_scr_allow = 1;
2318 want_refresh = 0; /* screen is current */ 2324 want_refresh = 0; /* screen is current */
2319} 2325}
2320 2326
2321/* ------------------------------------------------------------------------- */
2322void 2327void
2328rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2329{
2330 if (!rp || !tp)
2331 return;
2332
2333 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2334 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2335}
2336
2337void
2338rxvt_term::scr_remap_chars ()
2339{
2340 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2341 scr_remap_chars (screen.text[i], screen.rend[i]);
2342
2343 for (int i = TermWin.nrow; i--; )
2344 {
2345 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2346 scr_remap_chars (swap.text[i], swap.rend[i]);
2347 }
2348}
2349
2350/* ------------------------------------------------------------------------- */
2351void
2323rxvt_term::scr_clear() 2352rxvt_term::scr_clear (bool really)
2324{ 2353{
2325 if (!TermWin.mapped) 2354 if (!TermWin.mapped)
2326 return; 2355 return;
2327 2356
2328 num_scr_allow = 0; 2357 num_scr_allow = 0;
2329 want_refresh = 1; 2358 want_refresh = 1;
2359
2330#ifdef TRANSPARENT 2360#ifdef TRANSPARENT
2331 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2361 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2332 { 2362 {
2333 int i; 2363 int i;
2334 2364
2335 if (!(Options & Opt_transparent_all)) 2365 if (! (Options & Opt_transparent_all))
2336 i = 0; 2366 i = 0;
2337 else 2367 else
2338 i = (int)(sizeof(TermWin.parent) / sizeof(Window)); 2368 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2339 2369
2340 while (i--) 2370 while (i--)
2341 if (TermWin.parent[i] != None) 2371 if (TermWin.parent[i] != None)
2342 XClearWindow(display->display, TermWin.parent[i]); 2372 XClearWindow (display->display, TermWin.parent[i]);
2343 } 2373 }
2344#endif 2374#endif
2345 2375
2376 if (really)
2346 XClearWindow (display->display, TermWin.vt); 2377 XClearWindow (display->display, TermWin.vt);
2347} 2378}
2348 2379
2349/* ------------------------------------------------------------------------- */ 2380/* ------------------------------------------------------------------------- */
2350void 2381void
2351rxvt_term::scr_reverse_selection () 2382rxvt_term::scr_reverse_selection ()
2352{ 2383{
2353 int i, col, row, end_row;
2354 rend_t *srp;
2355
2356 if (selection.op && current_screen == selection.screen) 2384 if (selection.op && current_screen == selection.screen)
2357 { 2385 {
2358 end_row = TermWin.saveLines - TermWin.view_start; 2386 int end_row = TermWin.saveLines - TermWin.view_start;
2359 i = selection.beg.row + TermWin.saveLines; 2387 int i = selection.beg.row + TermWin.saveLines;
2360 row = selection.end.row + TermWin.saveLines; 2388 int col, row = selection.end.row + TermWin.saveLines;
2389 rend_t *srp;
2390
2361 if (i >= end_row) 2391 if (i >= end_row)
2362 col = selection.beg.col; 2392 col = selection.beg.col;
2363 else 2393 else
2364 { 2394 {
2365 col = 0; 2395 col = 0;
2366 i = end_row; 2396 i = end_row;
2367 } 2397 }
2398
2368 end_row += TermWin.nrow; 2399 end_row += TermWin.nrow;
2369 for (; i < row && i < end_row; i++, col = 0) 2400 for (; i < row && i < end_row; i++, col = 0)
2370 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2401 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2371 srp[col] ^= RS_RVid; 2402 srp[col] ^= RS_RVid;
2403
2372 if (i == row && i < end_row) 2404 if (i == row && i < end_row)
2373 for (srp = screen.rend[i]; col < selection.end.col; col++) 2405 for (srp = screen.rend[i]; col < selection.end.col; col++)
2374 srp[col] ^= RS_RVid; 2406 srp[col] ^= RS_RVid;
2375 } 2407 }
2376} 2408}
2393 { 2425 {
2394 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2426 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2395 : TermWin.ncol; 2427 : TermWin.ncol;
2396 for (towrite = width; towrite; towrite -= wrote) 2428 for (towrite = width; towrite; towrite -= wrote)
2397 { 2429 {
2398 wrote = write(fd, &(screen.text[row][width - towrite]), 2430 wrote = write (fd, & (screen.text[row][width - towrite]),
2399 towrite); 2431 towrite);
2400 if (wrote < 0) 2432 if (wrote < 0)
2401 return; /* XXX: death, no report */ 2433 return; /* XXX: death, no report */
2402 } 2434 }
2403 if (screen.tlen[row] >= 0) 2435 if (screen.tlen[row] >= 0)
2404 if (write(fd, r1, 1) <= 0) 2436 if (write (fd, r1, 1) <= 0)
2405 return; /* XXX: death, no report */ 2437 return; /* XXX: death, no report */
2406 } 2438 }
2407} 2439}
2408#endif 2440#endif
2409 2441
2421 2453
2422 if (!selection.op) 2454 if (!selection.op)
2423 return; 2455 return;
2424 2456
2425 pos.row = pos.col = 0; 2457 pos.row = pos.col = 0;
2426 if ((selection.beg.row < -(int32_t)TermWin.nscrolled) 2458 if ((selection.beg.row < - (int32_t)TermWin.nscrolled)
2427 || (selection.beg.row >= TermWin.nrow) 2459 || (selection.beg.row >= TermWin.nrow)
2428 || (selection.mark.row < -(int32_t)TermWin.nscrolled) 2460 || (selection.mark.row < - (int32_t)TermWin.nscrolled)
2429 || (selection.mark.row >= TermWin.nrow) 2461 || (selection.mark.row >= TermWin.nrow)
2430 || (selection.end.row < -(int32_t)TermWin.nscrolled) 2462 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2431 || (selection.end.row >= TermWin.nrow) 2463 || (selection.end.row >= TermWin.nrow)
2432 || (check_more == 1 2464 || (check_more == 1
2433 && current_screen == selection.screen 2465 && current_screen == selection.screen
2434 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) 2466 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2435 && ROWCOL_IS_BEFORE(screen.cur, selection.end)) 2467 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2436 || (check_more == 2 2468 || (check_more == 2
2437 && ROWCOL_IS_BEFORE(selection.beg, pos) 2469 && ROWCOL_IS_BEFORE (selection.beg, pos)
2438 && ROWCOL_IS_AFTER(selection.end, pos)) 2470 && ROWCOL_IS_AFTER (selection.end, pos))
2439 || (check_more == 3 2471 || (check_more == 3
2440 && ROWCOL_IS_AFTER(selection.end, pos)) 2472 && ROWCOL_IS_AFTER (selection.end, pos))
2441 || (check_more == 4 /* screen width change */ 2473 || (check_more == 4 /* screen width change */
2442 && (selection.beg.row != selection.end.row 2474 && (selection.beg.row != selection.end.row
2443 || selection.end.col > TermWin.ncol))) 2475 || selection.end.col > TermWin.ncol)))
2444 CLEAR_SELECTION(); 2476 CLEAR_SELECTION ();
2445} 2477}
2446 2478
2447/* ------------------------------------------------------------------------- */ 2479/* ------------------------------------------------------------------------- */
2448/* 2480/*
2449 * Paste a selection direct to the command fd 2481 * Paste a selection direct to the command fd
2470 ds[j] = '\r'; 2502 ds[j] = '\r';
2471 2503
2472 tt_write (ds, (int)n); 2504 tt_write (ds, (int)n);
2473 } 2505 }
2474 2506
2475 free(ds); 2507 free (ds);
2476} 2508}
2477 2509
2478/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2479/* 2511/*
2480 * Respond to a notification that a primary selection has been sent 2512 * Respond to a notification that a primary selection has been sent
2485{ 2517{
2486 long nread = 0; 2518 long nread = 0;
2487 unsigned long bytes_after; 2519 unsigned long bytes_after;
2488 XTextProperty ct; 2520 XTextProperty ct;
2489 2521
2490 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); 2522 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2491 2523
2492 if (prop == None) /* check for failed XConvertSelection */ 2524 if (prop == None) /* check for failed XConvertSelection */
2493 { 2525 {
2494 if ((selection_type & Sel_CompoundText)) 2526 if ((selection_type & Sel_CompoundText))
2495 { 2527 {
2514 return 0; 2546 return 0;
2515 } 2547 }
2516 2548
2517 for (;;) 2549 for (;;)
2518 { 2550 {
2519 if (XGetWindowProperty(display->display, win, prop, (long)(nread / 4), 2551 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2520 (long)(PROP_SIZE / 4), delete_prop, 2552 (long) (PROP_SIZE / 4), delete_prop,
2521 AnyPropertyType, &ct.encoding, &ct.format, 2553 AnyPropertyType, &ct.encoding, &ct.format,
2522 &ct.nitems, &bytes_after, 2554 &ct.nitems, &bytes_after,
2523 &ct.value) != Success) 2555 &ct.value) != Success)
2524 break; 2556 break;
2525 2557
2526 if (ct.encoding == 0) 2558 if (ct.encoding == 0)
2527 { 2559 {
2528 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2560 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2529 break; 2561 break;
2530 } 2562 }
2531 2563
2532 if (ct.value == NULL) 2564 if (ct.value == NULL)
2533 { 2565 {
2534 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); 2566 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2535 continue; 2567 continue;
2536 } 2568 }
2537 2569
2538 if (ct.nitems == 0) 2570 if (ct.nitems == 0)
2539 { 2571 {
2540 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2573
2541 if (selection_wait == Sel_normal && nread == 0) 2574 if (selection_wait == Sel_normal && nread == 0
2575 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2542 { 2576 {
2543 /* 2577 /*
2544 * pass through again trying CUT_BUFFER0 if we've come from 2578 * pass through again trying CUT_BUFFER0 if we've come from
2545 * XConvertSelection() but nothing was presented 2579 * XConvertSelection () but nothing was presented
2546 */ 2580 */
2547 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2581 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2548 selection_paste (display->root, XA_CUT_BUFFER0, False); 2582 selection_paste (display->root, XA_CUT_BUFFER0, False);
2549 } 2583 }
2550 2584
2551 nread = -1; /* discount any previous stuff */ 2585 nread = -1; /* discount any previous stuff */
2552 break; 2586 break;
2577 XFree (ct.value); 2611 XFree (ct.value);
2578 2612
2579 if (selection_wait == Sel_normal) 2613 if (selection_wait == Sel_normal)
2580 selection_wait = Sel_none; 2614 selection_wait = Sel_none;
2581 2615
2582 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); 2616 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2583 return (int)nread; 2617 return (int)nread;
2584} 2618}
2585 2619
2586void 2620void
2587rxvt_term::incr_cb (time_watcher &w) 2621rxvt_term::incr_cb (time_watcher &w)
2599{ 2633{
2600 int reget_time = 0; 2634 int reget_time = 0;
2601 2635
2602 if (prop == None) 2636 if (prop == None)
2603 return; 2637 return;
2638
2604 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop)); 2639 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2605 if (selection_wait == Sel_normal) 2640 if (selection_wait == Sel_normal)
2606 { 2641 {
2607 int a, afmt; 2642 int a, afmt;
2608 Atom atype; 2643 Atom atype;
2609 unsigned long bytes_after, nitems; 2644 unsigned long bytes_after, nitems;
2610 unsigned char *s = NULL; 2645 unsigned char *s = NULL;
2611 2646
2612 a = XGetWindowProperty(display->display, win, prop, 0L, 1L, False, 2647 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2613 xa[XA_INCR], &atype, &afmt, &nitems, 2648 xa[XA_INCR], &atype, &afmt, &nitems,
2614 &bytes_after, &s); 2649 &bytes_after, &s);
2615 if (s) 2650 if (s)
2616 XFree(s); 2651 XFree (s);
2617 if (a != Success) 2652 if (a != Success)
2618 return; 2653 return;
2654
2619#ifndef __CYGWIN32__ 2655#ifndef __CYGWIN32__
2620 if (atype == xa[XA_INCR]) 2656 if (atype == xa[XA_INCR])
2621 { /* start an INCR transfer */ 2657 { /* start an INCR transfer */
2622 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); 2658 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2623 XDeleteProperty(display->display, win, prop); 2659 XDeleteProperty (display->display, win, prop);
2624 XFlush(display->display); 2660 XFlush (display->display);
2625 reget_time = 1; 2661 reget_time = 1;
2626 selection_wait = Sel_incr; 2662 selection_wait = Sel_incr;
2627 } 2663 }
2628#endif 2664#endif
2629 2665
2630 } 2666 }
2631 else if (selection_wait == Sel_incr) 2667 else if (selection_wait == Sel_incr)
2632 { 2668 {
2633 reget_time = 1; 2669 reget_time = 1;
2670
2634 if (selection_paste (win, prop, True) == -1) 2671 if (selection_paste (win, prop, True) == -1)
2635 { 2672 {
2636 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); 2673 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2637 selection_wait = Sel_none; 2674 selection_wait = Sel_none;
2638 incr_ev.stop (); 2675 incr_ev.stop ();
2639 } 2676 }
2640 } 2677 }
2641 if (reget_time) /* received more data so reget time */ 2678 if (reget_time) /* received more data so reget time */
2642 incr_ev.start (NOW + 10); 2679 incr_ev.start (NOW + 10);
2643} 2680}
2681
2644/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2645/* 2683/*
2646 * Request the current selection: 2684 * Request the current selection:
2647 * Order: > internal selection if available 2685 * Order: > internal selection if available
2648 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2686 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2649 * > CUT_BUFFER0 2687 * > CUT_BUFFER0
2650 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2688 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2651 * will auto fallback to CUT_BUFFER0 2689 * will auto fallback to CUT_BUFFER0
2652 * EXT: button 2 release 2690 * EXT: button 2 release
2653 */ 2691 */
2654void 2692void
2655rxvt_term::selection_request (Time tm, int x, int y) 2693rxvt_term::selection_request (Time tm, int x, int y)
2656{ 2694{
2657 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2695 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2696
2658 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2697 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2659 return; /* outside window */ 2698 return; /* outside window */
2660 2699
2661 if (selection.text != NULL) 2700 if (selection.text)
2662 { /* internal selection */ 2701 { /* internal selection */
2663 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2702 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2664 paste (selection.text, selection.len); 2703 char *str = rxvt_wcstombs (selection.text, selection.len);
2704 paste ((unsigned char *)str, strlen (str));
2705 free (str);
2665 return; 2706 return;
2666 } 2707 }
2667 else 2708 else
2668 { 2709 {
2669 int i; 2710 int i;
2670 2711
2671 selection_request_time = tm; 2712 selection_request_time = tm;
2672 selection_wait = Sel_normal; 2713 selection_wait = Sel_normal;
2673 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2714 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2674 { 2715 {
2682 return; 2723 return;
2683#endif 2724#endif
2684 2725
2685 } 2726 }
2686 } 2727 }
2728
2687 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2688 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2730 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2689 selection_paste (display->root, XA_CUT_BUFFER0, False); 2731 selection_paste (display->root, XA_CUT_BUFFER0, False);
2690} 2732}
2691 2733
2692int 2734int
2693rxvt_term::selection_request_other (Atom target, int selnum) 2735rxvt_term::selection_request_other (Atom target, int selnum)
2694{ 2736{
2695 Atom sel; 2737 Atom sel;
2696#ifdef DEBUG_SELECT 2738#ifdef DEBUG_SELECT
2697 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2739 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2698#endif 2740#endif
2699 2741
2700 selection_type |= selnum; 2742 selection_type |= selnum;
2743
2701 if (selnum == Sel_Primary) 2744 if (selnum == Sel_Primary)
2702 sel = XA_PRIMARY; 2745 sel = XA_PRIMARY;
2703 else if (selnum == Sel_Secondary) 2746 else if (selnum == Sel_Secondary)
2704 sel = XA_SECONDARY; 2747 sel = XA_SECONDARY;
2705 else 2748 else
2706 sel = xa[XA_CLIPBOARD]; 2749 sel = xa[XA_CLIPBOARD];
2750
2707 if (XGetSelectionOwner(display->display, sel) != None) 2751 if (XGetSelectionOwner (display->display, sel) != None)
2708 { 2752 {
2709 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2753 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2710 XConvertSelection(display->display, sel, target, xa[XA_VT_SELECTION], 2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2711 TermWin.vt, selection_request_time); 2755 TermWin.vt, selection_request_time);
2712 return 1; 2756 return 1;
2713 } 2757 }
2758
2714 return 0; 2759 return 0;
2715} 2760}
2716 2761
2717/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2718/* 2763/*
2720 * EXT: SelectionClear 2765 * EXT: SelectionClear
2721 */ 2766 */
2722void 2767void
2723rxvt_term::selection_clear () 2768rxvt_term::selection_clear ()
2724{ 2769{
2725 D_SELECT((stderr, "rxvt_selection_clear()")); 2770 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2726 2771
2727 want_refresh = 1; 2772 want_refresh = 1;
2728 if (selection.text)
2729 free(selection.text); 2773 free (selection.text);
2730 selection.text = NULL; 2774 selection.text = NULL;
2731 selection.len = 0; 2775 selection.len = 0;
2732 CLEAR_SELECTION(); 2776 CLEAR_SELECTION ();
2733} 2777}
2734 2778
2735/* ------------------------------------------------------------------------- */ 2779/* ------------------------------------------------------------------------- */
2736/* 2780/*
2737 * Copy a selection into the cut buffer 2781 * Copy a selection into the cut buffer
2738 * EXT: button 1 or 3 release 2782 * EXT: button 1 or 3 release
2739 */ 2783 */
2740void 2784void
2741rxvt_term::selection_make (Time tm) 2785rxvt_term::selection_make (Time tm)
2742{ 2786{
2743 int i, col, end_col, row, end_row; 2787 int i, col, end_col, row, end_row;
2744 unsigned char *new_selection_text; 2788 wchar_t *new_selection_text;
2745 char *str;
2746 text_t *t; 2789 text_t *t;
2747#ifdef ACS_ASCII
2748 rend_t *re;
2749#endif
2750 2790
2751 D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2791 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2752 switch (selection.op) 2792 switch (selection.op)
2753 { 2793 {
2754 case SELECTION_CONT: 2794 case SELECTION_CONT:
2755 break; 2795 break;
2756 case SELECTION_INIT: 2796 case SELECTION_INIT:
2757 CLEAR_SELECTION(); 2797 CLEAR_SELECTION ();
2758 /* FALLTHROUGH */ 2798 /* FALLTHROUGH */
2759 case SELECTION_BEGIN: 2799 case SELECTION_BEGIN:
2760 selection.op = SELECTION_DONE; 2800 selection.op = SELECTION_DONE;
2761 /* FALLTHROUGH */ 2801 /* FALLTHROUGH */
2762 default: 2802 default:
2763 return; 2803 return;
2764 } 2804 }
2805
2765 selection.op = SELECTION_DONE; 2806 selection.op = SELECTION_DONE;
2766 2807
2767 if (selection.clicks == 4) 2808 if (selection.clicks == 4)
2768 return; /* nothing selected, go away */ 2809 return; /* nothing selected, go away */
2769 2810
2770 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2811 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2771 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2812 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2772
2773 new_selection_text = (unsigned char *)str;
2774 2813
2775 col = selection.beg.col; 2814 col = selection.beg.col;
2776 MAX_IT(col, 0); 2815 MAX_IT (col, 0);
2777 row = selection.beg.row + TermWin.saveLines; 2816 row = selection.beg.row + TermWin.saveLines;
2778 end_row = selection.end.row + TermWin.saveLines; 2817 end_row = selection.end.row + TermWin.saveLines;
2818 int ofs = 0;
2819 int extra = 0;
2779 2820
2780 for (; row <= end_row; row++, col = 0) 2821 for (; row <= end_row; row++, col = 0)
2781 { 2822 {
2782 t = &(screen.text[row][col]); 2823 t = &(screen.text[row][col]);
2783 2824
2788 2829
2789 if (row == end_row) 2830 if (row == end_row)
2790 MIN_IT (end_col, selection.end.col); 2831 MIN_IT (end_col, selection.end.col);
2791 2832
2792 for (; col < end_col; col++) 2833 for (; col < end_col; col++)
2834 {
2793 if (*t == NOCHAR) 2835 if (*t == NOCHAR)
2794 t++; 2836 t++;
2837#if ENABLE_COMBINING
2838 else if (IS_COMPOSE (*t))
2839 {
2840 int len = rxvt_composite.expand (*t, 0);
2841
2842 extra -= (len - 1);
2843
2844 if (extra < 0)
2845 {
2846 extra += i;
2847 i += i;
2848 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2849 }
2850
2851 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2852 }
2853#endif
2795 else 2854 else
2796 { 2855 new_selection_text[ofs++] = *t++;
2797 int len = wctomb (str, *t++);
2798 if (len > 0)
2799 str += len;
2800 } 2856 }
2801 2857
2802 if (screen.tlen[row] != -1 && row != end_row) 2858 if (screen.tlen[row] != -1 && row != end_row)
2803 *str++ = '\n'; 2859 new_selection_text[ofs++] = L'\n';
2804 } 2860 }
2805 2861
2806#ifndef NO_OLD_SELECTION 2862#ifndef NO_OLD_SELECTION
2807 if (selection_style == OLD_SELECT) 2863 if (selection_style == OLD_SELECT)
2808 if (end_col == TermWin.ncol) 2864 if (end_col == TermWin.ncol)
2809 *str++ = '\n'; 2865 new_selection_text[ofs++] = L'\n';
2810#endif 2866#endif
2811#ifndef NO_NEW_SELECTION 2867#ifndef NO_NEW_SELECTION
2812 if (selection_style != OLD_SELECT) 2868 if (selection_style != OLD_SELECT)
2813 if (end_col != selection.end.col) 2869 if (end_col != selection.end.col)
2814 *str++ = '\n'; 2870 new_selection_text[ofs++] = L'\n';
2815#endif 2871#endif
2816 *str = '\0'; 2872 new_selection_text[ofs] = 0;
2817 2873
2818 i = str - (char *)new_selection_text;
2819 if (i == 0) 2874 if (ofs == 0)
2820 { 2875 {
2821 free (new_selection_text); 2876 free (new_selection_text);
2822 return; 2877 return;
2823 } 2878 }
2824 2879
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); 2880 free (selection.text);
2833 2881
2834 selection.text = new_selection_text; 2882 // we usually allocate much more than necessary, so realloc it smaller again
2883 selection.len = ofs;
2884 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2835 2885
2836 XSetSelectionOwner(display->display, XA_PRIMARY, TermWin.vt, tm); 2886 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2837 if (XGetSelectionOwner(display->display, XA_PRIMARY) != TermWin.vt) 2887 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2888 display->set_selection_owner (this);
2889 else
2838 rxvt_print_error("can't get primary selection"); 2890 rxvt_print_error ("can't get primary selection");
2839 2891
2840 2892#if 0
2841 {
2842 XTextProperty ct; 2893 XTextProperty ct;
2843 char *cl = (char *)selection.text;
2844 2894
2845 if (XmbTextListToTextProperty(display->display, &cl, 1, XStringStyle, &ct) >= 0) 2895 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2846 { 2896 {
2847 XChangeProperty(display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2848 PropModeReplace, ct.value, ct.nitems);
2849 XFree (ct.value);
2850 }
2851 else
2852 XChangeProperty(display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2897 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2853 PropModeReplace, selection.text, (int)selection.len); 2898 PropModeReplace, ct.value, ct.nitems);
2899 XFree (ct.value);
2854 } 2900 }
2901#endif
2855 2902
2856 selection_time = tm; 2903 selection_time = tm;
2857 D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len)); 2904 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2858} 2905}
2859 2906
2860/* ------------------------------------------------------------------------- */ 2907/* ------------------------------------------------------------------------- */
2861/* 2908/*
2862 * Mark or select text based upon number of clicks: 1, 2, or 3 2909 * Mark or select text based upon number of clicks: 1, 2, or 3
2863 * EXT: button 1 press 2910 * EXT: button 1 press
2864 */ 2911 */
2865void 2912void
2866rxvt_term::selection_click (int clicks, int x, int y) 2913rxvt_term::selection_click (int clicks, int x, int y)
2867{ 2914{
2868 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); 2915 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2869 2916
2870 clicks = ((clicks - 1) % 3) + 1; 2917 clicks = ((clicks - 1) % 3) + 1;
2871 selection.clicks = clicks; /* save clicks so extend will work */ 2918 selection.clicks = clicks; /* save clicks so extend will work */
2872 2919
2873 selection_start_colrow (Pixel2Col(x), Pixel2Row(y)); 2920 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2874 2921
2875 if (clicks == 2 || clicks == 3) 2922 if (clicks == 2 || clicks == 3)
2876 selection_extend_colrow (selection.mark.col, 2923 selection_extend_colrow (selection.mark.col,
2877 selection.mark.row + TermWin.view_start, 2924 selection.mark.row + TermWin.view_start,
2878 0, /* button 3 */ 2925 0, /* button 3 */
2888rxvt_term::selection_start_colrow (int col, int row) 2935rxvt_term::selection_start_colrow (int col, int row)
2889{ 2936{
2890 want_refresh = 1; 2937 want_refresh = 1;
2891 selection.mark.col = col; 2938 selection.mark.col = col;
2892 selection.mark.row = row - TermWin.view_start; 2939 selection.mark.row = row - TermWin.view_start;
2893 MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled); 2940 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2894 MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1); 2941 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2895 MAX_IT(selection.mark.col, 0); 2942 MAX_IT (selection.mark.col, 0);
2896 MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1); 2943 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2897 2944
2898 if (selection.op) 2945 if (selection.op)
2899 { /* clear the old selection */ 2946 { /* clear the old selection */
2900 selection.beg.row = selection.end.row = selection.mark.row; 2947 selection.beg.row = selection.end.row = selection.mark.row;
2901 selection.beg.col = selection.end.col = selection.mark.col; 2948 selection.beg.col = selection.end.col = selection.mark.col;
2910 * We now only find out the boundary in one direction 2957 * We now only find out the boundary in one direction
2911 */ 2958 */
2912 2959
2913/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2960/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2914#define DELIMIT_TEXT(x) \ 2961#define DELIMIT_TEXT(x) \
2915 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(rs[Rs_cutchars], (x)) != NULL)) 2962 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL))
2916#define DELIMIT_REND(x) 1 2963#define DELIMIT_REND(x) 1
2917 2964
2918void 2965void
2919rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2966rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2920{ 2967{
2935 bound.col = TermWin.ncol - 1; 2982 bound.col = TermWin.ncol - 1;
2936 dirnadd = 1; 2983 dirnadd = 1;
2937 } 2984 }
2938 row = mark->row + TermWin.saveLines; 2985 row = mark->row + TermWin.saveLines;
2939 col = mark->col; 2986 col = mark->col;
2940 MAX_IT(col, 0); 2987 MAX_IT (col, 0);
2941 /* find the edge of a word */ 2988 /* find the edge of a word */
2942 stp = &(screen.text[row][col]); 2989 stp = & (screen.text[row][col]);
2943 w1 = DELIMIT_TEXT(*stp); 2990 w1 = DELIMIT_TEXT (*stp);
2944 2991
2945 if (selection_style != NEW_SELECT) 2992 if (selection_style != NEW_SELECT)
2946 { 2993 {
2947 if (w1 == 1) 2994 if (w1 == 1)
2948 { 2995 {
2949 stp += dirnadd; 2996 stp += dirnadd;
2950 if (DELIMIT_TEXT(*stp) == 1) 2997 if (DELIMIT_TEXT (*stp) == 1)
2951 goto Old_Word_Selection_You_Die; 2998 goto Old_Word_Selection_You_Die;
2952 col += dirnadd; 2999 col += dirnadd;
2953 } 3000 }
2954 w1 = 0; 3001 w1 = 0;
2955 } 3002 }
2956 srp = (&screen.rend[row][col]); 3003 srp = (&screen.rend[row][col]);
2957 w2 = DELIMIT_REND(*srp); 3004 w2 = DELIMIT_REND (*srp);
2958 3005
2959 for (;;) 3006 for (;;)
2960 { 3007 {
2961 for (; col != bound.col; col += dirnadd) 3008 for (; col != bound.col; col += dirnadd)
2962 { 3009 {
2963 stp += dirnadd; 3010 stp += dirnadd;
2964 if (DELIMIT_TEXT(*stp) != w1) 3011 if (DELIMIT_TEXT (*stp) != w1)
2965 break; 3012 break;
2966 srp += dirnadd; 3013 srp += dirnadd;
2967 if (DELIMIT_REND(*srp) != w2) 3014 if (DELIMIT_REND (*srp) != w2)
2968 break; 3015 break;
2969 } 3016 }
2970 if ((col == bound.col) && (row != bound.row)) 3017 if ((col == bound.col) && (row != bound.row))
2971 { 3018 {
2972 if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) 3019 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2973 { 3020 {
2974 trow = row + dirnadd; 3021 trow = row + dirnadd;
2975 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3022 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2976 if (screen.text[trow] == NULL) 3023 if (screen.text[trow] == NULL)
2977 break; 3024 break;
2978 stp = &(screen.text[trow][tcol]); 3025 stp = & (screen.text[trow][tcol]);
2979 srp = &(screen.rend[trow][tcol]); 3026 srp = & (screen.rend[trow][tcol]);
2980 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) 3027 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2981 break; 3028 break;
2982 row = trow; 3029 row = trow;
2983 col = tcol; 3030 col = tcol;
2984 continue; 3031 continue;
2985 } 3032 }
2986 } 3033 }
2987 break; 3034 break;
2988 } 3035 }
2989Old_Word_Selection_You_Die: 3036Old_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)); 3037 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 3038
2992 if (dirn == DN) 3039 if (dirn == DN)
2993 col++; /* put us on one past the end */ 3040 col++; /* put us on one past the end */
2994 3041
2995 /* Poke the values back in */ 3042 /* Poke the values back in */
3008void 3055void
3009rxvt_term::selection_extend (int x, int y, int flag) 3056rxvt_term::selection_extend (int x, int y, int flag)
3010{ 3057{
3011 int col, row; 3058 int col, row;
3012 3059
3013 col = Pixel2Col(x); 3060 col = Pixel2Col (x);
3014 row = Pixel2Row(y); 3061 row = Pixel2Row (y);
3015 MAX_IT(row, 0); 3062 MAX_IT (row, 0);
3016 MIN_IT(row, (int)TermWin.nrow - 1); 3063 MIN_IT (row, (int)TermWin.nrow - 1);
3017 MAX_IT(col, 0); 3064 MAX_IT (col, 0);
3018 MIN_IT(col, (int)TermWin.ncol); 3065 MIN_IT (col, (int)TermWin.ncol);
3019 3066
3020#ifndef NO_NEW_SELECTION 3067#ifndef NO_NEW_SELECTION
3021 /* 3068 /*
3022 * If we're selecting characters (single click) then we must check first 3069 * 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 3070 * if we are at the same place as the original mark. If we are then
3033 /* select nothing */ 3080 /* select nothing */
3034 selection.beg.row = selection.end.row = 0; 3081 selection.beg.row = selection.end.row = 0;
3035 selection.beg.col = selection.end.col = 0; 3082 selection.beg.col = selection.end.col = 0;
3036 selection.clicks = 4; 3083 selection.clicks = 4;
3037 want_refresh = 1; 3084 want_refresh = 1;
3038 D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4")); 3085 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3039 return; 3086 return;
3040 } 3087 }
3041 } 3088 }
3042#endif 3089#endif
3043 if (selection.clicks == 4) 3090 if (selection.clicks == 4)
3060 row_col_t pos; 3107 row_col_t pos;
3061 enum { 3108 enum {
3062 LEFT, RIGHT 3109 LEFT, RIGHT
3063 } closeto = RIGHT; 3110 } closeto = RIGHT;
3064 3111
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)); 3112 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)); 3113 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 3114
3068 want_refresh = 1; 3115 want_refresh = 1;
3069 switch (selection.op) 3116 switch (selection.op)
3070 { 3117 {
3071 case SELECTION_INIT: 3118 case SELECTION_INIT:
3072 CLEAR_SELECTION(); 3119 CLEAR_SELECTION ();
3073 selection.op = SELECTION_BEGIN; 3120 selection.op = SELECTION_BEGIN;
3074 /* FALLTHROUGH */ 3121 /* FALLTHROUGH */
3075 case SELECTION_BEGIN: 3122 case SELECTION_BEGIN:
3076 if (row != selection.mark.row || col != selection.mark.col 3123 if (row != selection.mark.row || col != selection.mark.col
3077 || (!button3 && buttonpress)) 3124 || (!button3 && buttonpress))
3093 && selection.beg.row == selection.end.row 3140 && selection.beg.row == selection.end.row
3094 && selection.beg.row != selection.mark.row) 3141 && selection.beg.row != selection.mark.row)
3095 { 3142 {
3096 selection.beg.col = selection.end.col = selection.mark.col; 3143 selection.beg.col = selection.end.col = selection.mark.col;
3097 selection.beg.row = selection.end.row = selection.mark.row; 3144 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)); 3145 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 } 3146 }
3100 3147
3101 pos.col = col; 3148 pos.col = col;
3102 pos.row = row; 3149 pos.row = row;
3103 3150
3126 { 3173 {
3127 selection.mark.row = selection.beg.row; 3174 selection.mark.row = selection.beg.row;
3128 selection.mark.col = selection.beg.col; 3175 selection.mark.col = selection.beg.col;
3129 } 3176 }
3130 } 3177 }
3131 if (ROWCOL_IS_BEFORE(pos, selection.mark)) 3178 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3132 { 3179 {
3133 selection.end.row = selection.mark.row; 3180 selection.end.row = selection.mark.row;
3134 selection.end.col = selection.mark.col + 1; 3181 selection.end.col = selection.mark.col + 1;
3135 selection.beg.row = pos.row; 3182 selection.beg.row = pos.row;
3136 selection.beg.col = pos.col; 3183 selection.beg.col = pos.col;
3143 selection.end.col = pos.col + 1; 3190 selection.end.col = pos.col + 1;
3144 } 3191 }
3145 } 3192 }
3146 else if (selection.clicks == 2) 3193 else if (selection.clicks == 2)
3147 { 3194 {
3148 selection_delimit_word (UP, &(selection.mark), 3195 selection_delimit_word (UP, & (selection.mark),
3149 &(selection.beg)); 3196 & (selection.beg));
3150 selection_delimit_word (DN, &(selection.mark), 3197 selection_delimit_word (DN, & (selection.mark),
3151 &(selection.end)); 3198 & (selection.end));
3152 hate_those_clicks = 1; 3199 hate_those_clicks = 1;
3153 } 3200 }
3154 else if (selection.clicks == 3) 3201 else if (selection.clicks == 3)
3155 { 3202 {
3156 selection.beg.row = selection.end.row = selection.mark.row; 3203 selection.beg.row = selection.end.row = selection.mark.row;
3157 selection.beg.col = 0; 3204 selection.beg.col = 0;
3158 selection.end.col = ncol; 3205 selection.end.col = ncol;
3159 hate_those_clicks = 1; 3206 hate_those_clicks = 1;
3160 } 3207 }
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)); 3208 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; 3209 return;
3163 } 3210 }
3164#endif /* ! NO_OLD_SELECTION */ 3211#endif /* ! NO_OLD_SELECTION */
3165#ifndef NO_NEW_SELECTION 3212#ifndef NO_NEW_SELECTION
3166 /* selection_style must not be OLD_SELECT to get here */ 3213 /* selection_style must not be OLD_SELECT to get here */
3180 if (button3 && buttonpress) 3227 if (button3 && buttonpress)
3181 { /* button3 press */ 3228 { /* button3 press */
3182 /* 3229 /*
3183 * first determine which edge of the selection we are closest to 3230 * first determine which edge of the selection we are closest to
3184 */ 3231 */
3185 if (ROWCOL_IS_BEFORE(pos, selection.beg) 3232 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3186 || (!ROWCOL_IS_AFTER(pos, selection.end) 3233 || (!ROWCOL_IS_AFTER (pos, selection.end)
3187 && (((pos.col - selection.beg.col) 3234 && (((pos.col - selection.beg.col)
3188 + ((pos.row - selection.beg.row) * ncol)) 3235 + ((pos.row - selection.beg.row) * ncol))
3189 < ((selection.end.col - pos.col) 3236 < ((selection.end.col - pos.col)
3190 + ((selection.end.row - pos.row) * ncol))))) 3237 + ((selection.end.row - pos.row) * ncol)))))
3191 closeto = LEFT; 3238 closeto = LEFT;
3205 selection.mark.col = selection.beg.col; 3252 selection.mark.col = selection.beg.col;
3206 } 3253 }
3207 } 3254 }
3208 else 3255 else
3209 { /* button1 drag or button3 drag */ 3256 { /* button1 drag or button3 drag */
3210 if (ROWCOL_IS_AFTER(selection.mark, pos)) 3257 if (ROWCOL_IS_AFTER (selection.mark, pos))
3211 { 3258 {
3212 if ((selection.mark.row == selection.end.row) 3259 if ((selection.mark.row == selection.end.row)
3213 && (selection.mark.col == selection.end.col) 3260 && (selection.mark.col == selection.end.col)
3214 && clickchange && selection.clicks == 2) 3261 && clickchange && selection.clicks == 2)
3215 selection.mark.col--; 3262 selection.mark.col--;
3248 selection.end.col = ncol; 3295 selection.end.col = ncol;
3249 3296
3250 } 3297 }
3251 else if (selection.clicks == 2) 3298 else if (selection.clicks == 2)
3252 { 3299 {
3253 if (ROWCOL_IS_AFTER(selection.end, selection.beg)) 3300 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3254 selection.end.col--; 3301 selection.end.col--;
3255 selection_delimit_word (UP, &(selection.beg), 3302 selection_delimit_word (UP, & (selection.beg),
3256 &(selection.beg)); 3303 & (selection.beg));
3257 selection_delimit_word (DN, &(selection.end), 3304 selection_delimit_word (DN, & (selection.end),
3258 &(selection.end)); 3305 & (selection.end));
3259 } 3306 }
3260 else if (selection.clicks == 3) 3307 else if (selection.clicks == 3)
3261 { 3308 {
3262#ifndef NO_FRILLS 3309#ifndef NO_FRILLS
3263 if ((Options & Opt_tripleclickwords)) 3310 if ((Options & Opt_tripleclickwords))
3264 { 3311 {
3265 int end_row; 3312 int end_row;
3266 3313
3267 selection_delimit_word (UP, &(selection.beg), 3314 selection_delimit_word (UP, & (selection.beg),
3268 &(selection.beg)); 3315 & (selection.beg));
3269 end_row = screen.tlen[selection.mark.row 3316 end_row = screen.tlen[selection.mark.row
3270 + TermWin.saveLines]; 3317 + TermWin.saveLines];
3271 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3318 for (end_row = selection.mark.row; end_row < TermWin.nrow;
3272 end_row++) 3319 end_row++)
3273 { 3320 {
3283 } 3330 }
3284 else 3331 else
3285#endif 3332#endif
3286 3333
3287 { 3334 {
3288 if (ROWCOL_IS_AFTER(selection.mark, selection.beg)) 3335 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3289 selection.mark.col++; 3336 selection.mark.col++;
3290 selection.beg.col = 0; 3337 selection.beg.col = 0;
3291 selection.end.col = ncol; 3338 selection.end.col = ncol;
3292 } 3339 }
3293 } 3340 }
3303 { 3350 {
3304 selection.mark.row = selection.beg.row; 3351 selection.mark.row = selection.beg.row;
3305 selection.mark.col = selection.beg.col; 3352 selection.mark.col = selection.beg.col;
3306 } 3353 }
3307 } 3354 }
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)); 3355 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 */ 3356#endif /* ! NO_NEW_SELECTION */
3310} 3357}
3311 3358
3312#ifndef NO_FRILLS 3359#ifndef NO_FRILLS
3313void 3360void
3354 */ 3401 */
3355void 3402void
3356rxvt_term::selection_rotate (int x, int y) 3403rxvt_term::selection_rotate (int x, int y)
3357{ 3404{
3358 selection.clicks = selection.clicks % 3 + 1; 3405 selection.clicks = selection.clicks % 3 + 1;
3359 selection_extend_colrow (Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3360} 3407}
3361 3408
3362/* ------------------------------------------------------------------------- */ 3409/* ------------------------------------------------------------------------- */
3363/* 3410/*
3364 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3411 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3388 ev.target = rq.target; 3435 ev.target = rq.target;
3389 ev.time = rq.time; 3436 ev.time = rq.time;
3390 3437
3391 if (rq.target == xa[XA_TARGETS]) 3438 if (rq.target == xa[XA_TARGETS])
3392 { 3439 {
3393 Atom32 target_list[5]; 3440 Atom32 target_list[6];
3394 Atom32 *target = target_list; 3441 Atom32 *target = target_list;
3395 3442
3396 *target++ = (Atom32) xa[XA_TARGETS]; 3443 *target++ = (Atom32) xa[XA_TARGETS];
3444 *target++ = (Atom32) xa[XA_TIMESTAMP];
3397 *target++ = (Atom32) XA_STRING; 3445 *target++ = (Atom32) XA_STRING;
3398 *target++ = (Atom32) xa[XA_TEXT]; 3446 *target++ = (Atom32) xa[XA_TEXT];
3399 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3447 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3400#if X_HAVE_UTF8_STRING 3448#if X_HAVE_UTF8_STRING
3401 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3449 *target++ = (Atom32) xa[XA_UTF8_STRING];
3402#endif 3450#endif
3451
3403 XChangeProperty(display->display, rq.requestor, rq.property, XA_ATOM, 3452 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3404 (8 * sizeof(target_list[0])), PropModeReplace, 3453 (8 * sizeof (target_list[0])), PropModeReplace,
3405 (unsigned char *)target_list, 3454 (unsigned char *)target_list,
3406 target - target_list); 3455 target - target_list);
3407 ev.property = rq.property; 3456 ev.property = rq.property;
3408 } 3457 }
3409 else if (rq.target == xa[XA_MULTIPLE]) 3458 else if (rq.target == xa[XA_MULTIPLE])
3410 { 3459 {
3411 /* TODO: Handle MULTIPLE */ 3460 /* TODO: Handle MULTIPLE */
3412 } 3461 }
3413 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3462 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3414 { 3463 {
3415 XChangeProperty(display->display, rq.requestor, rq.property, XA_INTEGER, 3464 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3416 (8 * sizeof(Time)), PropModeReplace, 3465 (8 * sizeof (Time)), PropModeReplace,
3417 (unsigned char *)&selection_time, 1); 3466 (unsigned char *)&selection_time, 1);
3418 ev.property = rq.property; 3467 ev.property = rq.property;
3419 } 3468 }
3420 else if (rq.target == XA_STRING 3469 else if (rq.target == XA_STRING
3421 || rq.target == xa[XA_TEXT] 3470 || rq.target == xa[XA_TEXT]
3423 || rq.target == xa[XA_UTF8_STRING] 3472 || rq.target == xa[XA_UTF8_STRING]
3424 ) 3473 )
3425 { 3474 {
3426 short freect = 0; 3475 short freect = 0;
3427 int selectlen; 3476 int selectlen;
3428 char *cl; 3477 wchar_t *cl;
3429 3478
3430 target = rq.target; 3479 target = rq.target;
3431 3480
3432 if (target == XA_STRING) 3481 if (target == XA_STRING)
3433 // we actually don't do XA_STRING, but who cares, as i18n clients 3482 // we actually don't do XA_STRING, but who cares, as i18n clients
3434 // will ask for another format anyways. 3483 // will ask for another format anyways.
3435 style = XStringStyle; 3484 style = XStringStyle;
3436 else if (target == xa[XA_TEXT]) 3485 else if (target == xa[XA_TEXT])
3437 style = XTextStyle; 3486 style = XStdICCTextStyle;
3438 else if (target == xa[XA_COMPOUND_TEXT]) 3487 else if (target == xa[XA_COMPOUND_TEXT])
3439 style = XCompoundTextStyle; 3488 style = XCompoundTextStyle;
3440#if X_HAVE_UTF8_STRING 3489#if X_HAVE_UTF8_STRING
3441 else if (target == xa[XA_UTF8_STRING]) 3490 else if (target == xa[XA_UTF8_STRING])
3442 style = XUTF8StringStyle; 3491 style = XUTF8StringStyle;
3447 style = XCompoundTextStyle; 3496 style = XCompoundTextStyle;
3448 } 3497 }
3449 3498
3450 if (selection.text) 3499 if (selection.text)
3451 { 3500 {
3452 cl = (char *)selection.text; 3501 cl = selection.text;
3453 selectlen = selection.len; 3502 selectlen = selection.len;
3454 } 3503 }
3455 else 3504 else
3456 { 3505 {
3457 cl = ""; 3506 cl = L"";
3458 selectlen = 0; 3507 selectlen = 0;
3459 } 3508 }
3460 3509
3510 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3511 // manually for XUTF8StringStyle.
3461 if (XmbTextListToTextProperty(display->display, &cl, 1, style, &ct) >= 0) 3512 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3462 freect = 1; 3513 freect = 1;
3463 else 3514 else
3464 { 3515 {
3465 /* if we failed to convert then send it raw */ 3516 /* if we failed to convert then send it raw */
3466 ct.value = (unsigned char *)cl; 3517 ct.value = (unsigned char *)cl;
3473 ev.property = rq.property; 3524 ev.property = rq.property;
3474 3525
3475 if (freect) 3526 if (freect)
3476 XFree (ct.value); 3527 XFree (ct.value);
3477 } 3528 }
3529
3478 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3530 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3479} 3531}
3480 3532
3481/* ------------------------------------------------------------------------- * 3533/* ------------------------------------------------------------------------- *
3482 * MOUSE ROUTINES * 3534 * MOUSE ROUTINES *
3486 * return col/row values corresponding to x/y pixel values 3538 * return col/row values corresponding to x/y pixel values
3487 */ 3539 */
3488void 3540void
3489rxvt_term::pixel_position (int *x, int *y) 3541rxvt_term::pixel_position (int *x, int *y)
3490{ 3542{
3491 *x = Pixel2Col(*x); 3543 *x = Pixel2Col (*x);
3492 /* MAX_IT(*x, 0); MIN_IT(*x, (int)TermWin.ncol - 1); */ 3544 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3493 *y = Pixel2Row(*y); 3545 *y = Pixel2Row (*y);
3494 /* MAX_IT(*y, 0); MIN_IT(*y, (int)TermWin.nrow - 1); */ 3546 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3495} 3547}
3496 3548
3497/* ------------------------------------------------------------------------- */ 3549/* ------------------------------------------------------------------------- */
3498#ifdef USE_XIM 3550#ifdef USE_XIM
3499void 3551void
3500rxvt_term::set_position (XPoint *pos) 3552rxvt_term::im_set_position (XPoint *pos)
3501{ 3553{
3502 XWindowAttributes xwa; 3554 XWindowAttributes xwa;
3503 3555
3504 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3556 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3505 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3557 pos->x = Col2Pixel (screen.cur.col) + xwa.x;
3512/* ------------------------------------------------------------------------- * 3564/* ------------------------------------------------------------------------- *
3513 * DEBUG ROUTINES * 3565 * DEBUG ROUTINES *
3514 * ------------------------------------------------------------------------- */ 3566 * ------------------------------------------------------------------------- */
3515#if 0 3567#if 0
3516void 3568void
3517rxvt_debug_colors(void) 3569rxvt_debug_colors (void)
3518{ 3570{
3519 int color; 3571 int color;
3520 const char *name[] = 3572 const char *name[] =
3521 { 3573 {
3522 "fg", "bg", 3574 "fg", "bg",
3523 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" 3575 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3524 }; 3576 };
3525 3577
3526 fprintf(stderr, "Color ( "); 3578 fprintf (stderr, "Color ( ");
3527 if (rstyle & RS_RVid) 3579 if (rstyle & RS_RVid)
3528 fprintf(stderr, "rvid "); 3580 fprintf (stderr, "rvid ");
3529 if (rstyle & RS_Bold) 3581 if (rstyle & RS_Bold)
3530 fprintf(stderr, "bold "); 3582 fprintf (stderr, "bold ");
3531 if (rstyle & RS_Blink) 3583 if (rstyle & RS_Blink)
3532 fprintf(stderr, "blink "); 3584 fprintf (stderr, "blink ");
3533 if (rstyle & RS_Uline) 3585 if (rstyle & RS_Uline)
3534 fprintf(stderr, "uline "); 3586 fprintf (stderr, "uline ");
3535 fprintf(stderr, "): "); 3587 fprintf (stderr, "): ");
3536 3588
3537 color = GET_FGCOLOR(rstyle); 3589 color = GET_FGCOLOR (rstyle);
3538#ifndef NO_BRIGHTCOLOR 3590#ifndef NO_BRIGHTCOLOR
3539 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) 3591 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3540 { 3592 {
3541 color -= (minBrightCOLOR - minCOLOR); 3593 color -= (minBrightCOLOR - minCOLOR);
3542 fprintf(stderr, "bright "); 3594 fprintf (stderr, "bright ");
3543 } 3595 }
3544#endif 3596#endif
3545 fprintf(stderr, "%s on ", name[color]); 3597 fprintf (stderr, "%s on ", name[color]);
3546 3598
3547 color = GET_BGCOLOR(rstyle); 3599 color = GET_BGCOLOR (rstyle);
3548#ifndef NO_BRIGHTCOLOR 3600#ifndef NO_BRIGHTCOLOR
3549 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) 3601 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3550 { 3602 {
3551 color -= (minBrightCOLOR - minCOLOR); 3603 color -= (minBrightCOLOR - minCOLOR);
3552 fprintf(stderr, "bright "); 3604 fprintf (stderr, "bright ");
3553 } 3605 }
3554#endif 3606#endif
3555 fprintf(stderr, "%s\n", name[color]); 3607 fprintf (stderr, "%s\n", name[color]);
3556} 3608}
3557#endif 3609#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines