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

Diff Legend

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