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.16 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC

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

Diff Legend

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