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.33 by pcg, Sun Feb 22 17:13:21 2004 UTC vs.
Revision 1.157 by root, Sun Feb 13 08:56:28 2005 UTC

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

Diff Legend

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