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

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

Diff Legend

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