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.22 by pcg, Sat Jan 31 02:14:58 2004 UTC vs.
Revision 1.136 by root, Tue Sep 7 21:05:41 2004 UTC

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

Diff Legend

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