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

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

Diff Legend

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