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

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

Diff Legend

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