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.59 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.155 by root, Thu Feb 3 07:45:39 2005 UTC

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

Diff Legend

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