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.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.170 by root, Mon Nov 28 19:35:04 2005 UTC

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

Diff Legend

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