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.23 by pcg, Sat Jan 31 02:31:17 2004 UTC vs.
Revision 1.129 by root, Wed Aug 25 03:52:09 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 else if (screen.cur.row > 0
996 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
997 {
998 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
999 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
1000 }
920 else 1001 else
921 (void)0; /* handle combining character etc. here. */ 1002 continue;
922 }
923 1003
1004 // handle double-width-chars by making them look extremely ugly
1005 if (*tp == NOCHAR)
1006 {
1007 // hack //D //TODO //--tp, --rp;
1008 *tp = ' ';
1009 *rp &= ~RS_baseattrMask;
1010 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1011 }
1012
1013 // first try to find a precomposed character
1014 unicode_t n = rxvt_compose (*tp, c);
1015 if (n == NOCHAR)
1016 n = rxvt_composite.compose (*tp, c);
1017
1018 *tp = n;
1019 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1020#endif
1021 }
1022 }
1023
924 if (screen.tlen[row] != -1) /* XXX: think about this */ 1024 if (screen.tlen[row] != -1) /* XXX: think about this */
925 MAX_IT(screen.tlen[row], screen.cur.col); 1025 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 1026
935#ifdef DEBUG_STRICT 1027#ifdef DEBUG_STRICT
936 assert(screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
937#else /* drive with your eyes closed */ 1029#else /* drive with your eyes closed */
938 MAX_IT(screen.cur.row, 0); 1030 MAX_IT (screen.cur.row, 0);
939#endif 1031#endif
940} 1032}
941 1033
942/* ------------------------------------------------------------------------- */ 1034/* ------------------------------------------------------------------------- */
943/* 1035/*
… …
945 * XTERM_SEQ: CTRL-H 1037 * XTERM_SEQ: CTRL-H
946 */ 1038 */
947void 1039void
948rxvt_term::scr_backspace () 1040rxvt_term::scr_backspace ()
949{ 1041{
950 want_refresh = 1; 1042 want_refresh = 1;
1043
951 if (screen.cur.col == 0) { 1044 if (screen.cur.col == 0)
1045 {
952 if (screen.cur.row > 0) { 1046 if (screen.cur.row > 0)
1047 {
953#ifdef TERMCAP_HAS_BW 1048#ifdef TERMCAP_HAS_BW
954 screen.cur.col = TermWin.ncol - 1; 1049 screen.cur.col = TermWin.ncol - 1;
955 screen.cur.row--; 1050 screen.cur.row--;
956 return; 1051 return;
957#endif 1052#endif
958 } 1053 }
1054 }
959 } else if ((screen.flags & Screen_WrapNext) == 0) 1055 else if (!(screen.flags & Screen_WrapNext))
960 scr_gotorc (0, -1, RELATIVE); 1056 scr_gotorc (0, -1, RELATIVE);
1057
961 screen.flags &= ~Screen_WrapNext; 1058 screen.flags &= ~Screen_WrapNext;
962} 1059}
963 1060
964/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
965/* 1062/*
966 * Process Horizontal Tab 1063 * Process Horizontal Tab
967 * count: +ve = forward; -ve = backwards 1064 * count: +ve = forward; -ve = backwards
968 * XTERM_SEQ: CTRL-I 1065 * XTERM_SEQ: CTRL-I
969 */ 1066 */
970void 1067void
971rxvt_term::scr_tab (int count) 1068rxvt_term::scr_tab (int count, bool ht)
972{ 1069{
973 int i, x; 1070 int i, x;
974 1071
975 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count));
976 want_refresh = 1; 1072 want_refresh = 1;
977 i = x = screen.cur.col; 1073 i = x = screen.cur.col;
1074
978 if (count == 0) 1075 if (count == 0)
979 return; 1076 return;
980 else if (count > 0) { 1077 else if (count > 0)
1078 {
1079 int row = TermWin.saveLines + screen.cur.row;
1080 text_t *tp = screen.text[row];
1081 rend_t *rp = screen.rend[row];
1082 rend_t base_rend = rp[i];
1083 ht &= tp[i] == ' ';
1084
981 for (; ++i < TermWin.ncol; ) 1085 for (; ++i < TermWin.ncol; )
982 if (tabs[i]) { 1086 if (tabs[i])
1087 {
983 x = i; 1088 x = i;
984 if (!--count) 1089 if (!--count)
985 break; 1090 break;
1091 }
1092 else
1093 ht &= tp[i] == ' '
1094 && RS_SAME (rp[i], base_rend);
1095
1096 if (count)
1097 x = TermWin.ncol - 1;
1098
1099 // store horizontal tab commands as characters inside the text
1100 // buffer so they can be selected and pasted.
1101 if (ht)
1102 {
1103 base_rend = SET_FONT (base_rend, 0);
1104
1105 if (screen.tlen[row] != -1) /* XXX: think about this */
1106 MAX_IT (screen.tlen[row], x);
1107
1108 i = screen.cur.col;
1109
1110 tp[i] = '\t';
1111 rp[i] = base_rend;
1112
1113 while (++i < x)
1114 {
1115 tp[i] = NOCHAR;
1116 rp[i] = base_rend;
986 } 1117 }
987 if (count) 1118 }
988 x = TermWin.ncol - 1; 1119 }
989 } else /* if (count < 0) */ { 1120 else /* if (count < 0) */
1121 {
990 for (; --i >= 0; ) 1122 for (; --i >= 0; )
991 if (tabs[i]) { 1123 if (tabs[i])
992 x = i;
993 if (!++count)
994 break;
995 } 1124 {
996 if (count)
997 x = 0; 1125 x = i;
1126 if (!++count)
1127 break;
1128 }
1129
1130 if (count)
1131 x = 0;
998 } 1132 }
1133
999 if (x != screen.cur.col) 1134 if (x != screen.cur.col)
1000 scr_gotorc (0, x, R_RELATIVE); 1135 scr_gotorc (0, x, R_RELATIVE);
1001} 1136}
1002 1137
1003/* ------------------------------------------------------------------------- */ 1138/* ------------------------------------------------------------------------- */
1004/* 1139/*
1005 * Process DEC Back Index 1140 * Process DEC Back Index
1006 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1007 * Move cursor left in row. If we're at the left boundary, shift everything 1142 * Move cursor left in row. If we're at the left boundary, shift everything
1008 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1009 */ 1144 */
1010#ifndef NO_FRILLS 1145#if ENABLE_FRILLS
1011void 1146void
1012rxvt_term::scr_backindex () 1147rxvt_term::scr_backindex ()
1013{ 1148{
1014 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1015 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1016 else { 1151 else
1152 {
1017 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1153 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1018 return; /* um, yeah? */ 1154 return; /* um, yeah? */
1155
1019 scr_insdel_chars (1, INSERT); 1156 scr_insdel_chars (1, INSERT);
1020 } 1157 }
1021} 1158}
1022#endif 1159#endif
1023/* ------------------------------------------------------------------------- */ 1160/* ------------------------------------------------------------------------- */
1024/* 1161/*
1025 * Process DEC Forward Index 1162 * Process DEC Forward Index
1026 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1027 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1028 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1029 */ 1166 */
1030#ifndef NO_FRILLS 1167#if ENABLE_FRILLS
1031void 1168void
1032rxvt_term::scr_forwardindex () 1169rxvt_term::scr_forwardindex ()
1033{ 1170{
1034 int row; 1171 int row;
1035 1172
1036 if (screen.cur.col < TermWin.ncol - 1) 1173 if (screen.cur.col < TermWin.ncol - 1)
1037 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1038 else { 1175 else
1176 {
1039 row = screen.cur.row + TermWin.saveLines; 1177 row = screen.cur.row + TermWin.saveLines;
1178
1040 if (screen.tlen[row] == 0) 1179 if (screen.tlen[row] == 0)
1041 return; /* um, yeah? */ 1180 return; /* um, yeah? */
1042 else if (screen.tlen[row] == -1) 1181 else if (screen.tlen[row] == -1)
1043 screen.tlen[row] = TermWin.ncol; 1182 screen.tlen[row] = TermWin.ncol;
1183
1044 scr_gotorc (0, 0, R_RELATIVE); 1184 scr_gotorc (0, 0, R_RELATIVE);
1045 scr_insdel_chars (1, DELETE); 1185 scr_insdel_chars (1, DELETE);
1046 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1186 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1047 } 1187 }
1048} 1188}
1049#endif 1189#endif
1050 1190
1051/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
… …
1053 * Goto Row/Column 1193 * Goto Row/Column
1054 */ 1194 */
1055void 1195void
1056rxvt_term::scr_gotorc (int row, int col, int relative) 1196rxvt_term::scr_gotorc (int row, int col, int relative)
1057{ 1197{
1058 want_refresh = 1; 1198 want_refresh = 1;
1059 ZERO_SCROLLBACK(); 1199 ZERO_SCROLLBACK ();
1060#ifdef RXVT_GRAPHICS
1061 if (Gr_Displayed ())
1062 Gr_scroll (0);
1063#endif
1064 1200
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) 1201 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1068 : col);
1069 MAX_IT(screen.cur.col, 0); 1202 MAX_IT (screen.cur.col, 0);
1070 MIN_IT(screen.cur.col, (int32_t)TermWin.ncol - 1); 1203 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1071 1204
1072 screen.flags &= ~Screen_WrapNext; 1205 screen.flags &= ~Screen_WrapNext;
1206
1073 if (relative & R_RELATIVE) { 1207 if (relative & R_RELATIVE)
1208 {
1074 if (row > 0) { 1209 if (row > 0)
1210 {
1075 if (screen.cur.row <= screen.bscroll 1211 if (screen.cur.row <= screen.bscroll
1076 && (screen.cur.row + row) > screen.bscroll) 1212 && (screen.cur.row + row) > screen.bscroll)
1077 screen.cur.row = screen.bscroll; 1213 screen.cur.row = screen.bscroll;
1078 else 1214 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; 1215 screen.cur.row += row;
1216 }
1217 else if (row < 0)
1218 {
1219 if (screen.cur.row >= screen.tscroll
1220 && (screen.cur.row + row) < screen.tscroll)
1221 screen.cur.row = screen.tscroll;
1222 else
1223 screen.cur.row += row;
1224 }
1225 }
1226 else
1093 } 1227 {
1228 if (screen.flags & Screen_Relative)
1229 { /* relative origin mode */
1230 screen.cur.row = row + screen.tscroll;
1231 MIN_IT (screen.cur.row, screen.bscroll);
1232 }
1233 else
1234 screen.cur.row = row;
1235 }
1236
1094 MAX_IT(screen.cur.row, 0); 1237 MAX_IT (screen.cur.row, 0);
1095 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1238 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1096} 1239}
1097 1240
1098/* ------------------------------------------------------------------------- */ 1241/* ------------------------------------------------------------------------- */
1099/* 1242/*
1100 * direction should be UP or DN 1243 * direction should be UP or DN
1101 */ 1244 */
1102void 1245void
1103rxvt_term::scr_index (enum page_dirn direction) 1246rxvt_term::scr_index (enum page_dirn direction)
1104{ 1247{
1105 int dirn; 1248 int dirn;
1106 1249
1107 want_refresh = 1; 1250 want_refresh = 1;
1251 ZERO_SCROLLBACK ();
1252
1108 dirn = ((direction == UP) ? 1 : -1); 1253 dirn = ((direction == UP) ? 1 : -1);
1109 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn));
1110 1254
1111 ZERO_SCROLLBACK();
1112
1113#ifdef RXVT_GRAPHICS
1114 if (Gr_Displayed ())
1115 Gr_scroll (0);
1116#endif
1117
1118 screen.flags &= ~Screen_WrapNext; 1255 screen.flags &= ~Screen_WrapNext;
1256
1119 if ((screen.cur.row == screen.bscroll && direction == UP) 1257 if ((screen.cur.row == screen.bscroll && direction == UP)
1120 || (screen.cur.row == screen.tscroll && direction == DN)) 1258 || (screen.cur.row == screen.tscroll && direction == DN))
1121 scr_scroll_text(screen.tscroll, screen.bscroll, dirn, 0); 1259 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1122 else 1260 else
1123 screen.cur.row += dirn; 1261 screen.cur.row += dirn;
1262
1124 MAX_IT(screen.cur.row, 0); 1263 MAX_IT (screen.cur.row, 0);
1125 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1264 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1126 selection_check (0); 1265 selection_check (0);
1127} 1266}
1128 1267
1129/* ------------------------------------------------------------------------- */ 1268/* ------------------------------------------------------------------------- */
1130/* 1269/*
1131 * Erase part or whole of a line 1270 * Erase part or whole of a line
… …
1137rxvt_term::scr_erase_line (int mode) 1276rxvt_term::scr_erase_line (int mode)
1138{ 1277{
1139 unsigned int row, col, num; 1278 unsigned int row, col, num;
1140 1279
1141 want_refresh = 1; 1280 want_refresh = 1;
1142 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, screen.cur.row));
1143 ZERO_SCROLLBACK (); 1281 ZERO_SCROLLBACK ();
1144 1282
1145#ifdef RXVT_GRAPHICS
1146 if (Gr_Displayed ())
1147 Gr_scroll (0);
1148#endif
1149
1150 selection_check (1); 1283 selection_check (1);
1151
1152 screen.flags &= ~Screen_WrapNext;
1153 1284
1154 row = TermWin.saveLines + screen.cur.row; 1285 row = TermWin.saveLines + screen.cur.row;
1155 switch (mode) 1286 switch (mode)
1156 { 1287 {
1157 case 0: /* erase to end of line */ 1288 case 0: /* erase to end of line */
1158 col = screen.cur.col; 1289 col = screen.cur.col;
1159 num = TermWin.ncol - col; 1290 num = TermWin.ncol - col;
1160 MIN_IT(screen.tlen[row], (int16_t)col); 1291 MIN_IT (screen.tlen[row], (int16_t)col);
1161 if (ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur) 1292 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1162 || ROWCOL_IN_ROW_AT_OR_AFTER(selection.end, screen.cur)) 1293 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1163 CLEAR_SELECTION(); 1294 CLEAR_SELECTION ();
1164 break; 1295 break;
1165 case 1: /* erase to beginning of line */ 1296 case 1: /* erase to beginning of line */
1166 col = 0; 1297 col = 0;
1167 num = screen.cur.col + 1; 1298 num = screen.cur.col + 1;
1168 if (ROWCOL_IN_ROW_AT_OR_BEFORE(selection.beg, screen.cur) 1299 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1169 || ROWCOL_IN_ROW_AT_OR_BEFORE(selection.end, screen.cur)) 1300 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1170 CLEAR_SELECTION(); 1301 CLEAR_SELECTION ();
1171 break; 1302 break;
1172 case 2: /* erase whole line */ 1303 case 2: /* erase whole line */
1173 col = 0; 1304 col = 0;
1174 num = TermWin.ncol; 1305 num = TermWin.ncol;
1175 screen.tlen[row] = 0; 1306 screen.tlen[row] = 0;
1176 if (selection.beg.row <= screen.cur.row 1307 if (selection.beg.row <= screen.cur.row
1177 && selection.end.row >= screen.cur.row) 1308 && selection.end.row >= screen.cur.row)
1178 CLEAR_SELECTION(); 1309 CLEAR_SELECTION ();
1179 break; 1310 break;
1180 default: 1311 default:
1181 return; 1312 return;
1182 } 1313 }
1183 1314
1184 if (screen.text[row]) 1315 if (screen.text[row])
1185 scr_blank_line (&(screen.text[row][col]), 1316 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1186 &(screen.rend[row][col]), num, rstyle);
1187 else 1317 else
1188 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1318 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1189} 1319}
1190 1320
1191/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
… …
1196 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1326 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1197 */ 1327 */
1198void 1328void
1199rxvt_term::scr_erase_screen (int mode) 1329rxvt_term::scr_erase_screen (int mode)
1200{ 1330{
1201 int num; 1331 int num;
1202 int32_t row, row_offset; 1332 int32_t row, row_offset;
1203 rend_t ren; 1333 rend_t ren;
1204 XGCValues gcvalue; 1334 XGCValues gcvalue;
1205 1335
1206 want_refresh = 1; 1336 want_refresh = 1;
1207 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row));
1208 ZERO_SCROLLBACK (); 1337 ZERO_SCROLLBACK ();
1338
1209 row_offset = (int32_t)TermWin.saveLines; 1339 row_offset = (int32_t)TermWin.saveLines;
1210 1340
1211 switch (mode) { 1341 switch (mode)
1342 {
1212 case 0: /* erase to end of screen */ 1343 case 0: /* erase to end of screen */
1213 selection_check (1); 1344 selection_check (1);
1214 scr_erase_line (0); 1345 scr_erase_line (0);
1215 row = screen.cur.row + 1; /* possible OOB */ 1346 row = screen.cur.row + 1; /* possible OOB */
1216 num = TermWin.nrow - row; 1347 num = TermWin.nrow - row;
1217 break; 1348 break;
1218 case 1: /* erase to beginning of screen */ 1349 case 1: /* erase to beginning of screen */
1219 selection_check (3); 1350 selection_check (3);
1220 scr_erase_line (1); 1351 scr_erase_line (1);
1221 row = 0; 1352 row = 0;
1222 num = screen.cur.row; 1353 num = screen.cur.row;
1223 break; 1354 break;
1224 case 2: /* erase whole screen */ 1355 case 2: /* erase whole screen */
1225 selection_check (3); 1356 selection_check (3);
1226#ifdef RXVT_GRAPHICS
1227 Gr_ClearScreen ();
1228#endif
1229 row = 0; 1357 row = 0;
1230 num = TermWin.nrow; 1358 num = TermWin.nrow;
1231 break; 1359 break;
1232 default: 1360 default:
1233 return; 1361 return;
1234 } 1362 }
1235 refresh_type |= REFRESH_BOUNDS; 1363
1236 if (selection.op && current_screen == selection.screen 1364 if (selection.op && current_screen == selection.screen
1237 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1365 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1238 || (selection.end.row >= row 1366 || (selection.end.row >= row
1239 && selection.end.row <= row + num))) 1367 && selection.end.row <= row + num)))
1240 CLEAR_SELECTION (); 1368 CLEAR_SELECTION ();
1369
1241 if (row >= TermWin.nrow) /* Out Of Bounds */ 1370 if (row >= TermWin.nrow) /* Out Of Bounds */
1242 return; 1371 return;
1372
1243 MIN_IT(num, (TermWin.nrow - row)); 1373 MIN_IT (num, (TermWin.nrow - row));
1374
1244 if (rstyle & (RS_RVid | RS_Uline)) 1375 if (rstyle & (RS_RVid | RS_Uline))
1245 ren = (rend_t) ~RS_None; 1376 ren = (rend_t) ~RS_None;
1246 else if (GET_BASEBG(rstyle) == Color_bg) { 1377 else if (GET_BASEBG (rstyle) == Color_bg)
1378 {
1247 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1248 CLEAR_ROWS(row, num); 1380 CLEAR_ROWS (row, num);
1249 } else { 1381 }
1382 else
1383 {
1250 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1384 ren = (rstyle & (RS_fgMask | RS_bgMask));
1251 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; 1385 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1252 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1386 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1253 ERASE_ROWS(row, num); 1387 ERASE_ROWS (row, num);
1254 gcvalue.foreground = PixColors[Color_fg]; 1388 gcvalue.foreground = pix_colors[Color_fg];
1255 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1389 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1256 } 1390 }
1391
1257 for (; num--; row++) { 1392 for (; num--; row++)
1393 {
1258 scr_blank_screen_mem (screen.text, screen.rend, 1394 scr_blank_screen_mem (screen.text, screen.rend,
1259 (unsigned int)(row + row_offset), rstyle); 1395 (unsigned int) (row + row_offset), rstyle);
1260 screen.tlen[row + row_offset] = 0; 1396 screen.tlen[row + row_offset] = 0;
1261 scr_blank_line (drawn_text[row], drawn_rend[row], 1397 scr_blank_line (drawn_text[row], drawn_rend[row],
1262 (unsigned int)TermWin.ncol, ren); 1398 (unsigned int)TermWin.ncol, ren);
1263 } 1399 }
1264} 1400}
1265 1401
1266/* ------------------------------------------------------------------------- */ 1402/* ------------------------------------------------------------------------- */
1267/* 1403/*
… …
1269 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1405 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1270 */ 1406 */
1271void 1407void
1272rxvt_term::scr_E () 1408rxvt_term::scr_E ()
1273{ 1409{
1274 int i, j, k; 1410 int i, j, k;
1275 rend_t *r1, fs; 1411 rend_t *r1, fs;
1276 1412
1277 want_refresh = 1; 1413 want_refresh = 1;
1414 ZERO_SCROLLBACK ();
1415
1278 num_scr_allow = 0; 1416 num_scr_allow = 0;
1279 ZERO_SCROLLBACK();
1280 selection_check (3); 1417 selection_check (3);
1281 1418
1282 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1419 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1283 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) { 1420 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1421 {
1284 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1422 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1285 fill_text (screen.text[k], 'E', TermWin.ncol); 1423 fill_text (screen.text[k], 'E', TermWin.ncol);
1286 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1424 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1287 *r1++ = fs; 1425 *r1++ = fs;
1288 } 1426 }
1289} 1427}
1290 1428
1291/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1292/* 1430/*
1293 * Insert/Delete <count> lines 1431 * Insert/Delete <count> lines
1294 */ 1432 */
1295void 1433void
1296rxvt_term::scr_insdel_lines (int count, int insdel) 1434rxvt_term::scr_insdel_lines (int count, int insdel)
1297{ 1435{
1298 int end; 1436 int end;
1299 1437
1300 ZERO_SCROLLBACK(); 1438 ZERO_SCROLLBACK ();
1301 1439
1302#ifdef RXVT_GRAPHICS
1303 if (Gr_Displayed ())
1304 Gr_scroll (0);
1305#endif
1306
1307 selection_check (1); 1440 selection_check (1);
1308 1441
1309 if (screen.cur.row > screen.bscroll) 1442 if (screen.cur.row > screen.bscroll)
1443 return;
1444
1445 end = screen.bscroll - screen.cur.row + 1;
1446 if (count > end)
1447 {
1448 if (insdel == DELETE)
1310 return; 1449 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) 1450 else if (insdel == INSERT)
1317 count = end; 1451 count = end;
1318 } 1452 }
1319 screen.flags &= ~Screen_WrapNext;
1320 1453
1454 scr_do_wrap ();
1455
1321 scr_scroll_text(screen.cur.row, screen.bscroll, insdel * count, 0); 1456 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1322} 1457}
1323 1458
1324/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1325/* 1460/*
1326 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1327 */ 1462 */
1328void 1463void
1329rxvt_term::scr_insdel_chars (int count, int insdel) 1464rxvt_term::scr_insdel_chars (int count, int insdel)
1330{ 1465{
1331 int col, row; 1466 int col, row;
1332 rend_t tr; 1467 rend_t tr;
1333 text_t *stp; 1468 text_t *stp;
1334 rend_t *srp; 1469 rend_t *srp;
1335 int16_t *slp; 1470 int16_t *slp;
1336 1471
1337 want_refresh = 1; 1472 want_refresh = 1;
1338 ZERO_SCROLLBACK(); 1473 ZERO_SCROLLBACK ();
1339 1474
1340#ifdef RXVT_GRAPHICS
1341 if (Gr_Displayed ())
1342 Gr_scroll (0);
1343#endif
1344
1345 if (count <= 0) 1475 if (count <= 0)
1346 return; 1476 return;
1347 1477
1478 scr_do_wrap ();
1479
1348 selection_check (1); 1480 selection_check (1);
1349 MIN_IT(count, (TermWin.ncol - screen.cur.col)); 1481 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1350 1482
1351 row = screen.cur.row + TermWin.saveLines; 1483 row = screen.cur.row + TermWin.saveLines;
1352 screen.flags &= ~Screen_WrapNext;
1353 1484
1354 stp = screen.text[row]; 1485 stp = screen.text[row];
1355 srp = screen.rend[row]; 1486 srp = screen.rend[row];
1356 slp = &(screen.tlen[row]); 1487 slp = &screen.tlen[row];
1488
1357 switch (insdel) { 1489 switch (insdel)
1490 {
1358 case INSERT: 1491 case INSERT:
1359 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1492 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1360 col--) { 1493 col--)
1494 {
1361 stp[col] = stp[col - count]; 1495 stp[col] = stp[col - count];
1362 srp[col] = srp[col - count]; 1496 srp[col] = srp[col - count];
1363 } 1497 }
1498
1364 if (*slp != -1) { 1499 if (*slp != -1)
1500 {
1365 *slp += count; 1501 *slp += count;
1366 MIN_IT(*slp, TermWin.ncol); 1502 MIN_IT (*slp, TermWin.ncol);
1367 } 1503 }
1504
1368 if (selection.op && current_screen == selection.screen 1505 if (selection.op && current_screen == selection.screen
1369 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) { 1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 {
1370 if (selection.end.row != screen.cur.row 1508 if (selection.end.row != screen.cur.row
1371 || (selection.end.col + count >= TermWin.ncol)) 1509 || (selection.end.col + count >= TermWin.ncol))
1372 CLEAR_SELECTION(); 1510 CLEAR_SELECTION ();
1511 else
1373 else { /* shift selection */ 1512 { /* shift selection */
1374 selection.beg.col += count; 1513 selection.beg.col += count;
1375 selection.mark.col += count; /* XXX: yes? */ 1514 selection.mark.col += count; /* XXX: yes? */
1376 selection.end.col += count; 1515 selection.end.col += count;
1377 } 1516 }
1378 } 1517 }
1518
1379 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1519 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1380 (unsigned int)count, rstyle); 1520 (unsigned int)count, rstyle);
1381 break; 1521 break;
1522
1382 case ERASE: 1523 case ERASE:
1383 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1524 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1384 selection_check (1); 1525 selection_check (1);
1385 screen.cur.col -= count; 1526 screen.cur.col -= count;
1386 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1527 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1387 (unsigned int)count, rstyle); 1528 (unsigned int)count, rstyle);
1388 break; 1529 break;
1530
1389 case DELETE: 1531 case DELETE:
1390 tr = srp[TermWin.ncol - 1]
1391 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1533
1392 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) { 1534 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1535 {
1393 stp[col] = stp[col + count]; 1536 stp[col] = stp[col + count];
1394 srp[col] = srp[col + count]; 1537 srp[col] = srp[col + count];
1395 } 1538 }
1539
1396 scr_blank_line (&(stp[TermWin.ncol - count]), 1540 scr_blank_line (& (stp[TermWin.ncol - count]),
1397 &(srp[TermWin.ncol - count]), 1541 & (srp[TermWin.ncol - count]),
1398 (unsigned int)count, tr); 1542 (unsigned int)count, tr);
1543
1399 if (*slp == -1) /* break line continuation */ 1544 if (*slp == -1) /* break line continuation */
1400 *slp = TermWin.ncol; 1545 *slp = TermWin.ncol;
1546
1401 *slp -= count; 1547 *slp -= count;
1402 MAX_IT(*slp, 0); 1548 MAX_IT (*slp, 0);
1549
1403 if (selection.op && current_screen == selection.screen 1550 if (selection.op && current_screen == selection.screen
1404 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) { 1551 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1552 {
1405 if (selection.end.row != screen.cur.row 1553 if (selection.end.row != screen.cur.row
1406 || (screen.cur.col >= selection.beg.col - count) 1554 || (screen.cur.col >= selection.beg.col - count)
1407 || selection.end.col >= TermWin.ncol) 1555 || selection.end.col >= TermWin.ncol)
1408 CLEAR_SELECTION(); 1556 CLEAR_SELECTION ();
1409 else { 1557 else
1558 {
1410 /* shift selection */ 1559 /* shift selection */
1411 selection.beg.col -= count; 1560 selection.beg.col -= count;
1412 selection.mark.col -= count; /* XXX: yes? */ 1561 selection.mark.col -= count; /* XXX: yes? */
1413 selection.end.col -= count; 1562 selection.end.col -= count;
1414 } 1563 }
1415 } 1564 }
1565
1416 break; 1566 break;
1417 } 1567 }
1418} 1568}
1419 1569
1420/* ------------------------------------------------------------------------- */ 1570/* ------------------------------------------------------------------------- */
… …
1423 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1573 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1424 */ 1574 */
1425void 1575void
1426rxvt_term::scr_scroll_region (int top, int bot) 1576rxvt_term::scr_scroll_region (int top, int bot)
1427{ 1577{
1428 MAX_IT(top, 0); 1578 MAX_IT (top, 0);
1429 MIN_IT(bot, (int)TermWin.nrow - 1); 1579 MIN_IT (bot, (int)TermWin.nrow - 1);
1580
1430 if (top > bot) 1581 if (top > bot)
1431 return; 1582 return;
1583
1432 screen.tscroll = top; 1584 screen.tscroll = top;
1433 screen.bscroll = bot; 1585 screen.bscroll = bot;
1434 scr_gotorc (0, 0, 0); 1586 scr_gotorc (0, 0, 0);
1435} 1587}
1436 1588
1437/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1438/* 1590/*
1439 * Make the cursor visible/invisible 1591 * Make the cursor visible/invisible
… …
1441 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1593 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1442 */ 1594 */
1443void 1595void
1444rxvt_term::scr_cursor_visible (int mode) 1596rxvt_term::scr_cursor_visible (int mode)
1445{ 1597{
1446 want_refresh = 1; 1598 want_refresh = 1;
1599
1447 if (mode) 1600 if (mode)
1448 screen.flags |= Screen_VisibleCursor; 1601 screen.flags |= Screen_VisibleCursor;
1449 else 1602 else
1450 screen.flags &= ~Screen_VisibleCursor; 1603 screen.flags &= ~Screen_VisibleCursor;
1451} 1604}
1452 1605
1453/* ------------------------------------------------------------------------- */ 1606/* ------------------------------------------------------------------------- */
1454/* 1607/*
1455 * Set/unset automatic wrapping 1608 * Set/unset automatic wrapping
… …
1457 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1610 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1458 */ 1611 */
1459void 1612void
1460rxvt_term::scr_autowrap (int mode) 1613rxvt_term::scr_autowrap (int mode)
1461{ 1614{
1462 if (mode) 1615 if (mode)
1463 screen.flags |= Screen_Autowrap; 1616 screen.flags |= Screen_Autowrap;
1464 else 1617 else
1465 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1618 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1466} 1619}
1467 1620
1468/* ------------------------------------------------------------------------- */ 1621/* ------------------------------------------------------------------------- */
1469/* 1622/*
1470 * Set/unset margin origin mode 1623 * Set/unset margin origin mode
… …
1476 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1629 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1477 */ 1630 */
1478void 1631void
1479rxvt_term::scr_relative_origin (int mode) 1632rxvt_term::scr_relative_origin (int mode)
1480{ 1633{
1481 if (mode) 1634 if (mode)
1482 screen.flags |= Screen_Relative; 1635 screen.flags |= Screen_Relative;
1483 else 1636 else
1484 screen.flags &= ~Screen_Relative; 1637 screen.flags &= ~Screen_Relative;
1638
1485 scr_gotorc (0, 0, 0); 1639 scr_gotorc (0, 0, 0);
1486} 1640}
1487 1641
1488/* ------------------------------------------------------------------------- */ 1642/* ------------------------------------------------------------------------- */
1489/* 1643/*
1490 * Set insert/replace mode 1644 * Set insert/replace mode
… …
1492 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1646 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1493 */ 1647 */
1494void 1648void
1495rxvt_term::scr_insert_mode (int mode) 1649rxvt_term::scr_insert_mode (int mode)
1496{ 1650{
1497 if (mode) 1651 if (mode)
1498 screen.flags |= Screen_Insert; 1652 screen.flags |= Screen_Insert;
1499 else 1653 else
1500 screen.flags &= ~Screen_Insert; 1654 screen.flags &= ~Screen_Insert;
1501} 1655}
1502 1656
1503/* ------------------------------------------------------------------------- */ 1657/* ------------------------------------------------------------------------- */
1504/* 1658/*
1505 * Set/Unset tabs 1659 * Set/Unset tabs
… …
1508 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1662 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1509 */ 1663 */
1510void 1664void
1511rxvt_term::scr_set_tab (int mode) 1665rxvt_term::scr_set_tab (int mode)
1512{ 1666{
1513 if (mode < 0) 1667 if (mode < 0)
1514 MEMSET(tabs, 0, TermWin.ncol * sizeof(char)); 1668 memset (tabs, 0, TermWin.ncol * sizeof (char));
1515 else if (screen.cur.col < TermWin.ncol) 1669 else if (screen.cur.col < TermWin.ncol)
1516 tabs[screen.cur.col] = (mode ? 1 : 0); 1670 tabs[screen.cur.col] = (mode ? 1 : 0);
1517} 1671}
1518 1672
1519/* ------------------------------------------------------------------------- */ 1673/* ------------------------------------------------------------------------- */
1520/* 1674/*
1521 * Set reverse/normal video 1675 * Set reverse/normal video
… …
1523 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1677 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1524 */ 1678 */
1525void 1679void
1526rxvt_term::scr_rvideo_mode (int mode) 1680rxvt_term::scr_rvideo_mode (int mode)
1527{ 1681{
1528 XGCValues gcvalue; 1682 XGCValues gcvalue;
1529 1683
1530 if (rvideo != mode) { 1684 if (rvideo != mode)
1685 {
1531 rvideo = mode; 1686 rvideo = mode;
1532 SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1687 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1533#if defined(XPM_BACKGROUND) 1688#if XPM_BACKGROUND
1534 if (bgPixmap.pixmap == None) 1689 if (bgPixmap.pixmap == None)
1535#endif 1690#endif
1536#if defined(TRANSPARENT) 1691#if TRANSPARENT
1537 if (!(Options & Opt_transparent) || am_transparent == 0) 1692 if (! (options & Opt_transparent) || am_transparent == 0)
1538#endif 1693#endif
1539 XSetWindowBackground(Xdisplay, TermWin.vt, 1694 XSetWindowBackground (display->display, TermWin.vt,
1540 PixColors[Color_bg]); 1695 pix_colors[Color_bg]);
1541 1696
1542 gcvalue.foreground = PixColors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
1543 gcvalue.background = PixColors[Color_bg]; 1698 gcvalue.background = pix_colors[Color_bg];
1544 XChangeGC(Xdisplay, TermWin.gc, GCBackground | GCForeground, 1699 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1545 &gcvalue); 1700 &gcvalue);
1546 scr_clear (); 1701 scr_clear ();
1547 scr_touch (true); 1702 scr_touch (true);
1548 } 1703 }
1549} 1704}
1550 1705
1551/* ------------------------------------------------------------------------- */ 1706/* ------------------------------------------------------------------------- */
1552/* 1707/*
… …
1554 * XTERM_SEQ: Report position: ESC [ 6 n 1709 * XTERM_SEQ: Report position: ESC [ 6 n
1555 */ 1710 */
1556void 1711void
1557rxvt_term::scr_report_position () 1712rxvt_term::scr_report_position ()
1558{ 1713{
1559 tt_printf("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1714 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1560} 1715}
1561 1716
1562/* ------------------------------------------------------------------------- * 1717/* ------------------------------------------------------------------------- *
1563 * FONTS * 1718 * FONTS *
1564 * ------------------------------------------------------------------------- */ 1719 * ------------------------------------------------------------------------- */
… …
1567 * Set font style 1722 * Set font style
1568 */ 1723 */
1569void 1724void
1570rxvt_term::set_font_style () 1725rxvt_term::set_font_style ()
1571{ 1726{
1572 switch (charsets[screen.charset]) { 1727 switch (charsets[screen.charset])
1728 {
1573 case '0': /* DEC Special Character & Line Drawing Set */ 1729 case '0': /* DEC Special Character & Line Drawing Set */
1574 break; 1730 break;
1575 case 'A': /* United Kingdom (UK) */ 1731 case 'A': /* United Kingdom (UK) */
1576 break; 1732 break;
1577 case 'B': /* United States (USASCII) */ 1733 case 'B': /* United States (USASCII) */
1578 break; 1734 break;
1579 case '<': /* Multinational character set */ 1735 case '<': /* Multinational character set */
1580 break; 1736 break;
1581 case '5': /* Finnish character set */ 1737 case '5': /* Finnish character set */
1582 break; 1738 break;
1583 case 'C': /* Finnish character set */ 1739 case 'C': /* Finnish character set */
1584 break; 1740 break;
1585 case 'K': /* German character set */ 1741 case 'K': /* German character set */
1586 break; 1742 break;
1587 } 1743 }
1588} 1744}
1589 1745
1590/* ------------------------------------------------------------------------- */ 1746/* ------------------------------------------------------------------------- */
… …
1595 * XTERM_SEQ: Invoke G2 character set: ESC N 1751 * XTERM_SEQ: Invoke G2 character set: ESC N
1596 * XTERM_SEQ: Invoke G3 character set: ESC O 1752 * XTERM_SEQ: Invoke G3 character set: ESC O
1597 */ 1753 */
1598void 1754void
1599rxvt_term::scr_charset_choose (int set) 1755rxvt_term::scr_charset_choose (int set)
1600{ 1756 {
1601 screen.charset = set; 1757 screen.charset = set;
1602 set_font_style (); 1758 set_font_style ();
1603} 1759 }
1604 1760
1605/* ------------------------------------------------------------------------- */ 1761/* ------------------------------------------------------------------------- */
1606/* 1762/*
1607 * Set a font 1763 * Set a font
1608 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1764 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1611 * XTERM_SEQ: Set G3 character set: ESC + <C> 1767 * XTERM_SEQ: Set G3 character set: ESC + <C>
1612 * See set_font_style for possible values for <C> 1768 * See set_font_style for possible values for <C>
1613 */ 1769 */
1614void 1770void
1615rxvt_term::scr_charset_set (int set, unsigned int ch) 1771rxvt_term::scr_charset_set (int set, unsigned int ch)
1616{ 1772 {
1617 charsets[set] = (unsigned char)ch; 1773 charsets[set] = (unsigned char)ch;
1618 set_font_style (); 1774 set_font_style ();
1619} 1775 }
1620 1776
1621 1777
1622/* ------------------------------------------------------------------------- * 1778/* ------------------------------------------------------------------------- *
1623 * MAJOR SCREEN MANIPULATION * 1779 * MAJOR SCREEN MANIPULATION *
1624 * ------------------------------------------------------------------------- */ 1780 * ------------------------------------------------------------------------- */
… …
1649 1805
1650/* 1806/*
1651 * Refresh an area 1807 * Refresh an area
1652 */ 1808 */
1653enum { 1809enum {
1654 PART_BEG = 0, 1810 PART_BEG = 0,
1655 PART_END, 1811 PART_END,
1656 RC_COUNT 1812 RC_COUNT
1657}; 1813};
1658 1814
1659void 1815void
1660rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1816rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1661{ 1817{
… …
1663 row_col_t rc[RC_COUNT]; 1819 row_col_t rc[RC_COUNT];
1664 1820
1665 if (drawn_text == NULL) /* sanity check */ 1821 if (drawn_text == NULL) /* sanity check */
1666 return; 1822 return;
1667 1823
1824#ifndef NO_SLOW_LINK_SUPPORT
1825 if (refresh_type == FAST_REFRESH && !display->is_local)
1826 {
1827 y = 0;
1828 height = TermWin.height;
1829 }
1830#endif
1831
1668#ifdef DEBUG_STRICT 1832#ifdef DEBUG_STRICT
1669 x = max(x, (int)TermWin.int_bwidth); 1833 x = max (x, 0);
1670 x = min(x, (int)TermWin.width); 1834 x = min (x, (int)TermWin.width);
1671 y = max(y, (int)TermWin.int_bwidth); 1835 y = max (y, 0);
1672 y = min(y, (int)TermWin.height); 1836 y = min (y, (int)TermWin.height);
1673#endif 1837#endif
1674 1838
1675/* round down */ 1839 /* round down */
1676 rc[PART_BEG].col = Pixel2Col(x); 1840 rc[PART_BEG].col = Pixel2Col (x);
1677 rc[PART_BEG].row = Pixel2Row(y); 1841 rc[PART_BEG].row = Pixel2Row (y);
1678/* round up */ 1842 /* round up */
1679 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); 1843 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);
1680 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); 1844 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);
1681 1845
1682/* sanity checks */ 1846 /* sanity checks */
1683 for (i = PART_BEG; i < RC_COUNT; i++) 1847 for (i = PART_BEG; i < RC_COUNT; i++)
1684 { 1848 {
1685 MIN_IT(rc[i].col, TermWin.ncol - 1); 1849 MIN_IT (rc[i].col, TermWin.ncol - 1);
1686 MIN_IT(rc[i].row, TermWin.nrow - 1); 1850 MIN_IT (rc[i].row, TermWin.nrow - 1);
1687 } 1851 }
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 1852
1691 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1853 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1692 fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0, 1854 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1693 (rc[PART_END].col - rc[PART_BEG].col + 1));
1694 1855
1695 if (refresh) 1856 if (refresh)
1696 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1857 scr_refresh (SLOW_REFRESH);
1697} 1858}
1698 1859
1699/* ------------------------------------------------------------------------- */ 1860/* ------------------------------------------------------------------------- */
1700/* 1861/*
1701 * Refresh the entire screen 1862 * Refresh the entire screen
… …
1712 * the top of the screen 1873 * the top of the screen
1713 */ 1874 */
1714int 1875int
1715rxvt_term::scr_move_to (int y, int len) 1876rxvt_term::scr_move_to (int y, int len)
1716{ 1877{
1717 long p = 0; 1878 long p = 0;
1718 uint16_t oldviewstart; 1879 unsigned int oldviewstart;
1719 1880
1720 oldviewstart = TermWin.view_start; 1881 oldviewstart = TermWin.view_start;
1882
1721 if (y < len) { 1883 if (y < len)
1884 {
1722 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1885 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1723 p -= (long)(TermWin.nrow - 1); 1886 p -= (long) (TermWin.nrow - 1);
1724 p = max(p, 0); 1887 p = max (p, 0);
1725 } 1888 }
1889
1726 TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled); 1890 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 1891
1729 return scr_changeview (oldviewstart); 1892 return scr_changeview (oldviewstart);
1730} 1893}
1731 1894
1732/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1733/* 1896/*
1734 * Page the screen up/down nlines 1897 * Page the screen up/down nlines
1735 * direction should be UP or DN 1898 * direction should be UP or DN
1736 */ 1899 */
1737int 1900int
1738rxvt_term::scr_page (enum page_dirn direction, int nlines) 1901rxvt_term::scr_page (enum page_dirn direction, int nlines)
1739{ 1902{
1740 int n; 1903 int n;
1741 uint16_t oldviewstart; 1904 unsigned int oldviewstart;
1742 1905
1743 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1744#ifdef DEBUG_STRICT 1906#ifdef DEBUG_STRICT
1745 assert((nlines >= 0) && (nlines <= TermWin.nrow)); 1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1746#endif 1908#endif
1747 oldviewstart = TermWin.view_start; 1909 oldviewstart = TermWin.view_start;
1748 if (direction == UP) { 1910 if (direction == UP)
1911 {
1749 n = TermWin.view_start + nlines; 1912 n = TermWin.view_start + nlines;
1750 TermWin.view_start = min(n, TermWin.nscrolled); 1913 TermWin.view_start = min (n, TermWin.nscrolled);
1751 } else { 1914 }
1915 else
1916 {
1752 n = TermWin.view_start - nlines; 1917 n = TermWin.view_start - nlines;
1753 TermWin.view_start = max(n, 0); 1918 TermWin.view_start = max (n, 0);
1754 } 1919 }
1755 return scr_changeview (oldviewstart); 1920 return scr_changeview (oldviewstart);
1756} 1921}
1757 1922
1758int 1923int
1759rxvt_term::scr_changeview (uint16_t oldviewstart) 1924rxvt_term::scr_changeview (unsigned int oldviewstart)
1760{ 1925{
1761 if (TermWin.view_start != oldviewstart) { 1926 if (TermWin.view_start != oldviewstart)
1927 {
1762 want_refresh = 1; 1928 want_refresh = 1;
1763#ifdef RXVT_GRAPHICS
1764 if (Gr_Displayed ())
1765 Gr_scroll (0);
1766#endif
1767 num_scr -= (TermWin.view_start - oldviewstart); 1929 num_scr -= (TermWin.view_start - oldviewstart);
1768 } 1930 }
1931
1769 return (int)(TermWin.view_start - oldviewstart); 1932 return (int) (TermWin.view_start - oldviewstart);
1770} 1933}
1771 1934
1772/* ------------------------------------------------------------------------- */ 1935/* ------------------------------------------------------------------------- */
1773void 1936void
1774rxvt_term::scr_bell () 1937rxvt_term::scr_bell ()
1775{ 1938{
1776#ifndef NO_BELL 1939#ifndef NO_BELL
1777# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1778# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1779 if (Options & Opt_mapAlert) 1942 if (options & Opt_mapAlert)
1780# endif 1943# endif
1781 XMapWindow(Xdisplay, TermWin.parent[0]); 1944 XMapWindow (display->display, TermWin.parent[0]);
1782# endif 1945# endif
1783 if (Options & Opt_visualBell) { 1946 if (options & Opt_visualBell)
1947 {
1784 scr_rvideo_mode (!rvideo); /* refresh also done */ 1948 scr_rvideo_mode (!rvideo); /* refresh also done */
1785 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1950 }
1786 } else 1951 else
1787 XBell(Xdisplay, 0); 1952 XBell (display->display, 0);
1788#endif 1953#endif
1789} 1954}
1790 1955
1791/* ------------------------------------------------------------------------- */ 1956/* ------------------------------------------------------------------------- */
1792/* ARGSUSED */ 1957/* ARGSUSED */
1793void 1958void
1794rxvt_term::scr_printscreen (int fullhist) 1959rxvt_term::scr_printscreen (int fullhist)
1795{ 1960{
1796#ifdef PRINTPIPE 1961#ifdef PRINTPIPE
1797 int i, r1, nrows, row_offset; 1962 int i, r1, nrows, row_offset;
1798 text_t *t; 1963 FILE *fd;
1799 FILE *fd;
1800 1964
1801 if ((fd = popen_printer ()) == NULL) 1965 if ((fd = popen_printer ()) == NULL)
1802 return; 1966 return;
1967
1803 nrows = TermWin.nrow; 1968 nrows = TermWin.nrow;
1804 row_offset = TermWin.saveLines; 1969 row_offset = TermWin.saveLines;
1970
1805 if (!fullhist) 1971 if (!fullhist)
1806 row_offset -= TermWin.view_start; 1972 row_offset -= TermWin.view_start;
1807 else { 1973 else
1974 {
1808 nrows += TermWin.nscrolled; 1975 nrows += TermWin.nscrolled;
1809 row_offset -= TermWin.nscrolled; 1976 row_offset -= TermWin.nscrolled;
1810 } 1977 }
1811 1978
1979 wctomb (0, 0);
1980
1812 for (r1 = 0; r1 < nrows; r1++) { 1981 for (r1 = 0; r1 < nrows; r1++)
1982 {
1813 t = screen.text[r1 + row_offset]; 1983 text_t *tp = screen.text[r1 + row_offset];
1814 for (i = TermWin.ncol - 1; i >= 0; i--) 1984 int len = screen.tlen[r1 + row_offset];
1815 if (!isspace(t[i])) 1985
1816 break; 1986 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1817 fprintf(fd, "%.*s\n", (i + 1), t); 1987 {
1988 char mb[MB_LEN_MAX];
1989 text_t t = *tp++;
1990 if (t == NOCHAR)
1991 continue;
1992
1993 len = wctomb (mb, t);
1994
1995 if (len <= 0)
1996 {
1997 mb[0] = ' ';
1998 len = 1;
1999 }
2000
2001 fwrite (mb, 1, len, fd);
2002 }
2003
2004 fputc ('\n', fd);
1818 } 2005 }
2006
1819 pclose_printer (fd); 2007 pclose_printer (fd);
1820#endif 2008#endif
1821} 2009}
1822 2010
1823/* ------------------------------------------------------------------------- */ 2011/* ------------------------------------------------------------------------- */
1824/* 2012/*
… …
1826 * drawn_text/drawn_rend contain the screen information before the update. 2014 * drawn_text/drawn_rend contain the screen information before the update.
1827 * screen.text/screen.rend contain what the screen will change to. 2015 * screen.text/screen.rend contain what the screen will change to.
1828 */ 2016 */
1829 2017
1830#define FONT_WIDTH(X, Y) \ 2018#define FONT_WIDTH(X, Y) \
1831 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 2019 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1832#define FONT_RBEAR(X, Y) \ 2020#define FONT_RBEAR(X, Y) \
1833 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 2021 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1834#define FONT_LBEAR(X, Y) \ 2022#define FONT_LBEAR(X, Y) \
1835 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing 2023 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1836#define IS_FONT_CHAR(X, Y) \ 2024#define IS_FONT_CHAR(X, Y) \
1837 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 2025 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1838 2026
1839void 2027void
1840rxvt_term::scr_refresh (unsigned char refresh_type) 2028rxvt_term::scr_refresh (unsigned char refresh_type)
1841{ 2029{
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 */ 2030 unsigned char must_clear, /* use draw_string not draw_image_string */
1845 rvid, /* reverse video this position */
1846 showcursor; /* show the cursor */ 2031 showcursor; /* show the cursor */
1847 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1848 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1849 int cursorwidth;
1850 int i, /* tmp */ 2034 int i, /* tmp */
1851 row_offset; /* basic offset in screen structure */ 2035 row_offset; /* basic offset in screen structure */
1852#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
1853 rend_t cc1; /* store colours at cursor position(s) */ 2037 rend_t cc1; /* store colours at cursor position (s) */
1854#endif 2038#endif
1855 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2039 rend_t *crp; // cursor rendition pointer
1856 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1857 2040
1858 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2041 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1859 return; 2042 return;
1860 2043
1861 /* 2044 /*
1862 * A: set up vars 2045 * A: set up vars
1863 */ 2046 */
1864 clearfirst = clearlast = must_clear = 0; 2047 must_clear = 0;
1865
1866 refresh_count = 0; 2048 refresh_count = 0;
1867 2049
1868 row_offset = TermWin.saveLines - TermWin.view_start; 2050 row_offset = TermWin.saveLines - TermWin.view_start;
1869 2051
1870 if ((refresh_type & REFRESH_BOUNDS)) 2052#if XPM_BACKGROUND
2053 must_clear |= (bgPixmap.pixmap != None);
2054#endif
2055#if TRANSPARENT
2056 must_clear |= ((options & Opt_transparent) && am_transparent);
2057#endif
2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2059
2060 /*
2061 * B: reverse any characters which are selected
2062 */
2063 scr_reverse_selection ();
2064
2065 /*
2066 * C: set the cursor character (s)
2067 */
2068 {
2069 unsigned char setoldcursor;
2070 rend_t ccol1, /* Cursor colour */
2071 ccol2; /* Cursor colour2 */
2072
2073 showcursor = (screen.flags & Screen_VisibleCursor);
2074#ifdef CURSOR_BLINK
2075 if (hidden_cursor)
2076 showcursor = 0;
2077#endif
2078
2079 if (showcursor)
1871 { 2080 {
1872 clearfirst = clearlast = 1; 2081 int col = screen.cur.col;
1873 refresh_type &= ~REFRESH_BOUNDS;
1874 }
1875 2082
1876#ifdef XPM_BACKGROUND 2083 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
1877 must_clear |= (bgPixmap.pixmap != None); 2084 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 2085
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] 2086 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1911 [screen.cur.col]);
1912 2087
1913 if (showcursor && TermWin.focus) 2088 if (showcursor && TermWin.focus)
1914 { 2089 {
1915 *srp ^= RS_RVid; 2090 *crp ^= RS_RVid;
1916#ifndef NO_CURSORCOLOR 2091#ifndef NO_CURSORCOLOR
1917 cc1 = *srp & (RS_fgMask | RS_bgMask); 2092 cc1 = *crp & (RS_fgMask | RS_bgMask);
1918 if (ISSET_PIXCOLOR (Color_cursor)) 2093 if (ISSET_PIXCOLOR (Color_cursor))
1919 ccol1 = Color_cursor; 2094 ccol1 = Color_cursor;
1920 else 2095 else
1921#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2096#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1922 ccol1 = GET_FGCOLOR(rstyle); 2097 ccol1 = GET_FGCOLOR (rstyle);
1923#else 2098#else
1924 ccol1 = Color_fg; 2099 ccol1 = Color_fg;
1925#endif 2100#endif
1926 if (ISSET_PIXCOLOR (Color_cursor2)) 2101 if (ISSET_PIXCOLOR (Color_cursor2))
1927 ccol2 = Color_cursor2; 2102 ccol2 = Color_cursor2;
1928 else 2103 else
1929#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1930 ccol2 = GET_BGCOLOR(rstyle); 2105 ccol2 = GET_BGCOLOR (rstyle);
1931#else 2106#else
1932 ccol2 = Color_bg; 2107 ccol2 = Color_bg;
1933#endif 2108#endif
1934 *srp = SET_FGCOLOR(*srp, ccol1); 2109 *crp = SET_FGCOLOR (*crp, ccol1);
1935 *srp = SET_BGCOLOR(*srp, ccol2); 2110 *crp = SET_BGCOLOR (*crp, ccol2);
1936#endif 2111#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 } 2112 }
1963 } 2113 }
2114
2115 /* make sure no outline cursor is left around */
2116 setoldcursor = 0;
2117 if (ocrow != -1)
2118 {
2119 if (screen.cur.row + TermWin.view_start != ocrow
2120 || screen.cur.col != oldcursor.col)
2121 {
2122 if (ocrow < TermWin.nrow
2123 && oldcursor.col < TermWin.ncol)
2124 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2125
2126 if (TermWin.focus || !showcursor)
2127 oldcursor.row = -1;
2128 else
2129 setoldcursor = 1;
2130 }
1964 } 2131 }
2132 else if (!TermWin.focus)
2133 setoldcursor = 1;
2134
2135 if (setoldcursor)
2136 {
2137 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2138 oldcursor.row = -1;
2139 else
2140 {
2141 oldcursor.row = screen.cur.row + TermWin.view_start;
2142 oldcursor.col = screen.cur.col;
2143 }
2144 }
2145 }
2146
2147#if ENABLE_OVERLAY
2148 scr_swap_overlay ();
2149#endif
2150
2151 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2152 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1965 2153
1966#ifndef NO_SLOW_LINK_SUPPORT 2154#ifndef NO_SLOW_LINK_SUPPORT
1967 /* 2155 /*
1968 * D: CopyArea pass - very useful for slower links 2156 * D: CopyArea pass - very useful for slower links
1969 * This has been deliberately kept simple. 2157 * This has been deliberately kept simple.
1970 */ 2158 */
1971 i = num_scr; 2159 i = num_scr;
2160 if (!display->is_local
1972 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2161 && refresh_type == FAST_REFRESH && num_scr_allow && i
1973 && abs(i) < TermWin.nrow && !must_clear) 2162 && abs (i) < TermWin.nrow && !must_clear)
1974 { 2163 {
1975 int16_t nits; 2164 int16_t nits;
1976 int j; 2165 int j;
1977 rend_t *drp2; 2166 int len, wlen;
1978 text_t *dtp2;
1979 int len, wlen;
1980 2167
1981 j = TermWin.nrow; 2168 j = TermWin.nrow;
1982 wlen = len = -1; 2169 wlen = len = -1;
1983 row = i > 0 ? 0 : j - 1; 2170 row = i > 0 ? 0 : j - 1;
1984 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2171 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1985 { 2172 {
1986 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2173 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
1987 { 2174 {
1988 stp = screen.text[row + row_offset]; 2175 text_t *stp = screen.text[row + row_offset];
1989 srp = screen.rend[row + row_offset]; 2176 rend_t *srp = screen.rend[row + row_offset];
1990 dtp = drawn_text[row]; 2177 text_t *dtp = drawn_text[row];
1991 dtp2 = drawn_text[row + i]; 2178 text_t *dtp2 = drawn_text[row + i];
1992 drp = drawn_rend[row]; 2179 rend_t *drp = drawn_rend[row];
1993 drp2 = drawn_rend[row + i]; 2180 rend_t *drp2 = drawn_rend[row + i];
1994 2181
1995 for (nits = 0, col = TermWin.ncol; col--; ) 2182 for (nits = 0, col = TermWin.ncol; col--; )
1996 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2183 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
1997 nits--; 2184 nits--;
1998 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2185 else if (stp[col] != dtp[col] || srp[col] != drp[col])
1999 nits++; 2186 nits++;
2000 2187
2001 if (nits > 8) /* XXX: arbitrary choice */ 2188 if (nits > 8) /* XXX: arbitrary choice */
2002 { 2189 {
2003 for (col = TermWin.ncol; col--; ) 2190 for (col = TermWin.ncol; col--; )
2191 {
2192 *dtp++ = *dtp2++;
2193 *drp++ = *drp2++;
2194 }
2195
2196 if (len == -1)
2197 len = row;
2198
2199 wlen = row;
2200 continue;
2201 }
2202 }
2203
2204 if (len != -1)
2205 {
2206 /* also comes here at end if needed because of >= above */
2207 if (wlen < len)
2208 SWAP_IT (wlen, len, int);
2209
2210 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2211 TermWin.gc, 0, Row2Pixel (len + i),
2212 (unsigned int)TermWin_TotalWidth (),
2213 (unsigned int)Height2Pixel (wlen - len + 1),
2214 0, Row2Pixel (len));
2215 len = -1;
2216 }
2217 }
2218 }
2219#endif
2220
2221 /*
2222 * E: main pass across every character
2223 */
2224 for (row = 0; row < TermWin.nrow; row++)
2225 {
2226 text_t *stp = screen.text[row + row_offset];
2227 rend_t *srp = screen.rend[row + row_offset];
2228 text_t *dtp = drawn_text[row];
2229 rend_t *drp = drawn_rend[row];
2230
2231 /*
2232 * E2: OK, now the real pass
2233 */
2234 int ypixel = (int)Row2Pixel (row);
2235
2236 for (col = 0; col < TermWin.ncol; col++)
2237 {
2238 /* compare new text with old - if exactly the same then continue */
2239 if (stp[col] == dtp[col] /* Must match characters to skip. */
2240 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2241 || (stp[col] == ' ' /* space w/ no background change */
2242 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2243 continue;
2244
2245 // redraw one or more characters
2246
2247 // seek to the beginning if wide characters
2248 while (stp[col] == NOCHAR && col > 0)
2249 --col;
2250
2251 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2252 text_t *text = stp + col;
2253 int count = 1;
2254
2255 dtp[col] = stp[col];
2256 drp[col] = rend;
2257
2258 int xpixel = Col2Pixel (col);
2259
2260 for (i = 0; ++col < TermWin.ncol; )
2261 {
2262 if (stp[col] == NOCHAR)
2263 {
2264 dtp[col] = stp[col];
2265 drp[col] = rend;
2266 count++;
2267 i++;
2268
2269 continue;
2270 }
2271
2272 if (!RS_SAME (rend, srp[col]))
2273 break;
2274
2275 count++;
2276
2277 if (stp[col] != dtp[col]
2278 || !RS_SAME (srp[col], drp[col]))
2279 {
2280 if (must_clear && (i++ > count / 2))
2281 break;
2282
2283 dtp[col] = stp[col];
2284 drp[col] = rend;
2285 i = 0;
2286 }
2287 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2288 break;
2289 }
2290
2291 col--; /* went one too far. move back */
2292 count -= i; /* dump any matching trailing chars */
2293
2294 // sometimes we optimize away the trailing NOCHAR's, add them back
2295 while (i && text[count] == NOCHAR)
2296 count++, i--;
2297
2298#if ENABLE_STYLES
2299 // force redraw after "careful" characters to avoid pixel droppings
2300 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2301 drp[col + 1] = ~srp[col + 1];
2302
2303 // include previous careful character(s) if possible, looks nicer (best effort...)
2304 while (text > stp
2305 && srp[text - stp - 1] & RS_Careful
2306 && RS_SAME (rend, srp[text - stp - 1]))
2307 text--, count++, xpixel -= TermWin.fwidth;
2308#endif
2309
2310 /*
2311 * Determine the attributes for the string
2312 */
2313 int fore = GET_FGCOLOR (rend); // desired foreground
2314 int back = GET_BGCOLOR (rend); // desired background
2315
2316 // only do special processing if ana attributes are set, which is rare
2317 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2318 {
2319 bool invert = rend & RS_RVid;
2320
2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2322 if (rend & RS_Bold
2323 && fore == Color_fg)
2324 {
2325 if (ISSET_PIXCOLOR (Color_BD))
2326 fore = Color_BD;
2327# if !ENABLE_STYLES
2328 else
2329 invert = !invert;
2330# endif
2331 }
2332
2333 if (rend & RS_Italic
2334 && fore == Color_fg)
2335 {
2336 if (ISSET_PIXCOLOR (Color_IT))
2337 fore = Color_IT;
2338# if !ENABLE_STYLES
2339 else
2340 invert = !invert;
2341# endif
2342 }
2343
2344 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2345 fore = Color_UL;
2346#endif
2347
2348 if (invert)
2349 {
2350 SWAP_IT (fore, back, int);
2351
2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2353 if (ISSET_PIXCOLOR (Color_RV))
2354 back = Color_RV;
2355#endif
2356 }
2357
2358#ifdef TEXT_BLINK
2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2360 {
2361 if (!text_blink_ev.active)
2362 {
2363 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2364 hidden_text = 0;
2365 }
2366 else if (hidden_text)
2367 fore = back;
2368 }
2369#endif
2370 }
2371
2372 /*
2373 * Actually do the drawing of the string here
2374 */
2375 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2376
2377 if (back == fore)
2378 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2379 TermWin.fwidth * count, TermWin.fheight,
2380 back);
2381 else if (back == Color_bg)
2382 {
2383 if (must_clear)
2384 {
2385 CLEAR_CHARS (xpixel, ypixel, count);
2386
2387 for (i = 0; i < count; i++) /* don't draw empty strings */
2388 if (text[i] != ' ')
2004 { 2389 {
2005 *dtp++ = *dtp2++; 2390 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2006 *drp++ = *drp2++; 2391 break;
2007 } 2392 }
2008
2009 if (len == -1)
2010 len = row;
2011
2012 wlen = row;
2013 continue;
2014 } 2393 }
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 == fore)
2168 font->clear_rect (xpixel, ypixel,
2169 TermWin.fwidth * count, TermWin.fheight,
2170 back);
2171 else if (back == Color_bg)
2172 {
2173 if (must_clear)
2174 {
2175 CLEAR_CHARS (xpixel, ypixel, count);
2176
2177 for (i = 0; i < count; i++) /* don't draw empty strings */
2178 if (text[i] != ' ')
2179 {
2180 font->draw (xpixel, ypixel, text, count, fore, -1);
2181 break;
2182 }
2183 }
2184 else 2394 else
2185 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2395 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2186 } 2396 }
2187 else 2397 else
2188 font->draw (xpixel, ypixel, text, count, fore, back); 2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2189 2399
2190 if ((rend & RS_Uline) && (font->descent > 1)) 2400 if (rend & RS_Uline && font->descent > 1 && fore != back)
2191 XDrawLine(Xdisplay, drawBuffer, TermWin.gc, 2401 XDrawLine (display->display, drawBuffer, TermWin.gc,
2192 xpixel, ypixel + font->ascent + 1, 2402 xpixel, ypixel + font->ascent + 1,
2193 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2194 } /* for (col....) */ 2404 } /* for (col....) */
2195 } /* for (row....) */ 2405 } /* for (row....) */
2196 2406
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410
2197 /* 2411 /*
2198 * G: cleanup cursor and display outline cursor if necessary 2412 * G: cleanup cursor and display outline cursor if necessary
2199 */ 2413 */
2200 if (showcursor) { 2414 if (showcursor)
2415 {
2201 if (TermWin.focus) { 2416 if (TermWin.focus)
2202 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 2417 {
2203 [screen.cur.col]);
2204 *srp ^= RS_RVid; 2418 *crp ^= RS_RVid;
2205#ifndef NO_CURSORCOLOR 2419#ifndef NO_CURSORCOLOR
2206 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2420 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2207#endif 2421#endif
2422 }
2208 } else if (oldcursor.row >= 0) { 2423 else if (oldcursor.row >= 0)
2424 {
2209#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2210 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2211 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]); 2427 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2212#endif 2428#endif
2429 int cursorwidth = 1;
2430 while (oldcursor.col + cursorwidth < TermWin.ncol
2431 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2432 cursorwidth++;
2433
2213 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc, 2434 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2214 Col2Pixel(oldcursor.col), 2435 Col2Pixel (oldcursor.col),
2215 Row2Pixel(oldcursor.row), 2436 Row2Pixel (oldcursor.row),
2216 (unsigned int)(Width2Pixel(cursorwidth) - 1), 2437 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2217 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1)); 2438 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2218 } 2439 }
2219 } 2440 }
2220 2441
2221 /* 2442 /*
2222 * H: cleanup selection 2443 * H: cleanup selection
2223 */ 2444 */
2224 scr_reverse_selection (); 2445 scr_reverse_selection ();
2225 2446
2226 /*
2227 * I: other general cleanup
2228 */
2229 if (clearfirst && TermWin.int_bwidth)
2230 /*
2231 * clear the whole screen height, note that width == 0 is treated
2232 * specially by XClearArea
2233 */
2234 XClearArea(Xdisplay, TermWin.vt, 0, 0,
2235 (unsigned int)TermWin.int_bwidth,
2236 (unsigned int)TermWin_TotalHeight(), False);
2237 if (clearlast && TermWin.int_bwidth)
2238 /*
2239 * clear the whole screen height, note that width == 0 is treated
2240 * specially by XClearArea
2241 */
2242 XClearArea(Xdisplay, TermWin.vt,
2243 TermWin.width + TermWin.int_bwidth, 0,
2244 (unsigned int)TermWin.int_bwidth,
2245 (unsigned int)TermWin_TotalHeight(), False);
2246 if (refresh_type & SMOOTH_REFRESH) 2447 if (refresh_type & SMOOTH_REFRESH)
2247 XSync(Xdisplay, False); 2448 XFlush (display->display);
2248 2449
2249 num_scr = 0; 2450 num_scr = 0;
2250 num_scr_allow = 1; 2451 num_scr_allow = 1;
2251 want_refresh = 0; /* screen is current */ 2452 want_refresh = 0; /* screen is current */
2252} 2453}
2253 2454
2254/* ------------------------------------------------------------------------- */
2255void 2455void
2456rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2457{
2458 if (!rp || !tp)
2459 return;
2460
2461 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2462 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2463}
2464
2465void
2466rxvt_term::scr_remap_chars ()
2467{
2468 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2469 scr_remap_chars (screen.text[i], screen.rend[i]);
2470
2471 for (int i = TermWin.nrow; i--; )
2472 {
2473 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2474 scr_remap_chars (swap.text[i], swap.rend[i]);
2475 }
2476}
2477
2478void
2256rxvt_term::scr_clear() 2479rxvt_term::scr_recolour ()
2480{
2481 if (1
2482#if TRANSPARENT
2483 && !am_transparent
2484#endif
2485#if XPM_BACKGROUND
2486 && !bgPixmap.pixmap
2487#endif
2488 )
2489 {
2490 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2491 XClearWindow (display->display, TermWin.parent[0]);
2492 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2493#if HAVE_SCROLLBARS
2494 if (scrollBar.win)
2495 {
2496 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2497 scrollBar.setIdle ();
2498 scrollbar_show (0);
2499 }
2500#endif
2501 }
2502
2503 scr_clear ();
2504 scr_touch (true);
2505 want_refresh = 1;
2506}
2507
2508/* ------------------------------------------------------------------------- */
2509void
2510rxvt_term::scr_clear (bool really)
2257{ 2511{
2258 if (!TermWin.mapped) 2512 if (!TermWin.mapped)
2259 return; 2513 return;
2260 2514
2261 num_scr_allow = 0; 2515 num_scr_allow = 0;
2262 want_refresh = 1; 2516 want_refresh = 1;
2517
2263#ifdef TRANSPARENT 2518#if TRANSPARENT
2264 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2519 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2265 { 2520 {
2266 int i; 2521 int i;
2267 2522
2268 if (!(Options & Opt_transparent_all)) 2523 if (!(options & Opt_transparent_all))
2269 i = 0; 2524 i = 0;
2270 else 2525 else
2271 i = (int)(sizeof(TermWin.parent) / sizeof(Window)); 2526 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2272 2527
2273 while (i--) 2528 while (i--)
2274 if (TermWin.parent[i] != None) 2529 if (TermWin.parent[i] != None)
2275 XClearWindow(Xdisplay, TermWin.parent[i]); 2530 XClearWindow (display->display, TermWin.parent[i]);
2276 } 2531 }
2277#endif 2532#endif
2278 2533
2534 if (really)
2279 XClearWindow (Xdisplay, TermWin.vt); 2535 XClearWindow (display->display, TermWin.vt);
2280} 2536}
2281 2537
2282/* ------------------------------------------------------------------------- */ 2538/* ------------------------------------------------------------------------- */
2283void 2539void
2284rxvt_term::scr_reverse_selection () 2540rxvt_term::scr_reverse_selection ()
2285{ 2541{
2286 int i, col, row, end_row;
2287 rend_t *srp;
2288
2289 if (selection.op && current_screen == selection.screen) { 2542 if (selection.op && current_screen == selection.screen)
2543 {
2290 end_row = TermWin.saveLines - TermWin.view_start; 2544 int end_row = TermWin.saveLines - TermWin.view_start;
2291 i = selection.beg.row + TermWin.saveLines; 2545 int i = selection.beg.row + TermWin.saveLines;
2292 row = selection.end.row + TermWin.saveLines; 2546 int col, row = selection.end.row + TermWin.saveLines;
2547 rend_t *srp;
2548
2293 if (i >= end_row) 2549 if (i >= end_row)
2294 col = selection.beg.col; 2550 col = selection.beg.col;
2295 else { 2551 else
2552 {
2296 col = 0; 2553 col = 0;
2297 i = end_row; 2554 i = end_row;
2298 } 2555 }
2556
2299 end_row += TermWin.nrow; 2557 end_row += TermWin.nrow;
2300 for (; i < row && i < end_row; i++, col = 0) 2558 for (; i < row && i < end_row; i++, col = 0)
2301 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2559 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2302 srp[col] ^= RS_RVid; 2560 srp[col] ^= RS_RVid;
2561
2303 if (i == row && i < end_row) 2562 if (i == row && i < end_row)
2304 for (srp = screen.rend[i]; col < selection.end.col; col++) 2563 for (srp = screen.rend[i]; col < selection.end.col; col++)
2305 srp[col] ^= RS_RVid; 2564 srp[col] ^= RS_RVid;
2306 } 2565 }
2307} 2566}
2308 2567
2309/* ------------------------------------------------------------------------- */ 2568/* ------------------------------------------------------------------------- */
2310/* 2569/*
… …
2313 */ 2572 */
2314#if 0 2573#if 0
2315void 2574void
2316rxvt_term::scr_dump (int fd) 2575rxvt_term::scr_dump (int fd)
2317{ 2576{
2318 int row, wrote; 2577 int row, wrote;
2319 unsigned int width, towrite; 2578 unsigned int width, towrite;
2320 char r1[] = "\n"; 2579 char r1[] = "\n";
2321 2580
2322 for (row = TermWin.saveLines - TermWin.nscrolled; 2581 for (row = TermWin.saveLines - TermWin.nscrolled;
2323 row < TermWin.saveLines + TermWin.nrow - 1; row++) { 2582 row < TermWin.saveLines + TermWin.nrow - 1; row++)
2583 {
2324 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2584 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2325 : TermWin.ncol; 2585 : TermWin.ncol;
2326 for (towrite = width; towrite; towrite -= wrote) { 2586 for (towrite = width; towrite; towrite -= wrote)
2587 {
2327 wrote = write(fd, &(screen.text[row][width - towrite]), 2588 wrote = write (fd, & (screen.text[row][width - towrite]),
2328 towrite); 2589 towrite);
2329 if (wrote < 0) 2590 if (wrote < 0)
2330 return; /* XXX: death, no report */ 2591 return; /* XXX: death, no report */
2331 } 2592 }
2332 if (screen.tlen[row] >= 0) 2593 if (screen.tlen[row] >= 0)
2333 if (write(fd, r1, 1) <= 0) 2594 if (write (fd, r1, 1) <= 0)
2334 return; /* XXX: death, no report */ 2595 return; /* XXX: death, no report */
2335 } 2596 }
2336} 2597}
2337#endif 2598#endif
2338 2599
2339/* ------------------------------------------------------------------------- * 2600/* ------------------------------------------------------------------------- *
… …
2344 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2605 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2345 */ 2606 */
2346void 2607void
2347rxvt_term::selection_check (int check_more) 2608rxvt_term::selection_check (int check_more)
2348{ 2609{
2349 row_col_t pos; 2610 row_col_t pos;
2350 2611
2351 if (!selection.op) 2612 if (!selection.op)
2352 return; 2613 return;
2353 2614
2354 pos.row = pos.col = 0; 2615 pos.row = pos.col = 0;
2355 if ((selection.beg.row < -(int32_t)TermWin.nscrolled) 2616 if ((selection.beg.row < - (int32_t)TermWin.nscrolled)
2356 || (selection.beg.row >= TermWin.nrow) 2617 || (selection.beg.row >= TermWin.nrow)
2357 || (selection.mark.row < -(int32_t)TermWin.nscrolled) 2618 || (selection.mark.row < - (int32_t)TermWin.nscrolled)
2358 || (selection.mark.row >= TermWin.nrow) 2619 || (selection.mark.row >= TermWin.nrow)
2359 || (selection.end.row < -(int32_t)TermWin.nscrolled) 2620 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2360 || (selection.end.row >= TermWin.nrow) 2621 || (selection.end.row >= TermWin.nrow)
2361 || (check_more == 1 2622 || (check_more == 1
2362 && current_screen == selection.screen 2623 && current_screen == selection.screen
2363 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) 2624 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2364 && ROWCOL_IS_BEFORE(screen.cur, selection.end)) 2625 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2365 || (check_more == 2 2626 || (check_more == 2
2366 && ROWCOL_IS_BEFORE(selection.beg, pos) 2627 && ROWCOL_IS_BEFORE (selection.beg, pos)
2367 && ROWCOL_IS_AFTER(selection.end, pos)) 2628 && ROWCOL_IS_AFTER (selection.end, pos))
2368 || (check_more == 3 2629 || (check_more == 3
2369 && ROWCOL_IS_AFTER(selection.end, pos)) 2630 && ROWCOL_IS_AFTER (selection.end, pos))
2370 || (check_more == 4 /* screen width change */ 2631 || (check_more == 4 /* screen width change */
2371 && (selection.beg.row != selection.end.row 2632 && (selection.beg.row != selection.end.row
2372 || selection.end.col > TermWin.ncol))) 2633 || selection.end.col > TermWin.ncol)))
2373 CLEAR_SELECTION(); 2634 CLEAR_SELECTION ();
2374} 2635}
2375 2636
2376/* ------------------------------------------------------------------------- */ 2637/* ------------------------------------------------------------------------- */
2377/* 2638/*
2378 * Paste a selection direct to the command fd 2639 * Paste a selection direct to the command fd
… …
2380void 2641void
2381rxvt_term::paste (const unsigned char *data, unsigned int len) 2642rxvt_term::paste (const unsigned char *data, unsigned int len)
2382{ 2643{
2383 unsigned int i, j, n; 2644 unsigned int i, j, n;
2384 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2645 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2385
2386#if 0
2387 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2388 ZERO_SCROLLBACK (r);
2389#endif
2390 2646
2391 /* convert normal newline chars into common keyboard Return key sequence */ 2647 /* convert normal newline chars into common keyboard Return key sequence */
2392 for (i = 0; i < len; i += PROP_SIZE) 2648 for (i = 0; i < len; i += PROP_SIZE)
2393 { 2649 {
2394 n = min (len - i, PROP_SIZE); 2650 n = min (len - i, PROP_SIZE);
2395 MEMCPY (ds, data + i, n); 2651 memcpy (ds, data + i, n);
2396 2652
2397 for (j = 0; j < n; j++) 2653 for (j = 0; j < n; j++)
2398 if (ds[j] == '\n') 2654 if (ds[j] == C0_LF)
2399 ds[j] = '\r'; 2655 ds[j] = C0_CR;
2400 2656
2401 tt_write (ds, (int)n); 2657 tt_write (ds, (int)n);
2402 } 2658 }
2403 2659
2404 free(ds); 2660 free (ds);
2405} 2661}
2406 2662
2407/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2408/* 2664/*
2409 * Respond to a notification that a primary selection has been sent 2665 * Respond to a notification that a primary selection has been sent
… …
2414{ 2670{
2415 long nread = 0; 2671 long nread = 0;
2416 unsigned long bytes_after; 2672 unsigned long bytes_after;
2417 XTextProperty ct; 2673 XTextProperty ct;
2418 2674
2419 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2420
2421 if (prop == None) /* check for failed XConvertSelection */ 2675 if (prop == None) /* check for failed XConvertSelection */
2422 { 2676 {
2423 if ((selection_type & Sel_CompoundText)) 2677 if ((selection_type & Sel_CompoundText))
2424 { 2678 {
2425 int selnum = selection_type & Sel_whereMask; 2679 int selnum = selection_type & Sel_whereMask;
2426 2680
2427 selection_type = 0; 2681 selection_type = 0;
2428 if (selnum != Sel_direct) 2682 if (selnum != Sel_direct)
2429 selection_request_other (XA_STRING, selnum); 2683 selection_request_other (XA_STRING, selnum);
2430 } 2684 }
2431 2685
2432 if ((selection_type & Sel_UTF8String)) 2686 if ((selection_type & Sel_UTF8String))
2433 { 2687 {
2434 int selnum = selection_type & Sel_whereMask; 2688 int selnum = selection_type & Sel_whereMask;
2435 2689
2436 selection_type = Sel_CompoundText; 2690 selection_type = Sel_CompoundText;
2437 if (selnum != Sel_direct) 2691 if (selnum != Sel_direct)
2438 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2692 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2439 else 2693 else
2440 selection_type = 0; 2694 selection_type = 0;
2441 } 2695 }
2442 2696
2443 return 0; 2697 return 0;
2444 } 2698 }
2445 2699
2446 for (;;) 2700 for (;;)
2447 { 2701 {
2448 if (XGetWindowProperty(Xdisplay, win, prop, (long)(nread / 4), 2702 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2449 (long)(PROP_SIZE / 4), delete_prop, 2703 (long) (PROP_SIZE / 4), delete_prop,
2450 AnyPropertyType, &ct.encoding, &ct.format, 2704 AnyPropertyType, &ct.encoding, &ct.format,
2451 &ct.nitems, &bytes_after, 2705 &ct.nitems, &bytes_after,
2452 &ct.value) != Success) 2706 &ct.value) != Success)
2453 break; 2707 break;
2454 2708
2455 if (ct.encoding == 0) 2709 if (ct.encoding == 0)
2710 break;
2711
2712 if (ct.encoding == xa[XA_INCR])
2456 { 2713 {
2457 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2714 // INCR selection, start handshake
2715 XDeleteProperty (display->display, win, prop);
2716 selection_wait = Sel_incr;
2717 incr_ev.start (NOW + 10);
2458 break; 2718 break;
2459 } 2719 }
2460 2720
2461 if (ct.value == NULL) 2721 if (ct.value == NULL)
2462 {
2463 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!"));
2464 continue; 2722 continue;
2465 }
2466 2723
2467 if (ct.nitems == 0) 2724 if (ct.nitems == 0)
2468 { 2725 {
2469 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2470 if (selection_wait == Sel_normal && nread == 0) 2726 if (selection_wait == Sel_normal && nread == 0
2727 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2471 { 2728 {
2472 /* 2729 /*
2473 * pass through again trying CUT_BUFFER0 if we've come from 2730 * pass through again trying CUT_BUFFER0 if we've come from
2474 * XConvertSelection() but nothing was presented 2731 * XConvertSelection () but nothing was presented
2475 */ 2732 */
2476 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2477 selection_paste (Xroot, XA_CUT_BUFFER0, False); 2733 selection_paste (display->root, XA_CUT_BUFFER0, False);
2478 } 2734 }
2479 2735
2480 nread = -1; /* discount any previous stuff */ 2736 nread = -1; /* discount any previous stuff */
2481 break; 2737 break;
2482 } 2738 }
2483 2739
2484 nread += ct.nitems; 2740 nread += ct.nitems;
2485 2741
2486 char **cl; 2742 char **cl;
2487 int cr; 2743 int cr;
2488 if (XmbTextPropertyToTextList (Xdisplay, &ct, &cl, 2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2489 &cr) >= 0 && cl)
2490 { 2745 {
2491 for (int i = 0; i < cr; i++) 2746 for (int i = 0; i < cr; i++)
2492 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2747 paste ((unsigned char *)cl[i], strlen (cl[i]));
2493 2748
2494 XFreeStringList (cl); 2749 XFreeStringList (cl);
2495 } 2750 }
2496 else 2751 else
2497 paste (ct.value, ct.nitems); 2752 paste (ct.value, ct.nitems);
… …
2506 XFree (ct.value); 2761 XFree (ct.value);
2507 2762
2508 if (selection_wait == Sel_normal) 2763 if (selection_wait == Sel_normal)
2509 selection_wait = Sel_none; 2764 selection_wait = Sel_none;
2510 2765
2511 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2512 return (int)nread; 2766 return (int)nread;
2513} 2767}
2514 2768
2515void 2769void
2516rxvt_term::incr_cb (time_watcher &w) 2770rxvt_term::incr_cb (time_watcher &w)
2517{ 2771{
2518 selection_wait = Sel_none; 2772 selection_wait = Sel_none;
2519 2773
2520 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2774 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2521} 2775}
2522 2776
2523/* 2777/*
2524 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2778 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2525 */ 2779 */
2526void 2780void
2527rxvt_term::selection_property (Window win, Atom prop) 2781rxvt_term::selection_property (Window win, Atom prop)
2528{ 2782{
2529 int reget_time = 0; 2783 if (prop == None || selection_wait != Sel_incr)
2530
2531 if (prop == None)
2532 return; 2784 return;
2533 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2534 if (selection_wait == Sel_normal) {
2535 int a, afmt;
2536 Atom atype;
2537 unsigned long bytes_after, nitems;
2538 unsigned char *s = NULL;
2539 2785
2540 a = XGetWindowProperty(Xdisplay, win, prop, 0L, 1L, False,
2541 xa[XA_INCR], &atype, &afmt, &nitems,
2542 &bytes_after, &s);
2543 if (s)
2544 XFree(s);
2545 if (a != Success)
2546 return;
2547#ifndef __CYGWIN32__
2548 if (atype == xa[XA_INCR]) { /* start an INCR transfer */
2549 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2550 XDeleteProperty(Xdisplay, win, prop);
2551 XFlush(Xdisplay);
2552 reget_time = 1;
2553 selection_wait = Sel_incr;
2554 }
2555#endif
2556 } else if (selection_wait == Sel_incr) {
2557 reget_time = 1;
2558 if (selection_paste (win, prop, True) == -1) { 2786 if (selection_paste (win, prop, 1) > 0)
2559 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2560 selection_wait = Sel_none;
2561 incr_ev.stop ();
2562 }
2563 }
2564 if (reget_time) /* received more data so reget time */
2565 incr_ev.start (NOW + 10); 2787 incr_ev.start (NOW + 10);
2788 else
2789 {
2790 selection_wait = Sel_none;
2791 incr_ev.stop ();
2792 }
2566} 2793}
2794
2567/* ------------------------------------------------------------------------- */ 2795/* ------------------------------------------------------------------------- */
2568/* 2796/*
2569 * Request the current selection: 2797 * Request the current selection:
2570 * Order: > internal selection if available 2798 * Order: > internal selection if available
2571 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2799 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2572 * > CUT_BUFFER0 2800 * > CUT_BUFFER0
2573 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2574 * will auto fallback to CUT_BUFFER0 2802 * will auto fallback to CUT_BUFFER0
2575 * EXT: button 2 release 2803 * EXT: button 2 release
2576 */ 2804 */
2577void 2805void
2578rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm, int x, int y)
2579{ 2807{
2580 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y));
2581 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2808 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2582 return; /* outside window */ 2809 return; /* outside window */
2583 2810
2584 if (selection.text != NULL) { /* internal selection */ 2811 if (selection.text)
2585 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2812 { /* internal selection */
2586 paste (selection.text, selection.len); 2813 char *str = rxvt_wcstombs (selection.text, selection.len);
2814 paste ((unsigned char *)str, strlen (str));
2815 free (str);
2587 return; 2816 return;
2588 } else { 2817 }
2589 int i; 2818 else
2819 {
2820 int i;
2590 2821
2591 selection_request_time = tm; 2822 selection_request_time = tm;
2592 selection_wait = Sel_normal; 2823 selection_wait = Sel_normal;
2824
2593 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2825 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2826 {
2594#if X_HAVE_UTF8_STRING 2827#if X_HAVE_UTF8_STRING
2595 selection_type = Sel_UTF8String; 2828 selection_type = Sel_UTF8String;
2596 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2829 if (selection_request_other (xa[XA_UTF8_STRING], i))
2597 return; 2830 return;
2598#else 2831#else
2599 selection_type = Sel_CompoundText; 2832 selection_type = Sel_CompoundText;
2600 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2833 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2601 return; 2834 return;
2602#endif 2835#endif
2836
2603 } 2837 }
2604 } 2838 }
2839
2605 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2840 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2606 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2607 selection_paste (Xroot, XA_CUT_BUFFER0, False); 2841 selection_paste (display->root, XA_CUT_BUFFER0, False);
2608} 2842}
2609 2843
2610int 2844int
2611rxvt_term::selection_request_other (Atom target, int selnum) 2845rxvt_term::selection_request_other (Atom target, int selnum)
2612{ 2846{
2613 Atom sel; 2847 Atom sel;
2614#ifdef DEBUG_SELECT 2848#ifdef DEBUG_SELECT
2615 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2849 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2616#endif 2850#endif
2617 2851
2618 selection_type |= selnum; 2852 selection_type |= selnum;
2853
2619 if (selnum == Sel_Primary) 2854 if (selnum == Sel_Primary)
2620 sel = XA_PRIMARY; 2855 sel = XA_PRIMARY;
2621 else if (selnum == Sel_Secondary) 2856 else if (selnum == Sel_Secondary)
2622 sel = XA_SECONDARY; 2857 sel = XA_SECONDARY;
2623 else 2858 else
2624 sel = xa[XA_CLIPBOARD]; 2859 sel = xa[XA_CLIPBOARD];
2860
2625 if (XGetSelectionOwner(Xdisplay, sel) != None) { 2861 if (XGetSelectionOwner (display->display, sel) != None)
2626 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2862 {
2627 XConvertSelection(Xdisplay, sel, target, xa[XA_VT_SELECTION], 2863 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2628 TermWin.vt, selection_request_time); 2864 TermWin.vt, selection_request_time);
2629 return 1; 2865 return 1;
2630 } 2866 }
2867
2631 return 0; 2868 return 0;
2632} 2869}
2633 2870
2634/* ------------------------------------------------------------------------- */ 2871/* ------------------------------------------------------------------------- */
2635/* 2872/*
2636 * Clear all selected text 2873 * Clear all selected text
2637 * EXT: SelectionClear 2874 * EXT: SelectionClear
2638 */ 2875 */
2639void 2876void
2640rxvt_term::selection_clear () 2877rxvt_term::selection_clear ()
2641{ 2878{
2642 D_SELECT((stderr, "rxvt_selection_clear()"));
2643
2644 want_refresh = 1; 2879 want_refresh = 1;
2645 if (selection.text)
2646 free(selection.text); 2880 free (selection.text);
2647 selection.text = NULL; 2881 selection.text = NULL;
2648 selection.len = 0; 2882 selection.len = 0;
2649 CLEAR_SELECTION(); 2883 CLEAR_SELECTION ();
2884
2885 if (display->selection_owner == this)
2886 display->selection_owner = 0;
2650} 2887}
2651 2888
2652/* ------------------------------------------------------------------------- */ 2889/* ------------------------------------------------------------------------- */
2653/* 2890/*
2654 * Copy a selection into the cut buffer 2891 * Copy a selection into the cut buffer
2655 * EXT: button 1 or 3 release 2892 * EXT: button 1 or 3 release
2656 */ 2893 */
2657void 2894void
2658rxvt_term::selection_make (Time tm) 2895rxvt_term::selection_make (Time tm)
2659{ 2896{
2660 int i, col, end_col, row, end_row; 2897 int i, col, end_col, row, end_row;
2661 unsigned char *new_selection_text; 2898 wchar_t *new_selection_text;
2662 char *str; 2899 text_t *t;
2663 text_t *t;
2664#ifdef ACS_ASCII
2665 rend_t *re;
2666#endif
2667 2900
2668 D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2669 switch (selection.op) { 2901 switch (selection.op)
2902 {
2670 case SELECTION_CONT: 2903 case SELECTION_CONT:
2671 break; 2904 break;
2672 case SELECTION_INIT: 2905 case SELECTION_INIT:
2673 CLEAR_SELECTION(); 2906 CLEAR_SELECTION ();
2674 /* FALLTHROUGH */ 2907 /* FALLTHROUGH */
2675 case SELECTION_BEGIN: 2908 case SELECTION_BEGIN:
2676 selection.op = SELECTION_DONE; 2909 selection.op = SELECTION_DONE;
2677 /* FALLTHROUGH */ 2910 /* FALLTHROUGH */
2678 default: 2911 default:
2679 return; 2912 return;
2680 } 2913 }
2914
2681 selection.op = SELECTION_DONE; 2915 selection.op = SELECTION_DONE;
2682 2916
2683 if (selection.clicks == 4) 2917 if (selection.clicks == 4)
2684 return; /* nothing selected, go away */ 2918 return; /* nothing selected, go away */
2685 2919
2686 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2920 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2687 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2921 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2688 2922
2689 new_selection_text = (unsigned char *)str;
2690
2691 col = selection.beg.col; 2923 col = selection.beg.col;
2692 MAX_IT(col, 0); 2924 MAX_IT (col, 0);
2693 row = selection.beg.row + TermWin.saveLines; 2925 row = selection.beg.row + TermWin.saveLines;
2694 end_row = selection.end.row + TermWin.saveLines; 2926 end_row = selection.end.row + TermWin.saveLines;
2927 int ofs = 0;
2928 int extra = 0;
2695 2929
2696 for (; row <= end_row; row++, col = 0) 2930 for (; row <= end_row; row++, col = 0)
2697 { 2931 {
2698 t = &(screen.text[row][col]); 2932 t = &screen.text[row][col];
2699 2933
2700 end_col = screen.tlen[row]; 2934 end_col = screen.tlen[row];
2701 2935
2702 if (end_col == -1) 2936 if (end_col == -1)
2703 end_col = TermWin.ncol; 2937 end_col = TermWin.ncol;
2704 2938
2705 if (row == end_row) 2939 if (row == end_row)
2706 MIN_IT (end_col, selection.end.col); 2940 MIN_IT (end_col, selection.end.col);
2707 2941
2708 for (; col < end_col; col++) 2942 for (; col < end_col; col++)
2943 {
2709 if (*t == NOCHAR) 2944 if (*t == NOCHAR)
2710 t++; 2945 t++;
2946#if ENABLE_COMBINING
2947 else if (IS_COMPOSE (*t))
2948 {
2949 int len = rxvt_composite.expand (*t, 0);
2950
2951 extra -= (len - 1);
2952
2953 if (extra < 0)
2954 {
2955 extra += i;
2956 i += i;
2957 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2958 }
2959
2960 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2961 }
2962#endif
2711 else 2963 else
2712 { 2964 new_selection_text[ofs++] = *t++;
2713 int len = wctomb (str, *t++);
2714 if (len > 0)
2715 str += len;
2716 } 2965 }
2717 2966
2718 if (screen.tlen[row] != -1 && row != end_row) 2967 if (screen.tlen[row] != -1 && row != end_row)
2719 *str++ = '\n'; 2968 new_selection_text[ofs++] = C0_LF;
2720 } 2969 }
2721 2970
2722#ifndef NO_OLD_SELECTION
2723 if (selection_style == OLD_SELECT)
2724 if (end_col == TermWin.ncol)
2725 *str++ = '\n';
2726#endif
2727#ifndef NO_NEW_SELECTION
2728 if (selection_style != OLD_SELECT)
2729 if (end_col != selection.end.col) 2971 if (end_col != selection.end.col)
2730 *str++ = '\n'; 2972 new_selection_text[ofs++] = C0_LF;
2731#endif
2732 *str = '\0';
2733 2973
2734 i = str - (char *)new_selection_text; 2974 new_selection_text[ofs] = 0;
2975
2735 if (i == 0) 2976 if (ofs == 0)
2736 { 2977 {
2737 free (new_selection_text); 2978 free (new_selection_text);
2738 return; 2979 return;
2739 } 2980 }
2740 2981
2741 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2742 if (str - (char *)new_selection_text > 1024)
2743 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2744
2745 selection.len = i;
2746
2747 if (selection.text)
2748 free (selection.text); 2982 free (selection.text);
2749 2983
2750 selection.text = new_selection_text; 2984 // we usually allocate much more than necessary, so realloc it smaller again
2985 selection.len = ofs;
2986 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2751 2987
2752 XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); 2988 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2753 if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt) 2989 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2754 rxvt_print_error("can't get primary selection"); 2990 display->set_selection_owner (this);
2991 else
2992 rxvt_warn ("can't get primary selection, ignoring.\n");
2755 2993
2756 2994#if 0
2757 {
2758 XTextProperty ct; 2995 XTextProperty ct;
2759 char *cl = (char *)selection.text;
2760 2996
2761 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, XStringStyle, &ct) >= 0) 2997 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2762 { 2998 {
2763 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2999 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2764 PropModeReplace, ct.value, ct.nitems); 3000 PropModeReplace, ct.value, ct.nitems);
2765 XFree (ct.value); 3001 XFree (ct.value);
2766 }
2767 else
2768 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2769 PropModeReplace, selection.text, (int)selection.len);
2770 } 3002 }
3003#endif
2771 3004
2772 selection_time = tm; 3005 selection_time = tm;
2773 D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len));
2774} 3006}
2775 3007
2776/* ------------------------------------------------------------------------- */ 3008/* ------------------------------------------------------------------------- */
2777/* 3009/*
2778 * Mark or select text based upon number of clicks: 1, 2, or 3 3010 * Mark or select text based upon number of clicks: 1, 2, or 3
2779 * EXT: button 1 press 3011 * EXT: button 1 press
2780 */ 3012 */
2781void 3013void
2782rxvt_term::selection_click (int clicks, int x, int y) 3014rxvt_term::selection_click (int clicks, int x, int y)
2783{ 3015{
2784 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2785
2786 clicks = ((clicks - 1) % 3) + 1; 3016 clicks = ((clicks - 1) % 3) + 1;
2787 selection.clicks = clicks; /* save clicks so extend will work */ 3017 selection.clicks = clicks; /* save clicks so extend will work */
2788 3018
2789 selection_start_colrow (Pixel2Col(x), Pixel2Row(y)); 3019 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2790 3020
2791 if (clicks == 2 || clicks == 3) 3021 if (clicks == 2 || clicks == 3)
2792 selection_extend_colrow (selection.mark.col, 3022 selection_extend_colrow (selection.mark.col,
2793 selection.mark.row + TermWin.view_start, 3023 selection.mark.row + TermWin.view_start,
2794 0, /* button 3 */ 3024 0, /* button 3 */
2795 1, /* button press */ 3025 1, /* button press */
2796 0); /* click change */ 3026 0); /* click change */
2797} 3027}
2798 3028
2799/* ------------------------------------------------------------------------- */ 3029/* ------------------------------------------------------------------------- */
2800/* 3030/*
2801 * Mark a selection at the specified col/row 3031 * Mark a selection at the specified col/row
2802 */ 3032 */
2803void 3033void
2804rxvt_term::selection_start_colrow (int col, int row) 3034rxvt_term::selection_start_colrow (int col, int row)
2805{ 3035{
2806 want_refresh = 1; 3036 want_refresh = 1;
2807 selection.mark.col = col; 3037 selection.mark.col = col;
2808 selection.mark.row = row - TermWin.view_start; 3038 selection.mark.row = row - TermWin.view_start;
3039
2809 MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled); 3040 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2810 MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1); 3041 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2811 MAX_IT(selection.mark.col, 0); 3042 MAX_IT (selection.mark.col, 0);
2812 MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1); 3043 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2813 3044
2814 if (selection.op) { /* clear the old selection */ 3045 while (selection.mark.col > 0
3046 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
3047 --selection.mark.col;
3048
3049 if (selection.op)
3050 { /* clear the old selection */
2815 selection.beg.row = selection.end.row = selection.mark.row; 3051 selection.beg.row = selection.end.row = selection.mark.row;
2816 selection.beg.col = selection.end.col = selection.mark.col; 3052 selection.beg.col = selection.end.col = selection.mark.col;
2817 } 3053 }
3054
2818 selection.op = SELECTION_INIT; 3055 selection.op = SELECTION_INIT;
2819 selection.screen = current_screen; 3056 selection.screen = current_screen;
2820} 3057}
2821 3058
2822/* ------------------------------------------------------------------------- */ 3059/* ------------------------------------------------------------------------- */
2823/* 3060/*
2824 * Word select: select text for 2 clicks 3061 * Word select: select text for 2 clicks
2825 * We now only find out the boundary in one direction 3062 * We now only find out the boundary in one direction
2826 */ 3063 */
2827 3064
2828/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3065/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2829#define DELIMIT_TEXT(x) \ 3066#define DELIMIT_TEXT(x) \
2830 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(rs[Rs_cutchars], (x)) != NULL)) 3067 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2831#define DELIMIT_REND(x) 1 3068#define DELIMIT_REND(x) 1
2832 3069
2833void 3070void
2834rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3071rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2835{ 3072{
2836 int col, row, dirnadd, tcol, trow, w1, w2; 3073 int col, row, dirnadd, tcol, trow, w1, w2;
2837 row_col_t bound; 3074 row_col_t bound;
2838 text_t *stp; 3075 text_t *stp;
2839 rend_t *srp; 3076 rend_t *srp;
2840 3077
2841 if (dirn == UP) { 3078 if (dirn == UP)
3079 {
2842 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3080 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2843 bound.col = 0; 3081 bound.col = 0;
2844 dirnadd = -1; 3082 dirnadd = -1;
2845 } else { 3083 }
3084 else
3085 {
2846 bound.row = TermWin.saveLines + TermWin.nrow; 3086 bound.row = TermWin.saveLines + TermWin.nrow;
2847 bound.col = TermWin.ncol - 1; 3087 bound.col = TermWin.ncol - 1;
2848 dirnadd = 1; 3088 dirnadd = 1;
2849 } 3089 }
3090
2850 row = mark->row + TermWin.saveLines; 3091 row = mark->row + TermWin.saveLines;
2851 col = mark->col; 3092 col = mark->col;
2852 MAX_IT(col, 0); 3093 MAX_IT (col, 0);
2853/* find the edge of a word */ 3094 /* find the edge of a word */
2854 stp = &(screen.text[row][col]); 3095 stp = &screen.text[row][col];
2855 w1 = DELIMIT_TEXT(*stp); 3096 w1 = DELIMIT_TEXT (*stp);
2856 3097
2857 if (selection_style != NEW_SELECT) { 3098 srp = &screen.rend[row][col];
2858 if (w1 == 1) { 3099 w2 = DELIMIT_REND (*srp);
3100
3101 for (;;)
3102 {
3103 for (; col != bound.col; col += dirnadd)
3104 {
2859 stp += dirnadd; 3105 stp += dirnadd;
2860 if (DELIMIT_TEXT(*stp) == 1)
2861 goto Old_Word_Selection_You_Die;
2862 col += dirnadd;
2863 }
2864 w1 = 0;
2865 }
2866 srp = (&screen.rend[row][col]);
2867 w2 = DELIMIT_REND(*srp);
2868
2869 for (;;) {
2870 for (; col != bound.col; col += dirnadd) {
2871 stp += dirnadd; 3106 srp += dirnadd;
3107
3108 if (*stp == NOCHAR)
3109 continue;
3110
2872 if (DELIMIT_TEXT(*stp) != w1) 3111 if (DELIMIT_TEXT (*stp) != w1)
3112 break;
3113 if (DELIMIT_REND (*srp) != w2)
3114 break;
3115 }
3116
3117 if ((col == bound.col) && (row != bound.row))
3118 {
3119 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
3120 {
3121 trow = row + dirnadd;
3122 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3123
3124 if (screen.text[trow] == NULL)
2873 break; 3125 break;
2874 srp += dirnadd; 3126
2875 if (DELIMIT_REND(*srp) != w2) 3127 stp = & (screen.text[trow][tcol]);
3128 srp = & (screen.rend[trow][tcol]);
3129
3130 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2876 break; 3131 break;
2877 } 3132
2878 if ((col == bound.col) && (row != bound.row)) {
2879 if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2880 trow = row + dirnadd;
2881 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2882 if (screen.text[trow] == NULL)
2883 break;
2884 stp = &(screen.text[trow][tcol]);
2885 srp = &(screen.rend[trow][tcol]);
2886 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2887 break;
2888 row = trow; 3133 row = trow;
2889 col = tcol; 3134 col = tcol;
2890 continue; 3135 continue;
2891 } 3136 }
2892 } 3137 }
2893 break; 3138 break;
2894 } 3139 }
3140
2895 Old_Word_Selection_You_Die: 3141Old_Word_Selection_You_Die:
2896 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));
2897
2898 if (dirn == DN) 3142 if (dirn == DN)
2899 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
2900 3144
2901/* Poke the values back in */ 3145 /* Poke the values back in */
2902 ret->row = row - TermWin.saveLines; 3146 ret->row = row - TermWin.saveLines;
2903 ret->col = col; 3147 ret->col = col;
2904} 3148}
2905 3149
2906/* ------------------------------------------------------------------------- */ 3150/* ------------------------------------------------------------------------- */
2907/* 3151/*
2908 * Extend the selection to the specified x/y pixel location 3152 * Extend the selection to the specified x/y pixel location
… …
2914void 3158void
2915rxvt_term::selection_extend (int x, int y, int flag) 3159rxvt_term::selection_extend (int x, int y, int flag)
2916{ 3160{
2917 int col, row; 3161 int col, row;
2918 3162
2919 col = Pixel2Col(x); 3163 col = Pixel2Col (x);
2920 row = Pixel2Row(y); 3164 row = Pixel2Row (y);
2921 MAX_IT(row, 0); 3165 MAX_IT (row, 0);
2922 MIN_IT(row, (int)TermWin.nrow - 1); 3166 MIN_IT (row, (int)TermWin.nrow - 1);
2923 MAX_IT(col, 0); 3167 MAX_IT (col, 0);
2924 MIN_IT(col, (int)TermWin.ncol); 3168 MIN_IT (col, (int)TermWin.ncol);
2925 3169
2926#ifndef NO_NEW_SELECTION
2927 /* 3170 /*
2928 * If we're selecting characters (single click) then we must check first 3171 * If we're selecting characters (single click) then we must check first
2929 * if we are at the same place as the original mark. If we are then 3172 * if we are at the same place as the original mark. If we are then
2930 * select nothing. Otherwise, if we're to the right of the mark, you have to 3173 * select nothing. Otherwise, if we're to the right of the mark, you have to
2931 * be _past_ a character for it to be selected. 3174 * be _past_ a character for it to be selected.
2932 */ 3175 */
2933 if (selection_style != OLD_SELECT)
2934 {
2935 if (((selection.clicks % 3) == 1) && !flag 3176 if (((selection.clicks % 3) == 1) && !flag
2936 && (col == selection.mark.col 3177 && (col == selection.mark.col
2937 && (row == selection.mark.row + TermWin.view_start))) 3178 && (row == selection.mark.row + TermWin.view_start)))
2938 { 3179 {
2939 /* select nothing */ 3180 /* select nothing */
2940 selection.beg.row = selection.end.row = 0; 3181 selection.beg.row = selection.end.row = 0;
2941 selection.beg.col = selection.end.col = 0; 3182 selection.beg.col = selection.end.col = 0;
2942 selection.clicks = 4; 3183 selection.clicks = 4;
2943 want_refresh = 1; 3184 want_refresh = 1;
2944 D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4"));
2945 return; 3185 return;
2946 }
2947 } 3186 }
2948#endif 3187
2949 if (selection.clicks == 4) 3188 if (selection.clicks == 4)
2950 selection.clicks = 1; 3189 selection.clicks = 1;
2951 3190
2952 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3191 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2953 flag == 1 ? 1 : 0, /* ? button press */ 3192 flag == 1 ? 1 : 0, /* ? button press */
2954 0); /* no click change */ 3193 0); /* no click change */
2955} 3194}
2956 3195
2957/* ------------------------------------------------------------------------- */ 3196/* ------------------------------------------------------------------------- */
2958/* 3197/*
2959 * Extend the selection to the specified col/row 3198 * Extend the selection to the specified col/row
2960 */ 3199 */
2961void 3200void
2962rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3201rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
2963{ 3202{
2964 int16_t ncol = TermWin.ncol; 3203 int16_t ncol = TermWin.ncol;
2965 int end_col; 3204 int end_col;
2966 row_col_t pos; 3205 row_col_t pos;
2967 enum { 3206 enum {
2968 LEFT, RIGHT 3207 LEFT, RIGHT
2969 } closeto = RIGHT; 3208 } closeto = RIGHT;
2970 3209
2971 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));
2972 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));
2973
2974 want_refresh = 1; 3210 want_refresh = 1;
2975 switch (selection.op) { 3211 switch (selection.op)
3212 {
2976 case SELECTION_INIT: 3213 case SELECTION_INIT:
2977 CLEAR_SELECTION(); 3214 CLEAR_SELECTION ();
2978 selection.op = SELECTION_BEGIN; 3215 selection.op = SELECTION_BEGIN;
2979 /* FALLTHROUGH */ 3216 /* FALLTHROUGH */
2980 case SELECTION_BEGIN: 3217 case SELECTION_BEGIN:
2981 if (row != selection.mark.row || col != selection.mark.col 3218 if (row != selection.mark.row || col != selection.mark.col
2982 || (!button3 && buttonpress)) 3219 || (!button3 && buttonpress))
2983 selection.op = SELECTION_CONT; 3220 selection.op = SELECTION_CONT;
2984 break; 3221 break;
2985 case SELECTION_DONE: 3222 case SELECTION_DONE:
2986 selection.op = SELECTION_CONT; 3223 selection.op = SELECTION_CONT;
2987 /* FALLTHROUGH */ 3224 /* FALLTHROUGH */
2988 case SELECTION_CONT: 3225 case SELECTION_CONT:
2989 break; 3226 break;
2990 case SELECTION_CLEAR: 3227 case SELECTION_CLEAR:
2991 selection_start_colrow (col, row); 3228 selection_start_colrow (col, row);
2992 /* FALLTHROUGH */ 3229 /* FALLTHROUGH */
2993 default: 3230 default:
2994 return; 3231 return;
2995 } 3232 }
2996 if (selection.beg.col == selection.end.col 3233 if (selection.beg.col == selection.end.col
2997 && selection.beg.col != selection.mark.col 3234 && selection.beg.col != selection.mark.col
2998 && selection.beg.row == selection.end.row 3235 && selection.beg.row == selection.end.row
2999 && selection.beg.row != selection.mark.row) { 3236 && selection.beg.row != selection.mark.row)
3237 {
3000 selection.beg.col = selection.end.col = selection.mark.col; 3238 selection.beg.col = selection.end.col = selection.mark.col;
3001 selection.beg.row = selection.end.row = selection.mark.row; 3239 selection.beg.row = selection.end.row = selection.mark.row;
3002 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));
3003 } 3240 }
3004 3241
3005 pos.col = col; 3242 pos.col = col;
3006 pos.row = row; 3243 pos.row = row;
3007 3244
3008 pos.row -= TermWin.view_start; /* adjust for scroll */ 3245 pos.row -= TermWin.view_start; /* adjust for scroll */
3009 3246
3010#ifndef NO_OLD_SELECTION 3247 /*
3011/* 3248 * This is mainly xterm style selection with a couple of differences, mainly
3012 * This mimics some of the selection behaviour of version 2.20 and before. 3249 * in the way button3 drag extension works.
3013 * There are no ``selection modes'', button3 is always character extension. 3250 * We're either doing: button1 drag; button3 press; or button3 drag
3014 * Note: button3 drag is always available, c.f. v2.20 3251 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3015 * Selection always terminates (left or right as appropriate) at the mark. 3252 * is always at the left/right edge of the selection.
3253 * b) button3 press: extend/contract character/word/line at whichever edge of
3254 * the selection we are closest to.
3255 * c) button3 drag : extend/contract character/word/line - we select around
3256 * a point/word/line which is either the start or end of the selection
3257 * and it was decided by whichever point/word/line was `fixed' at the
3258 * time of the most recent button3 press
3016 */ 3259 */
3017 if (selection_style == OLD_SELECT) { 3260 if (button3 && buttonpress)
3018 if (selection.clicks == 1 || button3) { 3261 { /* button3 press */
3019 if (hate_those_clicks) { 3262 /*
3020 hate_those_clicks = 0; 3263 * first determine which edge of the selection we are closest to
3021 if (selection.clicks == 1) { 3264 */
3265 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3266 || (!ROWCOL_IS_AFTER (pos, selection.end)
3267 && (((pos.col - selection.beg.col)
3268 + ((pos.row - selection.beg.row) * ncol))
3269 < ((selection.end.col - pos.col)
3270 + ((selection.end.row - pos.row) * ncol)))))
3271 closeto = LEFT;
3272
3273 if (closeto == LEFT)
3274 {
3275 selection.beg.row = pos.row;
3276 selection.beg.col = pos.col;
3277 selection.mark.row = selection.end.row;
3278 selection.mark.col = selection.end.col - (selection.clicks == 2);
3279 }
3280 else
3281 {
3282 selection.end.row = pos.row;
3283 selection.end.col = pos.col;
3284 selection.mark.row = selection.beg.row;
3285 selection.mark.col = selection.beg.col;
3286 }
3287 }
3288 else
3289 { /* button1 drag or button3 drag */
3290 if (ROWCOL_IS_AFTER (selection.mark, pos))
3291 {
3292 if ((selection.mark.row == selection.end.row)
3293 && (selection.mark.col == selection.end.col)
3294 && clickchange && selection.clicks == 2)
3295 selection.mark.col--;
3296
3297 selection.beg.row = pos.row;
3298 selection.beg.col = pos.col;
3299 selection.end.row = selection.mark.row;
3300 selection.end.col = selection.mark.col + (selection.clicks == 2);
3301 }
3302 else
3303 {
3022 selection.beg.row = selection.mark.row; 3304 selection.beg.row = selection.mark.row;
3305 selection.beg.col = selection.mark.col;
3306 selection.end.row = pos.row;
3307 selection.end.col = pos.col;
3308 }
3309 }
3310
3311 if (selection.clicks == 1)
3312 {
3313 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3314
3315 if (end_col != -1 && selection.beg.col > end_col)
3316 {
3317#if 1
3318 selection.beg.col = ncol;
3319#else
3320 if (selection.beg.row != selection.end.row)
3321 selection.beg.col = ncol;
3322 else
3023 selection.beg.col = selection.mark.col; 3323 selection.beg.col = selection.mark.col;
3324#endif
3325 }
3326
3327 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3328
3329 if (end_col != -1 && selection.end.col > end_col)
3330 selection.end.col = ncol;
3331 }
3332 else if (selection.clicks == 2)
3333 {
3334 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3335 selection.end.col--;
3336
3337 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3338 selection_delimit_word (DN, & (selection.end), & (selection.end));
3339 }
3340 else if (selection.clicks == 3)
3341 {
3342#if ENABLE_FRILLS
3343 if ((options & Opt_tripleclickwords))
3344 {
3345 int end_row;
3346
3347 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3348 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3349
3350 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3351 {
3352 end_col = screen.tlen[end_row + TermWin.saveLines];
3353
3354 if (end_col != -1)
3024 } else { 3355 {
3025 selection.mark.row = selection.beg.row; 3356 selection.end.row = end_row;
3026 selection.mark.col = selection.beg.col; 3357 selection.end.col = end_col;
3358 selection_remove_trailing_spaces ();
3359 break;
3027 } 3360 }
3028 } 3361 }
3029 if (ROWCOL_IS_BEFORE(pos, selection.mark)) {
3030 selection.end.row = selection.mark.row;
3031 selection.end.col = selection.mark.col + 1;
3032 selection.beg.row = pos.row;
3033 selection.beg.col = pos.col;
3034 } else {
3035 selection.beg.row = selection.mark.row;
3036 selection.beg.col = selection.mark.col;
3037 selection.end.row = pos.row;
3038 selection.end.col = pos.col + 1;
3039 } 3362 }
3040 } else if (selection.clicks == 2) { 3363 else
3041 selection_delimit_word (UP, &(selection.mark), 3364#endif
3042 &(selection.beg)); 3365 {
3043 selection_delimit_word (DN, &(selection.mark), 3366 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3044 &(selection.end)); 3367 selection.mark.col++;
3045 hate_those_clicks = 1;
3046 } else if (selection.clicks == 3) {
3047 selection.beg.row = selection.end.row = selection.mark.row;
3048 selection.beg.col = 0; 3368 selection.beg.col = 0;
3049 selection.end.col = ncol; 3369 selection.end.col = ncol;
3050 hate_those_clicks = 1;
3051 }
3052 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));
3053 return;
3054 }
3055#endif /* ! NO_OLD_SELECTION */
3056#ifndef NO_NEW_SELECTION
3057/* selection_style must not be OLD_SELECT to get here */
3058/*
3059 * This is mainly xterm style selection with a couple of differences, mainly
3060 * in the way button3 drag extension works.
3061 * We're either doing: button1 drag; button3 press; or button3 drag
3062 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3063 * is always at the left/right edge of the selection.
3064 * b) button3 press: extend/contract character/word/line at whichever edge of
3065 * the selection we are closest to.
3066 * c) button3 drag : extend/contract character/word/line - we select around
3067 * a point/word/line which is either the start or end of the selection
3068 * and it was decided by whichever point/word/line was `fixed' at the
3069 * time of the most recent button3 press
3070 */
3071 if (button3 && buttonpress) { /* button3 press */
3072 /* 3370 }
3073 * first determine which edge of the selection we are closest to 3371 }
3074 */ 3372
3075 if (ROWCOL_IS_BEFORE(pos, selection.beg) 3373 if (button3 && buttonpress)
3076 || (!ROWCOL_IS_AFTER(pos, selection.end) 3374 { /* mark may need to be changed */
3077 && (((pos.col - selection.beg.col)
3078 + ((pos.row - selection.beg.row) * ncol))
3079 < ((selection.end.col - pos.col)
3080 + ((selection.end.row - pos.row) * ncol)))))
3081 closeto = LEFT;
3082 if (closeto == LEFT) { 3375 if (closeto == LEFT)
3083 selection.beg.row = pos.row; 3376 {
3084 selection.beg.col = pos.col;
3085 selection.mark.row = selection.end.row; 3377 selection.mark.row = selection.end.row;
3086 selection.mark.col = selection.end.col 3378 selection.mark.col = selection.end.col - (selection.clicks == 2);
3087 - (selection.clicks == 2); 3379 }
3088 } else { 3380 else
3089 selection.end.row = pos.row; 3381 {
3090 selection.end.col = pos.col;
3091 selection.mark.row = selection.beg.row; 3382 selection.mark.row = selection.beg.row;
3092 selection.mark.col = selection.beg.col; 3383 selection.mark.col = selection.beg.col;
3093 }
3094 } else { /* button1 drag or button3 drag */
3095 if (ROWCOL_IS_AFTER(selection.mark, pos)) {
3096 if ((selection.mark.row == selection.end.row)
3097 && (selection.mark.col == selection.end.col)
3098 && clickchange && selection.clicks == 2)
3099 selection.mark.col--;
3100 selection.beg.row = pos.row;
3101 selection.beg.col = pos.col;
3102 selection.end.row = selection.mark.row;
3103 selection.end.col = selection.mark.col
3104 + (selection.clicks == 2);
3105 } else {
3106 selection.beg.row = selection.mark.row;
3107 selection.beg.col = selection.mark.col;
3108 selection.end.row = pos.row;
3109 selection.end.col = pos.col;
3110 }
3111 }
3112
3113 if (selection.clicks == 1) {
3114 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3115 if (end_col != -1 && selection.beg.col > end_col) {
3116#if 1
3117 selection.beg.col = ncol;
3118#else
3119 if (selection.beg.row != selection.end.row)
3120 selection.beg.col = ncol;
3121 else
3122 selection.beg.col = selection.mark.col;
3123#endif
3124 }
3125 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3126 if (end_col != -1 && selection.end.col > end_col)
3127 selection.end.col = ncol;
3128
3129 } else if (selection.clicks == 2) {
3130 if (ROWCOL_IS_AFTER(selection.end, selection.beg))
3131 selection.end.col--;
3132 selection_delimit_word (UP, &(selection.beg),
3133 &(selection.beg));
3134 selection_delimit_word (DN, &(selection.end),
3135 &(selection.end));
3136 } else if (selection.clicks == 3) {
3137#ifndef NO_FRILLS
3138 if ((Options & Opt_tripleclickwords)) {
3139 int end_row;
3140
3141 selection_delimit_word (UP, &(selection.beg),
3142 &(selection.beg));
3143 end_row = screen.tlen[selection.mark.row
3144 + TermWin.saveLines];
3145 for (end_row = selection.mark.row; end_row < TermWin.nrow;
3146 end_row++) {
3147 end_col = screen.tlen[end_row + TermWin.saveLines];
3148 if (end_col != -1) {
3149 selection.end.row = end_row;
3150 selection.end.col = end_col;
3151 selection_remove_trailing_spaces ();
3152 break;
3153 }
3154 }
3155 } else
3156#endif
3157 { 3384 }
3158 if (ROWCOL_IS_AFTER(selection.mark, selection.beg))
3159 selection.mark.col++;
3160 selection.beg.col = 0;
3161 selection.end.col = ncol;
3162 }
3163 } 3385 }
3164 if (button3 && buttonpress) { /* mark may need to be changed */
3165 if (closeto == LEFT) {
3166 selection.mark.row = selection.end.row;
3167 selection.mark.col = selection.end.col
3168 - (selection.clicks == 2);
3169 } else {
3170 selection.mark.row = selection.beg.row;
3171 selection.mark.col = selection.beg.col;
3172 }
3173 }
3174 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));
3175#endif /* ! NO_NEW_SELECTION */
3176} 3386}
3177 3387
3178#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
3179void 3389void
3180rxvt_term::selection_remove_trailing_spaces () 3390rxvt_term::selection_remove_trailing_spaces ()
3181{ 3391{
3182 int32_t end_col, end_row; 3392 int32_t end_col, end_row;
3183 text_t *stp; 3393 text_t *stp;
3184 3394
3185 end_col = selection.end.col; 3395 end_col = selection.end.col;
3186 end_row = selection.end.row; 3396 end_row = selection.end.row;
3187 for ( ; end_row >= selection.beg.row; ) { 3397 for ( ; end_row >= selection.beg.row; )
3398 {
3188 stp = screen.text[end_row + TermWin.saveLines]; 3399 stp = screen.text[end_row + TermWin.saveLines];
3189 while (--end_col >= 0) { 3400 while (--end_col >= 0)
3401 {
3190 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3402 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3191 break;
3192 }
3193 if (end_col >= 0
3194 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) {
3195 selection.end.col = end_col + 1;
3196 selection.end.row = end_row;
3197 break; 3403 break;
3198 } 3404 }
3405 if (end_col >= 0
3406 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3407 {
3408 selection.end.col = end_col + 1;
3409 selection.end.row = end_row;
3410 break;
3411 }
3199 end_row--; 3412 end_row--;
3200 end_col = TermWin.ncol; 3413 end_col = TermWin.ncol;
3201 } 3414 }
3202 if (selection.mark.row > selection.end.row) { 3415 if (selection.mark.row > selection.end.row)
3416 {
3203 selection.mark.row = selection.end.row; 3417 selection.mark.row = selection.end.row;
3204 selection.mark.col = selection.end.col; 3418 selection.mark.col = selection.end.col;
3419 }
3205 } else if (selection.mark.row == selection.end.row 3420 else if (selection.mark.row == selection.end.row
3206 && selection.mark.col > selection.end.col) 3421 && selection.mark.col > selection.end.col)
3207 selection.mark.col = selection.end.col; 3422 selection.mark.col = selection.end.col;
3208} 3423}
3209#endif 3424#endif
3210 3425
3211/* ------------------------------------------------------------------------- */ 3426/* ------------------------------------------------------------------------- */
3212/* 3427/*
… …
3215 */ 3430 */
3216void 3431void
3217rxvt_term::selection_rotate (int x, int y) 3432rxvt_term::selection_rotate (int x, int y)
3218{ 3433{
3219 selection.clicks = selection.clicks % 3 + 1; 3434 selection.clicks = selection.clicks % 3 + 1;
3220 selection_extend_colrow (Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3435 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3221} 3436}
3222 3437
3223/* ------------------------------------------------------------------------- */ 3438/* ------------------------------------------------------------------------- */
3224/* 3439/*
3225 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3440 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
… …
3232/* 3447/*
3233 * Respond to a request for our current selection 3448 * Respond to a request for our current selection
3234 * EXT: SelectionRequest 3449 * EXT: SelectionRequest
3235 */ 3450 */
3236void 3451void
3237rxvt_term::selection_send (const XSelectionRequestEvent *rq) 3452rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3238{ 3453{
3239 XSelectionEvent ev; 3454 XSelectionEvent ev;
3240 XTextProperty ct; 3455 XTextProperty ct;
3241 XICCEncodingStyle style; 3456 XICCEncodingStyle style;
3242 Atom target; 3457 Atom target;
3243 3458
3244 ev.type = SelectionNotify; 3459 ev.type = SelectionNotify;
3245 ev.property = None; 3460 ev.property = None;
3246 ev.display = rq->display; 3461 ev.display = rq.display;
3247 ev.requestor = rq->requestor; 3462 ev.requestor = rq.requestor;
3248 ev.selection = rq->selection; 3463 ev.selection = rq.selection;
3249 ev.target = rq->target; 3464 ev.target = rq.target;
3250 ev.time = rq->time; 3465 ev.time = rq.time;
3251 3466
3252 if (rq->target == xa[XA_TARGETS]) { 3467 if (rq.target == xa[XA_TARGETS])
3468 {
3253 Atom32 target_list[5]; 3469 Atom32 target_list[6];
3254 Atom32 *target = target_list; 3470 Atom32 *target = target_list;
3255 3471
3256 *target++ = (Atom32) xa[XA_TARGETS]; 3472 *target++ = (Atom32) xa[XA_TARGETS];
3473 *target++ = (Atom32) xa[XA_TIMESTAMP];
3257 *target++ = (Atom32) XA_STRING; 3474 *target++ = (Atom32) XA_STRING;
3258 *target++ = (Atom32) xa[XA_TEXT]; 3475 *target++ = (Atom32) xa[XA_TEXT];
3259 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3476 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3260#if X_HAVE_UTF8_STRING 3477#if X_HAVE_UTF8_STRING
3261 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3478 *target++ = (Atom32) xa[XA_UTF8_STRING];
3262#endif 3479#endif
3480
3263 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_ATOM, 3481 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3264 (8 * sizeof(target_list[0])), PropModeReplace, 3482 (8 * sizeof (target_list[0])), PropModeReplace,
3265 (unsigned char *)target_list, 3483 (unsigned char *)target_list,
3266 target - target_list); 3484 target - target_list);
3267 ev.property = rq->property; 3485 ev.property = rq.property;
3486 }
3487#if TODO // TODO
3268 } else if (rq->target == xa[XA_MULTIPLE]) { 3488 else if (rq.target == xa[XA_MULTIPLE])
3489 {
3269 /* TODO: Handle MULTIPLE */ 3490 /* TODO: Handle MULTIPLE */
3491 }
3492#endif
3270 } else if (rq->target == xa[XA_TIMESTAMP] && selection.text) { 3493 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3494 {
3271 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3495 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3272 (8 * sizeof(Time)), PropModeReplace, 3496 (8 * sizeof (Time)), PropModeReplace,
3273 (unsigned char *)&selection_time, 1); 3497 (unsigned char *)&selection_time, 1);
3274 ev.property = rq->property; 3498 ev.property = rq.property;
3499 }
3275 } else if (rq->target == XA_STRING 3500 else if (rq.target == XA_STRING
3276 || rq->target == xa[XA_TEXT] 3501 || rq.target == xa[XA_TEXT]
3277 || rq->target == xa[XA_COMPOUND_TEXT] 3502 || rq.target == xa[XA_COMPOUND_TEXT]
3278 || rq->target == xa[XA_UTF8_STRING] 3503 || rq.target == xa[XA_UTF8_STRING]
3279 ) { 3504 )
3505 {
3280 short freect = 0; 3506 short freect = 0;
3281 int selectlen; 3507 int selectlen;
3282 char *cl; 3508 wchar_t *cl;
3283 3509
3284 target = rq->target; 3510 target = rq.target;
3285 3511
3286 if (target == XA_STRING) 3512 if (target == XA_STRING)
3287 // we actually don't do XA_STRING, but who cares, as i18n clients 3513 // we actually don't do XA_STRING, but who cares, as i18n clients
3288 // will ask for another format anyways. 3514 // will ask for another format anyways.
3289 style = XStringStyle; 3515 style = XStringStyle;
3290 else if (target == xa[XA_TEXT]) 3516 else if (target == xa[XA_TEXT])
3291 style = XTextStyle; 3517 style = XStdICCTextStyle;
3292 else if (target == xa[XA_COMPOUND_TEXT]) 3518 else if (target == xa[XA_COMPOUND_TEXT])
3519 style = XCompoundTextStyle;
3520#if X_HAVE_UTF8_STRING
3521 else if (target == xa[XA_UTF8_STRING])
3522 style = XUTF8StringStyle;
3523#endif
3524 else
3525 {
3526 target = xa[XA_COMPOUND_TEXT];
3293 style = XCompoundTextStyle; 3527 style = XCompoundTextStyle;
3294#if X_HAVE_UTF8_STRING
3295 else if (target == xa[XA_UTF8_STRING])
3296 style = XUTF8StringStyle;
3297#endif
3298 else
3299 {
3300 target = xa[XA_COMPOUND_TEXT];
3301 style = XCompoundTextStyle;
3302 } 3528 }
3303 3529
3304 if (selection.text) { 3530 if (selection.text)
3531 {
3305 cl = (char *)selection.text; 3532 cl = selection.text;
3306 selectlen = selection.len; 3533 selectlen = selection.len;
3534 }
3307 } else { 3535 else
3536 {
3308 cl = ""; 3537 cl = L"";
3309 selectlen = 0; 3538 selectlen = 0;
3310 } 3539 }
3311 3540
3541 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3542 // manually for XUTF8StringStyle.
3312 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, style, &ct) >= 0) 3543 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3313 freect = 1; 3544 freect = 1;
3314 else 3545 else
3315 { 3546 {
3316 /* if we failed to convert then send it raw */ 3547 /* if we failed to convert then send it raw */
3317 ct.value = (unsigned char *)cl; 3548 ct.value = (unsigned char *)cl;
3318 ct.nitems = selectlen; 3549 ct.nitems = selectlen;
3319 } 3550 }
3320 3551
3321 XChangeProperty(Xdisplay, rq->requestor, rq->property, 3552 XChangeProperty (display->display, rq.requestor, rq.property,
3322 target, 8, PropModeReplace, 3553 target, 8, PropModeReplace,
3323 ct.value, (int)ct.nitems); 3554 ct.value, (int)ct.nitems);
3324 ev.property = rq->property; 3555 ev.property = rq.property;
3325 3556
3326 if (freect) 3557 if (freect)
3327 XFree (ct.value); 3558 XFree (ct.value);
3328 } 3559 }
3560
3329 XSendEvent(Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3561 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3330} 3562}
3331 3563
3332/* ------------------------------------------------------------------------- * 3564/* ------------------------------------------------------------------------- *
3333 * MOUSE ROUTINES * 3565 * MOUSE ROUTINES *
3334 * ------------------------------------------------------------------------- */ 3566 * ------------------------------------------------------------------------- */
… …
3337 * return col/row values corresponding to x/y pixel values 3569 * return col/row values corresponding to x/y pixel values
3338 */ 3570 */
3339void 3571void
3340rxvt_term::pixel_position (int *x, int *y) 3572rxvt_term::pixel_position (int *x, int *y)
3341{ 3573{
3342 *x = Pixel2Col(*x); 3574 *x = Pixel2Col (*x);
3343 /* MAX_IT(*x, 0); MIN_IT(*x, (int)TermWin.ncol - 1); */ 3575 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3344 *y = Pixel2Row(*y); 3576 *y = Pixel2Row (*y);
3345 /* MAX_IT(*y, 0); MIN_IT(*y, (int)TermWin.nrow - 1); */ 3577 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3346} 3578}
3347 3579
3348/* ------------------------------------------------------------------------- */ 3580/* ------------------------------------------------------------------------- */
3349#ifdef USE_XIM 3581#ifdef USE_XIM
3350void 3582void
3351rxvt_term::set_position (XPoint *pos) 3583rxvt_term::im_set_position (XPoint &pos)
3352{ 3584{
3353 XWindowAttributes xwa; 3585 XWindowAttributes xwa;
3354 3586
3355 XGetWindowAttributes (Xdisplay, TermWin.vt, &xwa); 3587 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3588
3356 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3589 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3357 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3590 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3358} 3591}
3359
3360#endif 3592#endif
3361/* ------------------------------------------------------------------------- */ 3593
3362 3594#if ENABLE_OVERLAY
3595void
3596rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3597{
3598 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3599 return;
3600
3601 want_refresh = 1;
3602
3603 scr_overlay_off ();
3604
3605 if (x < 0) x = TermWin.ncol - w;
3606 if (y < 0) y = TermWin.nrow - h;
3607
3608 // make space for border
3609 w += 2; MIN_IT (w, TermWin.ncol);
3610 h += 2; MIN_IT (h, TermWin.nrow);
3611
3612 x -= 1; MAX_IT (x, 0);
3613 y -= 1; MAX_IT (y, 0);
3614
3615 MIN_IT (x, TermWin.ncol - w);
3616 MIN_IT (y, TermWin.nrow - h);
3617
3618 ov_x = x; ov_y = y;
3619 ov_w = w; ov_h = h;
3620
3621 ov_text = new text_t *[h];
3622 ov_rend = new rend_t *[h];
3623
3624 for (y = 0; y < h; y++)
3625 {
3626 text_t *tp = ov_text[y] = new text_t[w];
3627 rend_t *rp = ov_rend[y] = new rend_t[w];
3628
3629 text_t t0, t1, t2;
3630 rend_t r = OVERLAY_RSTYLE;
3631
3632 if (y == 0)
3633 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3634 else if (y < h - 1)
3635 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3636 else
3637 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3638
3639 *tp++ = t0;
3640 *rp++ = r;
3641
3642 for (x = w - 2; x > 0; --x)
3643 {
3644 *tp++ = t1;
3645 *rp++ = r;
3646 }
3647
3648 *tp = t2;
3649 *rp = r;
3650 }
3651}
3652
3653void
3654rxvt_term::scr_overlay_off ()
3655{
3656 if (!ov_text)
3657 return;
3658
3659 want_refresh = 1;
3660
3661 for (int y = 0; y < ov_h; y++)
3662 {
3663 delete [] ov_text[y];
3664 delete [] ov_rend[y];
3665 }
3666
3667 delete [] ov_text; ov_text = 0;
3668 delete [] ov_rend; ov_rend = 0;
3669}
3670
3671void
3672rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3673{
3674 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3675 return;
3676
3677 x++, y++;
3678
3679 ov_text[y][x] = text;
3680 ov_rend[y][x] = rend;
3681}
3682
3683void
3684rxvt_term::scr_overlay_set (int x, int y, const char *s)
3685{
3686 while (*s)
3687 scr_overlay_set (x++, y, *s++);
3688}
3689
3690void
3691rxvt_term::scr_swap_overlay ()
3692{
3693 if (!ov_text)
3694 return;
3695
3696 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3697
3698 // swap screen mem with overlay
3699 for (int y = ov_h; y--; )
3700 {
3701 text_t *t1 = ov_text[y];
3702 rend_t *r1 = ov_rend[y];
3703
3704 text_t *t2 = screen.text[y + row_offset] + ov_x;
3705 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3706
3707 for (int x = ov_w; x--; )
3708 {
3709 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3711 }
3712 }
3713}
3714
3715#endif
3363/* ------------------------------------------------------------------------- * 3716/* ------------------------------------------------------------------------- */
3364 * DEBUG ROUTINES *
3365 * ------------------------------------------------------------------------- */
3366#if 0
3367void
3368rxvt_debug_colors(void)
3369{
3370 int color;
3371 const char *name[] = {
3372 "fg", "bg",
3373 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3374 };
3375
3376 fprintf(stderr, "Color ( ");
3377 if (rstyle & RS_RVid)
3378 fprintf(stderr, "rvid ");
3379 if (rstyle & RS_Bold)
3380 fprintf(stderr, "bold ");
3381 if (rstyle & RS_Blink)
3382 fprintf(stderr, "blink ");
3383 if (rstyle & RS_Uline)
3384 fprintf(stderr, "uline ");
3385 fprintf(stderr, "): ");
3386
3387 color = GET_FGCOLOR(rstyle);
3388#ifndef NO_BRIGHTCOLOR
3389 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3390 color -= (minBrightCOLOR - minCOLOR);
3391 fprintf(stderr, "bright ");
3392 }
3393#endif
3394 fprintf(stderr, "%s on ", name[color]);
3395
3396 color = GET_BGCOLOR(rstyle);
3397#ifndef NO_BRIGHTCOLOR
3398 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3399 color -= (minBrightCOLOR - minCOLOR);
3400 fprintf(stderr, "bright ");
3401 }
3402#endif
3403 fprintf(stderr, "%s\n", name[color]);
3404}
3405#endif

Diff Legend

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