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