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