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.13 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

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