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.15 by pcg, Fri Jan 16 16:34:56 2004 UTC vs.
Revision 1.71 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

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