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.28 by pcg, Tue Feb 10 00:40:39 2004 UTC vs.
Revision 1.143 by root, Sat Dec 4 04:06:03 2004 UTC

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

Diff Legend

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