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

Diff Legend

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