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

Diff Legend

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