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

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

Diff Legend

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