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

Diff Legend

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