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.35 by pcg, Tue Feb 24 11:48:40 2004 UTC vs.
Revision 1.159 by root, Mon Feb 21 19:26:07 2005 UTC

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

Diff Legend

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