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.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.156 by root, Fri Feb 4 11:41:23 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/* ------------------------------------------------------------------------- */
763/* 773/*
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 uint32_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 uint32_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;
850 } 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 ();
867 }
868
851 if (screen.flags & Screen_WrapNext) 869 if (screen.flags & Screen_WrapNext)
852 { 870 {
853 screen.tlen[row] = -1; 871 screen.tlen[row] = -1;
854 if (screen.cur.row == screen.bscroll) 872
855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
856 else if (screen.cur.row < (TermWin.nrow - 1))
857 row = (++screen.cur.row) + TermWin.saveLines; 873 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
874
858 stp = screen.text[row]; /* _must_ refresh */ 875 stp = screen.text[row]; /* _must_ refresh */
859 srp = screen.rend[row]; /* _must_ refresh */ 876 srp = screen.rend[row]; /* _must_ refresh */
860 screen.cur.col = 0; 877 }
861 screen.flags &= ~Screen_WrapNext; 878
879 // rely on wcwidth to tell us the character width, at least for non-latin1
880 // do wcwidth before further replacements, as wcwidth says that line-drawing
881 // characters have width -1 (DOH!) on GNU/Linux sometimes.
882 int width = c < 0x100 ? 1 : wcwidth (c);
883
884 if (charsets[screen.charset] == '0') // DEC SPECIAL
862 } 885 {
886 // vt100 special graphics and line drawing
887 // 5f-7e standard vt100
888 // 40-5e rxvt extension for extra curses acs chars
889 static uint16_t vt100_0[63] = { // 40 .. 7e
890 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
893 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
894 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
895 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
896 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
897 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
898 };
899
900 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
901 {
902 c = vt100_0[c - 0x40];
903 width = 1;
904 }
905 }
906
863 if (screen.flags & Screen_Insert) 907 if (screen.flags & Screen_Insert)
864 scr_insdel_chars (1, INSERT); 908 scr_insdel_chars (width, INSERT);
865 909
866 if (charsets[screen.charset] == '0') // DEC SPECIAL
867 switch (c)
868 {
869 // dunno where these come from
870#if 0
871 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
872 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
873#endif
874 // vt100 special graphics and line drawing
875 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
876 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
877 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
878 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
879 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break;
880 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
881 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
882 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
883 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
884 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
885 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
886 }
887
888 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
889 // rely on wcwidth to tell us the character width, at least for non-ascii
890 int width = c <= 128 ? 1 : wcwidth (c);
891
892 // width -1 characters (e.g. combining chars) are ignored currently.
893 if (width > 0) 910 if (width != 0)
911 {
912 // some utf-8 decoders decode surrogate characters.
913 if (0xd800 <= c && c <= 0xdfff)
914 c = 0xfffd;
915
916#if !UNICODE_3
917 // trim characters we can't store directly :(
918 if (c >= 0x10000)
919# if ENABLE_COMBINING
920 c = rxvt_composite.compose (c); // map to lower 16 bits
921# else
922 c = 0xfffd;
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))
894 { 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
947 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
948
895 do 949 do
896 { 950 {
897 stp[screen.cur.col] = c; 951 stp[screen.cur.col] = c;
898 srp[screen.cur.col] = rend; 952 srp[screen.cur.col] = rend;
899 953
… …
910 c = NOCHAR; 964 c = NOCHAR;
911 } 965 }
912 while (--width > 0); 966 while (--width > 0);
913 967
914 // pad with spaces when overwriting wide character with smaller one 968 // pad with spaces when overwriting wide character with smaller one
915 for (int c = screen.cur.col; stp[c] == NOCHAR && c < last_col; c++) 969 if (!width)
970 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
971 {
972 stp[c] = ' ';
973 srp[c] = rend;
974 }
975 }
976 else if (width == 0)
977 {
978#if ENABLE_COMBINING
979 // handle combining characters
980 // we just tag the accent on the previous on-screen character.
981 // this is arguably not correct, but also arguably not wrong.
982 // we don't handle double-width characters nicely yet.
983
984 text_t *tp;
985 rend_t *rp;
986
987 if (screen.cur.col > 0)
916 { 988 {
917 stp[c] = ' '; 989 tp = stp + screen.cur.col - 1;
918 srp[c] = rend; 990 rp = srp + screen.cur.col - 1;
991
992 while (*tp == NOCHAR && tp > stp)
993 tp--, rp--;
919 } 994 }
995 else if (screen.cur.row > 0
996 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
997 {
998 int line = screen.cur.row - 1 + TermWin.saveLines;
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--;
920 } 1005 }
921 else 1006 else
922 (void)0; /* handle combining character etc. here. */ 1007 continue;
1008
1009 // first try to find a precomposed character
1010 unicode_t n = rxvt_compose (*tp, c);
1011 if (n == NOCHAR)
1012 n = rxvt_composite.compose (*tp, c);
1013
1014 *tp = n;
1015 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1016#endif
1017 }
923 } 1018 }
924 1019
925 if (screen.tlen[row] != -1) /* XXX: think about this */ 1020 if (screen.tlen[row] != -1) /* XXX: think about this */
926 MAX_IT (screen.tlen[row], screen.cur.col); 1021 MAX_IT (screen.tlen[row], screen.cur.col);
927
928 /*
929 * If we wrote anywhere in the selected area, kill the selection
930 * XXX: should we kill the mark too? Possibly, but maybe that
931 * should be a similar check.
932 */
933 if (clearsel)
934 CLEAR_SELECTION ();
935 1022
936#ifdef DEBUG_STRICT 1023#ifdef DEBUG_STRICT
937 assert (screen.cur.row >= 0); 1024 assert (screen.cur.row >= 0);
938#else /* drive with your eyes closed */ 1025#else /* drive with your eyes closed */
939 MAX_IT (screen.cur.row, 0); 1026 MAX_IT (screen.cur.row, 0);
… …
947 */ 1034 */
948void 1035void
949rxvt_term::scr_backspace () 1036rxvt_term::scr_backspace ()
950{ 1037{
951 want_refresh = 1; 1038 want_refresh = 1;
1039
952 if (screen.cur.col == 0) 1040 if (screen.cur.col == 0)
953 { 1041 {
954 if (screen.cur.row > 0) 1042 if (screen.cur.row > 0)
955 { 1043 {
956#ifdef TERMCAP_HAS_BW 1044#ifdef TERMCAP_HAS_BW
957 screen.cur.col = TermWin.ncol - 1; 1045 screen.cur.col = TermWin.ncol - 1;
958 screen.cur.row--; 1046 screen.cur.row--;
959 return; 1047 return;
960#endif 1048#endif
961
962 } 1049 }
963 } 1050 }
964 else if ((screen.flags & Screen_WrapNext) == 0) 1051 else if (!(screen.flags & Screen_WrapNext))
965 scr_gotorc (0, -1, RELATIVE); 1052 scr_gotorc (0, -1, RELATIVE);
1053
966 screen.flags &= ~Screen_WrapNext; 1054 screen.flags &= ~Screen_WrapNext;
967} 1055}
968 1056
969/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
970/* 1058/*
971 * Process Horizontal Tab 1059 * Process Horizontal Tab
972 * count: +ve = forward; -ve = backwards 1060 * count: +ve = forward; -ve = backwards
973 * XTERM_SEQ: CTRL-I 1061 * XTERM_SEQ: CTRL-I
974 */ 1062 */
975void 1063void
976rxvt_term::scr_tab (int count) 1064rxvt_term::scr_tab (int count, bool ht)
977{ 1065{
978 int i, x; 1066 int i, x;
979 1067
980 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
981 want_refresh = 1; 1068 want_refresh = 1;
982 i = x = screen.cur.col; 1069 i = x = screen.cur.col;
1070
983 if (count == 0) 1071 if (count == 0)
984 return; 1072 return;
985 else if (count > 0) 1073 else if (count > 0)
986 { 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
987 for (; ++i < TermWin.ncol; ) 1081 for (; ++i < TermWin.ncol; )
988 if (tabs[i]) 1082 if (tabs[i])
989 { 1083 {
990 x = i; 1084 x = i;
991 if (!--count) 1085 if (!--count)
992 break; 1086 break;
993 } 1087 }
1088 else
1089 ht &= tp[i] == ' '
1090 && RS_SAME (rp[i], base_rend);
1091
994 if (count) 1092 if (count)
995 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 }
996 } 1115 }
997 else /* if (count < 0) */ 1116 else /* if (count < 0) */
998 { 1117 {
999 for (; --i >= 0; ) 1118 for (; --i >= 0; )
1000 if (tabs[i]) 1119 if (tabs[i])
1001 { 1120 {
1002 x = i; 1121 x = i;
1003 if (!++count) 1122 if (!++count)
1004 break; 1123 break;
1005 } 1124 }
1125
1006 if (count) 1126 if (count)
1007 x = 0; 1127 x = 0;
1008 } 1128 }
1129
1009 if (x != screen.cur.col) 1130 if (x != screen.cur.col)
1010 scr_gotorc (0, x, R_RELATIVE); 1131 scr_gotorc (0, x, R_RELATIVE);
1011} 1132}
1012 1133
1013/* ------------------------------------------------------------------------- */ 1134/* ------------------------------------------------------------------------- */
… …
1015 * Process DEC Back Index 1136 * Process DEC Back Index
1016 * XTERM_SEQ: ESC 6 1137 * XTERM_SEQ: ESC 6
1017 * 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
1018 * in that row right. Clear left column. 1139 * in that row right. Clear left column.
1019 */ 1140 */
1020#ifndef NO_FRILLS 1141#if ENABLE_FRILLS
1021void 1142void
1022rxvt_term::scr_backindex () 1143rxvt_term::scr_backindex ()
1023{ 1144{
1024 if (screen.cur.col > 0) 1145 if (screen.cur.col > 0)
1025 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1026 else 1147 else
1027 { 1148 {
1028 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1149 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1029 return; /* um, yeah? */ 1150 return; /* um, yeah? */
1151
1030 scr_insdel_chars (1, INSERT); 1152 scr_insdel_chars (1, INSERT);
1031 } 1153 }
1032} 1154}
1033#endif 1155#endif
1034/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
… …
1036 * Process DEC Forward Index 1158 * Process DEC Forward Index
1037 * XTERM_SEQ: ESC 9 1159 * XTERM_SEQ: ESC 9
1038 * 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
1039 * in that row left. Clear right column. 1161 * in that row left. Clear right column.
1040 */ 1162 */
1041#ifndef NO_FRILLS 1163#if ENABLE_FRILLS
1042void 1164void
1043rxvt_term::scr_forwardindex () 1165rxvt_term::scr_forwardindex ()
1044{ 1166{
1045 int row; 1167 int row;
1046 1168
1047 if (screen.cur.col < TermWin.ncol - 1) 1169 if (screen.cur.col < TermWin.ncol - 1)
1048 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1170 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1049 else 1171 else
1050 { 1172 {
1051 row = screen.cur.row + TermWin.saveLines; 1173 row = screen.cur.row + TermWin.saveLines;
1174
1052 if (screen.tlen[row] == 0) 1175 if (screen.tlen[row] == 0)
1053 return; /* um, yeah? */ 1176 return; /* um, yeah? */
1054 else if (screen.tlen[row] == -1) 1177 else if (screen.tlen[row] == -1)
1055 screen.tlen[row] = TermWin.ncol; 1178 screen.tlen[row] = TermWin.ncol;
1179
1056 scr_gotorc (0, 0, R_RELATIVE); 1180 scr_gotorc (0, 0, R_RELATIVE);
1057 scr_insdel_chars (1, DELETE); 1181 scr_insdel_chars (1, DELETE);
1058 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1182 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1059 } 1183 }
1060} 1184}
… …
1068rxvt_term::scr_gotorc (int row, int col, int relative) 1192rxvt_term::scr_gotorc (int row, int col, int relative)
1069{ 1193{
1070 want_refresh = 1; 1194 want_refresh = 1;
1071 ZERO_SCROLLBACK (); 1195 ZERO_SCROLLBACK ();
1072 1196
1073 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));
1074
1075 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1197 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1076 : col);
1077 MAX_IT (screen.cur.col, 0); 1198 MAX_IT (screen.cur.col, 0);
1078 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1199 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1079 1200
1080 screen.flags &= ~Screen_WrapNext; 1201 screen.flags &= ~Screen_WrapNext;
1202
1081 if (relative & R_RELATIVE) 1203 if (relative & R_RELATIVE)
1082 { 1204 {
1083 if (row > 0) 1205 if (row > 0)
1084 { 1206 {
1085 if (screen.cur.row <= screen.bscroll 1207 if (screen.cur.row <= screen.bscroll
… …
1105 MIN_IT (screen.cur.row, screen.bscroll); 1227 MIN_IT (screen.cur.row, screen.bscroll);
1106 } 1228 }
1107 else 1229 else
1108 screen.cur.row = row; 1230 screen.cur.row = row;
1109 } 1231 }
1232
1110 MAX_IT (screen.cur.row, 0); 1233 MAX_IT (screen.cur.row, 0);
1111 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1234 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1112
1113 while (screen.cur.col > 0
1114 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1115 screen.cur.col--;
1116} 1235}
1117 1236
1118/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1119/* 1238/*
1120 * direction should be UP or DN 1239 * direction should be UP or DN
1121 */ 1240 */
1122void 1241void
1123rxvt_term::scr_index (enum page_dirn direction) 1242rxvt_term::scr_index (enum page_dirn direction)
1124{ 1243{
1125 int dirn; 1244 int dirn;
1126 1245
1127 want_refresh = 1; 1246 want_refresh = 1;
1247 ZERO_SCROLLBACK ();
1248
1128 dirn = ((direction == UP) ? 1 : -1); 1249 dirn = ((direction == UP) ? 1 : -1);
1129 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1130
1131 ZERO_SCROLLBACK ();
1132 1250
1133 screen.flags &= ~Screen_WrapNext; 1251 screen.flags &= ~Screen_WrapNext;
1252
1134 if ((screen.cur.row == screen.bscroll && direction == UP) 1253 if ((screen.cur.row == screen.bscroll && direction == UP)
1135 || (screen.cur.row == screen.tscroll && direction == DN)) 1254 || (screen.cur.row == screen.tscroll && direction == DN))
1136 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1255 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1137 else 1256 else
1138 screen.cur.row += dirn; 1257 screen.cur.row += dirn;
1258
1139 MAX_IT (screen.cur.row, 0); 1259 MAX_IT (screen.cur.row, 0);
1140 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1260 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1141 selection_check (0); 1261 selection_check (0);
1142} 1262}
1143 1263
… …
1152rxvt_term::scr_erase_line (int mode) 1272rxvt_term::scr_erase_line (int mode)
1153{ 1273{
1154 unsigned int row, col, num; 1274 unsigned int row, col, num;
1155 1275
1156 want_refresh = 1; 1276 want_refresh = 1;
1157 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1158 ZERO_SCROLLBACK (); 1277 ZERO_SCROLLBACK ();
1159 1278
1160 selection_check (1); 1279 selection_check (1);
1161
1162 screen.flags &= ~Screen_WrapNext;
1163 1280
1164 row = TermWin.saveLines + screen.cur.row; 1281 row = TermWin.saveLines + screen.cur.row;
1165 switch (mode) 1282 switch (mode)
1166 { 1283 {
1167 case 0: /* erase to end of line */ 1284 case 0: /* erase to end of line */
… …
1190 default: 1307 default:
1191 return; 1308 return;
1192 } 1309 }
1193 1310
1194 if (screen.text[row]) 1311 if (screen.text[row])
1195 scr_blank_line (& (screen.text[row][col]), 1312 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1196 & (screen.rend[row][col]), num, rstyle);
1197 else 1313 else
1198 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1314 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1199} 1315}
1200 1316
1201/* ------------------------------------------------------------------------- */ 1317/* ------------------------------------------------------------------------- */
… …
1206 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1322 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1207 */ 1323 */
1208void 1324void
1209rxvt_term::scr_erase_screen (int mode) 1325rxvt_term::scr_erase_screen (int mode)
1210{ 1326{
1211 int num; 1327 int num;
1212 int32_t row, row_offset; 1328 int32_t row, row_offset;
1213 rend_t ren; 1329 rend_t ren;
1214 XGCValues gcvalue; 1330 XGCValues gcvalue;
1215 1331
1216 want_refresh = 1; 1332 want_refresh = 1;
1217 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1218 ZERO_SCROLLBACK (); 1333 ZERO_SCROLLBACK ();
1334
1219 row_offset = (int32_t)TermWin.saveLines; 1335 row_offset = (int32_t)TermWin.saveLines;
1220 1336
1221 switch (mode) 1337 switch (mode)
1222 { 1338 {
1223 case 0: /* erase to end of screen */ 1339 case 0: /* erase to end of screen */
… …
1238 num = TermWin.nrow; 1354 num = TermWin.nrow;
1239 break; 1355 break;
1240 default: 1356 default:
1241 return; 1357 return;
1242 } 1358 }
1243 refresh_type |= REFRESH_BOUNDS; 1359
1244 if (selection.op && current_screen == selection.screen 1360 if (selection.op && current_screen == selection.screen
1245 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1361 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1246 || (selection.end.row >= row 1362 || (selection.end.row >= row
1247 && selection.end.row <= row + num))) 1363 && selection.end.row <= row + num)))
1248 CLEAR_SELECTION (); 1364 CLEAR_SELECTION ();
1365
1249 if (row >= TermWin.nrow) /* Out Of Bounds */ 1366 if (row >= TermWin.nrow) /* Out Of Bounds */
1250 return; 1367 return;
1368
1251 MIN_IT (num, (TermWin.nrow - row)); 1369 MIN_IT (num, (TermWin.nrow - row));
1370
1252 if (rstyle & (RS_RVid | RS_Uline)) 1371 if (rstyle & (RS_RVid | RS_Uline))
1253 ren = (rend_t) ~RS_None; 1372 ren = (rend_t) ~RS_None;
1254 else if (GET_BASEBG (rstyle) == Color_bg) 1373 else if (GET_BASEBG (rstyle) == Color_bg)
1255 { 1374 {
1256 ren = DEFAULT_RSTYLE; 1375 ren = DEFAULT_RSTYLE;
1257 CLEAR_ROWS (row, num); 1376 CLEAR_ROWS (row, num);
1258 } 1377 }
1259 else 1378 else
1260 { 1379 {
1261 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1262 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1263 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1382 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1264 ERASE_ROWS (row, num); 1383 ERASE_ROWS (row, num);
1265 gcvalue.foreground = PixColors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1266 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1267 } 1386 }
1387
1268 for (; num--; row++) 1388 for (; num--; row++)
1269 { 1389 {
1270 scr_blank_screen_mem (screen.text, screen.rend, 1390 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1271 (unsigned int) (row + row_offset), rstyle);
1272 screen.tlen[row + row_offset] = 0; 1391 screen.tlen[row + row_offset] = 0;
1273 scr_blank_line (drawn_text[row], drawn_rend[row], 1392 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1274 (unsigned int)TermWin.ncol, ren);
1275 } 1393 }
1276} 1394}
1277 1395
1278/* ------------------------------------------------------------------------- */ 1396/* ------------------------------------------------------------------------- */
1279/* 1397/*
… …
1285{ 1403{
1286 int i, j, k; 1404 int i, j, k;
1287 rend_t *r1, fs; 1405 rend_t *r1, fs;
1288 1406
1289 want_refresh = 1; 1407 want_refresh = 1;
1408 ZERO_SCROLLBACK ();
1409
1290 num_scr_allow = 0; 1410 num_scr_allow = 0;
1291 ZERO_SCROLLBACK ();
1292 selection_check (3); 1411 selection_check (3);
1293 1412
1294 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1295 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1414 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1296 { 1415 {
1297 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1416 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1298 fill_text (screen.text[k], 'E', TermWin.ncol); 1417 fill_text (screen.text[k], 'E', TermWin.ncol);
1299 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1418 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1306 * Insert/Delete <count> lines 1425 * Insert/Delete <count> lines
1307 */ 1426 */
1308void 1427void
1309rxvt_term::scr_insdel_lines (int count, int insdel) 1428rxvt_term::scr_insdel_lines (int count, int insdel)
1310{ 1429{
1311 int end; 1430 int end;
1312 1431
1313 ZERO_SCROLLBACK (); 1432 ZERO_SCROLLBACK ();
1314 1433
1315 selection_check (1); 1434 selection_check (1);
1316 1435
… …
1323 if (insdel == DELETE) 1442 if (insdel == DELETE)
1324 return; 1443 return;
1325 else if (insdel == INSERT) 1444 else if (insdel == INSERT)
1326 count = end; 1445 count = end;
1327 } 1446 }
1328 screen.flags &= ~Screen_WrapNext; 1447
1448 scr_do_wrap ();
1329 1449
1330 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1450 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1331} 1451}
1332 1452
1333/* ------------------------------------------------------------------------- */ 1453/* ------------------------------------------------------------------------- */
… …
1335 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1336 */ 1456 */
1337void 1457void
1338rxvt_term::scr_insdel_chars (int count, int insdel) 1458rxvt_term::scr_insdel_chars (int count, int insdel)
1339{ 1459{
1340 int col, row; 1460 int col, row;
1341 rend_t tr; 1461 rend_t tr;
1342 text_t *stp; 1462 text_t *stp;
1343 rend_t *srp; 1463 rend_t *srp;
1344 int16_t *slp; 1464 int16_t *slp;
1345 1465
1346 want_refresh = 1; 1466 want_refresh = 1;
1347 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1348 1468
1349 if (count <= 0) 1469 if (count <= 0)
1350 return; 1470 return;
1351 1471
1472 scr_do_wrap ();
1473
1352 selection_check (1); 1474 selection_check (1);
1353 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1475 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1354 1476
1355 row = screen.cur.row + TermWin.saveLines; 1477 row = screen.cur.row + TermWin.saveLines;
1356 screen.flags &= ~Screen_WrapNext;
1357 1478
1358 stp = screen.text[row]; 1479 stp = screen.text[row];
1359 srp = screen.rend[row]; 1480 srp = screen.rend[row];
1360 slp = & (screen.tlen[row]); 1481 slp = &screen.tlen[row];
1482
1361 switch (insdel) 1483 switch (insdel)
1362 { 1484 {
1363 case INSERT: 1485 case INSERT:
1364 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1486 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1365 col--)
1366 { 1487 {
1367 stp[col] = stp[col - count]; 1488 stp[col] = stp[col - count];
1368 srp[col] = srp[col - count]; 1489 srp[col] = srp[col - count];
1369 } 1490 }
1491
1370 if (*slp != -1) 1492 if (*slp != -1)
1371 { 1493 {
1372 *slp += count; 1494 *slp += count;
1373 MIN_IT (*slp, TermWin.ncol); 1495 MIN_IT (*slp, TermWin.ncol);
1374 } 1496 }
1497
1375 if (selection.op && current_screen == selection.screen 1498 if (selection.op && current_screen == selection.screen
1376 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1499 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1377 { 1500 {
1378 if (selection.end.row != screen.cur.row 1501 if (selection.end.row != screen.cur.row
1379 || (selection.end.col + count >= TermWin.ncol)) 1502 || (selection.end.col + count >= TermWin.ncol))
1380 CLEAR_SELECTION (); 1503 CLEAR_SELECTION ();
1381 else 1504 else
1382 { /* shift selection */ 1505 { /* shift selection */
1383 selection.beg.col += count; 1506 selection.beg.col += count;
1384 selection.mark.col += count; /* XXX: yes? */ 1507 selection.mark.col += count; /* XXX: yes? */
1385 selection.end.col += count; 1508 selection.end.col += count;
1386 } 1509 }
1387 } 1510 }
1511
1388 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1512 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1389 (unsigned int)count, rstyle); 1513 (unsigned int)count, rstyle);
1390 break; 1514 break;
1515
1391 case ERASE: 1516 case ERASE:
1392 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1517 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1393 selection_check (1); 1518 selection_check (1);
1394 screen.cur.col -= count; 1519 screen.cur.col -= count;
1395 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1520 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1396 (unsigned int)count, rstyle); 1521 (unsigned int)count, rstyle);
1397 break; 1522 break;
1523
1398 case DELETE: 1524 case DELETE:
1399 tr = srp[TermWin.ncol - 1]
1400 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1526
1401 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1527 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1402 { 1528 {
1403 stp[col] = stp[col + count]; 1529 stp[col] = stp[col + count];
1404 srp[col] = srp[col + count]; 1530 srp[col] = srp[col + count];
1405 } 1531 }
1532
1406 scr_blank_line (& (stp[TermWin.ncol - count]), 1533 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1407 & (srp[TermWin.ncol - count]),
1408 (unsigned int)count, tr); 1534 (unsigned int)count, tr);
1535
1409 if (*slp == -1) /* break line continuation */ 1536 if (*slp == -1) /* break line continuation */
1410 *slp = TermWin.ncol; 1537 *slp = TermWin.ncol;
1538
1411 *slp -= count; 1539 *slp -= count;
1412 MAX_IT (*slp, 0); 1540 MAX_IT (*slp, 0);
1541
1413 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1414 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1415 { 1544 {
1416 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
1417 || (screen.cur.col >= selection.beg.col - count) 1546 || (screen.cur.col >= selection.beg.col - count)
1418 || selection.end.col >= TermWin.ncol) 1547 || selection.end.col >= TermWin.ncol)
1419 CLEAR_SELECTION (); 1548 CLEAR_SELECTION ();
1420 else 1549 else
1421 { 1550 {
1422 /* shift selection */ 1551 /* shift selection */
1423 selection.beg.col -= count; 1552 selection.beg.col -= count;
1424 selection.mark.col -= count; /* XXX: yes? */ 1553 selection.mark.col -= count; /* XXX: yes? */
1425 selection.end.col -= count; 1554 selection.end.col -= count;
1426 } 1555 }
1427 } 1556 }
1557
1428 break; 1558 break;
1429 } 1559 }
1430} 1560}
1431 1561
1432/* ------------------------------------------------------------------------- */ 1562/* ------------------------------------------------------------------------- */
… …
1437void 1567void
1438rxvt_term::scr_scroll_region (int top, int bot) 1568rxvt_term::scr_scroll_region (int top, int bot)
1439{ 1569{
1440 MAX_IT (top, 0); 1570 MAX_IT (top, 0);
1441 MIN_IT (bot, (int)TermWin.nrow - 1); 1571 MIN_IT (bot, (int)TermWin.nrow - 1);
1572
1442 if (top > bot) 1573 if (top > bot)
1443 return; 1574 return;
1575
1444 screen.tscroll = top; 1576 screen.tscroll = top;
1445 screen.bscroll = bot; 1577 screen.bscroll = bot;
1446 scr_gotorc (0, 0, 0); 1578 scr_gotorc (0, 0, 0);
1447} 1579}
1448 1580
… …
1454 */ 1586 */
1455void 1587void
1456rxvt_term::scr_cursor_visible (int mode) 1588rxvt_term::scr_cursor_visible (int mode)
1457{ 1589{
1458 want_refresh = 1; 1590 want_refresh = 1;
1591
1459 if (mode) 1592 if (mode)
1460 screen.flags |= Screen_VisibleCursor; 1593 screen.flags |= Screen_VisibleCursor;
1461 else 1594 else
1462 screen.flags &= ~Screen_VisibleCursor; 1595 screen.flags &= ~Screen_VisibleCursor;
1463} 1596}
… …
1472rxvt_term::scr_autowrap (int mode) 1605rxvt_term::scr_autowrap (int mode)
1473{ 1606{
1474 if (mode) 1607 if (mode)
1475 screen.flags |= Screen_Autowrap; 1608 screen.flags |= Screen_Autowrap;
1476 else 1609 else
1477 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1610 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1478} 1611}
1479 1612
1480/* ------------------------------------------------------------------------- */ 1613/* ------------------------------------------------------------------------- */
1481/* 1614/*
1482 * Set/unset margin origin mode 1615 * Set/unset margin origin mode
… …
1492{ 1625{
1493 if (mode) 1626 if (mode)
1494 screen.flags |= Screen_Relative; 1627 screen.flags |= Screen_Relative;
1495 else 1628 else
1496 screen.flags &= ~Screen_Relative; 1629 screen.flags &= ~Screen_Relative;
1630
1497 scr_gotorc (0, 0, 0); 1631 scr_gotorc (0, 0, 0);
1498} 1632}
1499 1633
1500/* ------------------------------------------------------------------------- */ 1634/* ------------------------------------------------------------------------- */
1501/* 1635/*
… …
1521 */ 1655 */
1522void 1656void
1523rxvt_term::scr_set_tab (int mode) 1657rxvt_term::scr_set_tab (int mode)
1524{ 1658{
1525 if (mode < 0) 1659 if (mode < 0)
1526 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1660 memset (tabs, 0, TermWin.ncol * sizeof (char));
1527 else if (screen.cur.col < TermWin.ncol) 1661 else if (screen.cur.col < TermWin.ncol)
1528 tabs[screen.cur.col] = (mode ? 1 : 0); 1662 tabs[screen.cur.col] = (mode ? 1 : 0);
1529} 1663}
1530 1664
1531/* ------------------------------------------------------------------------- */ 1665/* ------------------------------------------------------------------------- */
… …
1535 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1669 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1536 */ 1670 */
1537void 1671void
1538rxvt_term::scr_rvideo_mode (int mode) 1672rxvt_term::scr_rvideo_mode (int mode)
1539{ 1673{
1540 XGCValues gcvalue; 1674 XGCValues gcvalue;
1541 1675
1542 if (rvideo != mode) 1676 if (rvideo != mode)
1543 { 1677 {
1544 rvideo = mode; 1678 rvideo = mode;
1545 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1679 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1546#if defined(XPM_BACKGROUND) 1680#if XPM_BACKGROUND
1547 if (bgPixmap.pixmap == None) 1681 if (bgPixmap.pixmap == None)
1548#endif 1682#endif
1549#if defined(TRANSPARENT) 1683#if TRANSPARENT
1550 if (! (Options & Opt_transparent) || am_transparent == 0) 1684 if (! (options & Opt_transparent) || am_transparent == 0)
1551#endif 1685#endif
1552 XSetWindowBackground (display->display, TermWin.vt, 1686 XSetWindowBackground (display->display, TermWin.vt,
1553 PixColors[Color_bg]); 1687 pix_colors[Color_bg]);
1554 1688
1555 gcvalue.foreground = PixColors[Color_fg]; 1689 gcvalue.foreground = pix_colors[Color_fg];
1556 gcvalue.background = PixColors[Color_bg]; 1690 gcvalue.background = pix_colors[Color_bg];
1557 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1691 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1558 &gcvalue); 1692 &gcvalue);
1559 scr_clear (); 1693 scr_clear ();
1560 scr_touch (true); 1694 scr_touch (true);
1561 } 1695 }
… …
1609 * XTERM_SEQ: Invoke G2 character set: ESC N 1743 * XTERM_SEQ: Invoke G2 character set: ESC N
1610 * XTERM_SEQ: Invoke G3 character set: ESC O 1744 * XTERM_SEQ: Invoke G3 character set: ESC O
1611 */ 1745 */
1612void 1746void
1613rxvt_term::scr_charset_choose (int set) 1747rxvt_term::scr_charset_choose (int set)
1614 { 1748{
1615 screen.charset = set; 1749 screen.charset = set;
1616 set_font_style (); 1750 set_font_style ();
1617 } 1751}
1618 1752
1619/* ------------------------------------------------------------------------- */ 1753/* ------------------------------------------------------------------------- */
1620/* 1754/*
1621 * Set a font 1755 * Set a font
1622 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1756 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1625 * XTERM_SEQ: Set G3 character set: ESC + <C> 1759 * XTERM_SEQ: Set G3 character set: ESC + <C>
1626 * See set_font_style for possible values for <C> 1760 * See set_font_style for possible values for <C>
1627 */ 1761 */
1628void 1762void
1629rxvt_term::scr_charset_set (int set, unsigned int ch) 1763rxvt_term::scr_charset_set (int set, unsigned int ch)
1630 { 1764{
1631 charsets[set] = (unsigned char)ch; 1765 charsets[set] = (unsigned char)ch;
1632 set_font_style (); 1766 set_font_style ();
1633 } 1767}
1634 1768
1635 1769
1636/* ------------------------------------------------------------------------- * 1770/* ------------------------------------------------------------------------- *
1637 * MAJOR SCREEN MANIPULATION * 1771 * MAJOR SCREEN MANIPULATION *
1638 * ------------------------------------------------------------------------- */ 1772 * ------------------------------------------------------------------------- */
… …
1677 row_col_t rc[RC_COUNT]; 1811 row_col_t rc[RC_COUNT];
1678 1812
1679 if (drawn_text == NULL) /* sanity check */ 1813 if (drawn_text == NULL) /* sanity check */
1680 return; 1814 return;
1681 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
1682#ifdef DEBUG_STRICT 1824#ifdef DEBUG_STRICT
1683 x = max (x, (int)TermWin.int_bwidth); 1825 x = max (x, 0);
1684 x = min (x, (int)TermWin.width); 1826 x = min (x, (int)TermWin.width);
1685 y = max (y, (int)TermWin.int_bwidth); 1827 y = max (y, 0);
1686 y = min (y, (int)TermWin.height); 1828 y = min (y, (int)TermWin.height);
1687#endif 1829#endif
1688 1830
1689 /* round down */ 1831 /* round down */
1690 rc[PART_BEG].col = Pixel2Col (x); 1832 rc[PART_BEG].col = Pixel2Col (x);
… …
1698 { 1840 {
1699 MIN_IT (rc[i].col, TermWin.ncol - 1); 1841 MIN_IT (rc[i].col, TermWin.ncol - 1);
1700 MIN_IT (rc[i].row, TermWin.nrow - 1); 1842 MIN_IT (rc[i].row, TermWin.nrow - 1);
1701 } 1843 }
1702 1844
1703 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));
1704
1705 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++)
1706 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);
1707 (rc[PART_END].col - rc[PART_BEG].col + 1));
1708 1847
1709 if (refresh) 1848 if (refresh)
1710 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1849 scr_refresh (SLOW_REFRESH);
1711} 1850}
1712 1851
1713/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1714/* 1853/*
1715 * Refresh the entire screen 1854 * Refresh the entire screen
… …
1727 */ 1866 */
1728int 1867int
1729rxvt_term::scr_move_to (int y, int len) 1868rxvt_term::scr_move_to (int y, int len)
1730{ 1869{
1731 long p = 0; 1870 long p = 0;
1732 uint16_t oldviewstart; 1871 unsigned int oldviewstart;
1733 1872
1734 oldviewstart = TermWin.view_start; 1873 oldviewstart = TermWin.view_start;
1874
1735 if (y < len) 1875 if (y < len)
1736 { 1876 {
1737 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1877 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1738 p -= (long) (TermWin.nrow - 1); 1878 p -= (long) (TermWin.nrow - 1);
1739 p = max (p, 0); 1879 p = max (p, 0);
1740 } 1880 }
1881
1741 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1882 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1742 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1743 1883
1744 return scr_changeview (oldviewstart); 1884 return scr_changeview (oldviewstart);
1745} 1885}
1746 1886
1747/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
… …
1750 * direction should be UP or DN 1890 * direction should be UP or DN
1751 */ 1891 */
1752int 1892int
1753rxvt_term::scr_page (enum page_dirn direction, int nlines) 1893rxvt_term::scr_page (enum page_dirn direction, int nlines)
1754{ 1894{
1755 int n; 1895 int n;
1756 uint16_t oldviewstart; 1896 unsigned int oldviewstart;
1757 1897
1758 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1759#ifdef DEBUG_STRICT 1898#ifdef DEBUG_STRICT
1760 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1899 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1761#endif 1900#endif
1762 oldviewstart = TermWin.view_start; 1901 oldviewstart = TermWin.view_start;
1763 if (direction == UP) 1902 if (direction == UP)
… …
1772 } 1911 }
1773 return scr_changeview (oldviewstart); 1912 return scr_changeview (oldviewstart);
1774} 1913}
1775 1914
1776int 1915int
1777rxvt_term::scr_changeview (uint16_t oldviewstart) 1916rxvt_term::scr_changeview (unsigned int oldviewstart)
1778{ 1917{
1779 if (TermWin.view_start != oldviewstart) 1918 if (TermWin.view_start != oldviewstart)
1780 { 1919 {
1781 want_refresh = 1; 1920 want_refresh = 1;
1782 num_scr -= (TermWin.view_start - oldviewstart); 1921 num_scr -= (TermWin.view_start - oldviewstart);
1783 } 1922 }
1923
1784 return (int) (TermWin.view_start - oldviewstart); 1924 return (int) (TermWin.view_start - oldviewstart);
1785} 1925}
1786 1926
1787/* ------------------------------------------------------------------------- */ 1927/* ------------------------------------------------------------------------- */
1788void 1928void
1789rxvt_term::scr_bell () 1929rxvt_term::scr_bell ()
1790{ 1930{
1791#ifndef NO_BELL 1931#ifndef NO_BELL
1792# ifndef NO_MAPALERT 1932# ifndef NO_MAPALERT
1793# ifdef MAPALERT_OPTION 1933# ifdef MAPALERT_OPTION
1794 if (Options & Opt_mapAlert) 1934 if (options & Opt_mapAlert)
1795# endif 1935# endif
1796 XMapWindow (display->display, TermWin.parent[0]); 1936 XMapWindow (display->display, TermWin.parent[0]);
1797# endif 1937# endif
1798 if (Options & Opt_visualBell) 1938 if (options & Opt_visualBell)
1799 { 1939 {
1800 scr_rvideo_mode (!rvideo); /* refresh also done */ 1940 scr_rvideo_mode (!rvideo); /* refresh also done */
1801 scr_rvideo_mode (!rvideo); /* refresh also done */ 1941 scr_rvideo_mode (!rvideo); /* refresh also done */
1802 } 1942 }
1803 else 1943 else
… …
1809/* ARGSUSED */ 1949/* ARGSUSED */
1810void 1950void
1811rxvt_term::scr_printscreen (int fullhist) 1951rxvt_term::scr_printscreen (int fullhist)
1812{ 1952{
1813#ifdef PRINTPIPE 1953#ifdef PRINTPIPE
1814 int i, r1, nrows, row_offset; 1954 int i, r1, nrows, row_offset;
1815 text_t *t; 1955 FILE *fd;
1816 FILE *fd;
1817 1956
1818 if ((fd = popen_printer ()) == NULL) 1957 if ((fd = popen_printer ()) == NULL)
1819 return; 1958 return;
1959
1820 nrows = TermWin.nrow; 1960 nrows = TermWin.nrow;
1821 row_offset = TermWin.saveLines; 1961 row_offset = TermWin.saveLines;
1962
1822 if (!fullhist) 1963 if (!fullhist)
1823 row_offset -= TermWin.view_start; 1964 row_offset -= TermWin.view_start;
1824 else 1965 else
1825 { 1966 {
1826 nrows += TermWin.nscrolled; 1967 nrows += TermWin.nscrolled;
1827 row_offset -= TermWin.nscrolled; 1968 row_offset -= TermWin.nscrolled;
1828 } 1969 }
1829 1970
1971 wctomb (0, 0);
1972
1830 for (r1 = 0; r1 < nrows; r1++) 1973 for (r1 = 0; r1 < nrows; r1++)
1831 { 1974 {
1832 t = screen.text[r1 + row_offset]; 1975 text_t *tp = screen.text[r1 + row_offset];
1833 for (i = TermWin.ncol - 1; i >= 0; i--) 1976 int len = screen.tlen[r1 + row_offset];
1834 if (!isspace (t[i])) 1977
1835 break; 1978 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1836 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);
1837 } 1997 }
1998
1838 pclose_printer (fd); 1999 pclose_printer (fd);
1839#endif 2000#endif
1840} 2001}
1841 2002
1842/* ------------------------------------------------------------------------- */ 2003/* ------------------------------------------------------------------------- */
… …
1856 ((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)
1857 2018
1858void 2019void
1859rxvt_term::scr_refresh (unsigned char refresh_type) 2020rxvt_term::scr_refresh (unsigned char refresh_type)
1860{ 2021{
1861 unsigned char clearfirst, /* first character writes before cell */
1862 clearlast, /* last character writes beyond cell */
1863 must_clear, /* use draw_string not draw_image_string */ 2022 unsigned char must_clear, /* use draw_string not draw_image_string */
1864 rvid, /* reverse video this position */
1865 showcursor; /* show the cursor */ 2023 showcursor; /* show the cursor */
1866 int16_t col, row, /* column/row we're processing */ 2024 int16_t col, row, /* column/row we're processing */
1867 ocrow; /* old cursor row */ 2025 ocrow; /* old cursor row */
1868 int i, /* tmp */ 2026 int i, /* tmp */
1869 row_offset; /* basic offset in screen structure */ 2027 row_offset; /* basic offset in screen structure */
1870#ifndef NO_CURSORCOLOR 2028#ifndef NO_CURSORCOLOR
1871 rend_t cc1; /* store colours at cursor position (s) */ 2029 rend_t cc1; /* store colours at cursor position (s) */
1872#endif 2030#endif
1873 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2031 rend_t *crp; // cursor rendition pointer
1874 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2032
2033 want_refresh = 0; /* screen is current */
1875 2034
1876 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2035 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1877 return; 2036 return;
1878 2037
1879 /* 2038 /*
1880 * A: set up vars 2039 * A: set up vars
1881 */ 2040 */
1882 clearfirst = clearlast = must_clear = 0; 2041 must_clear = 0;
1883
1884 refresh_count = 0; 2042 refresh_count = 0;
1885 2043
1886 row_offset = TermWin.saveLines - TermWin.view_start; 2044 row_offset = TermWin.saveLines - TermWin.view_start;
1887 2045
1888 if ((refresh_type & REFRESH_BOUNDS))
1889 {
1890 clearfirst = clearlast = 1;
1891 refresh_type &= ~REFRESH_BOUNDS;
1892 }
1893
1894#ifdef XPM_BACKGROUND 2046#if XPM_BACKGROUND
1895 must_clear |= (bgPixmap.pixmap != None); 2047 must_clear |= (bgPixmap.pixmap != None);
1896#endif 2048#endif
1897#ifdef TRANSPARENT 2049#if TRANSPARENT
1898 must_clear |= ((Options & Opt_transparent) && am_transparent); 2050 must_clear |= ((options & Opt_transparent) && am_transparent);
1899#endif 2051#endif
1900 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1901 2053
1902 /* 2054 /*
1903 * B: reverse any characters which are selected 2055 * B: reverse any characters which are selected
… …
1906 2058
1907 /* 2059 /*
1908 * C: set the cursor character (s) 2060 * C: set the cursor character (s)
1909 */ 2061 */
1910 { 2062 {
1911 unsigned char setoldcursor; 2063 unsigned char setoldcursor;
1912 rend_t ccol1, /* Cursor colour */ 2064 rend_t ccol1, /* Cursor colour */
1913 ccol2; /* Cursor colour2 */ 2065 ccol2; /* Cursor colour2 */
1914 2066
1915 showcursor = (screen.flags & Screen_VisibleCursor); 2067 showcursor = (screen.flags & Screen_VisibleCursor);
1916#ifdef CURSOR_BLINK 2068#ifdef CURSOR_BLINK
1917 if (hidden_cursor) 2069 if (hidden_cursor)
1918 showcursor = 0; 2070 showcursor = 0;
1919#endif 2071#endif
1920 2072
1921 if (showcursor) 2073 if (showcursor)
1922 { 2074 {
2075 int col = screen.cur.col;
2076
2077 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2078 col--;
2079
1923 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2080 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1924 [screen.cur.col]);
1925 2081
1926 if (showcursor && TermWin.focus) 2082 if (showcursor && TermWin.focus)
1927 { 2083 {
1928 *srp ^= RS_RVid; 2084 *crp ^= RS_RVid;
1929#ifndef NO_CURSORCOLOR 2085#ifndef NO_CURSORCOLOR
1930 cc1 = *srp & (RS_fgMask | RS_bgMask); 2086 cc1 = *crp & (RS_fgMask | RS_bgMask);
1931 if (ISSET_PIXCOLOR (Color_cursor)) 2087 if (ISSET_PIXCOLOR (Color_cursor))
1932 ccol1 = Color_cursor; 2088 ccol1 = Color_cursor;
1933 else 2089 else
1934#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1935 ccol1 = GET_FGCOLOR (rstyle); 2091 ccol1 = GET_FGCOLOR (rstyle);
… …
1942#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1943 ccol2 = GET_BGCOLOR (rstyle); 2099 ccol2 = GET_BGCOLOR (rstyle);
1944#else 2100#else
1945 ccol2 = Color_bg; 2101 ccol2 = Color_bg;
1946#endif 2102#endif
1947 *srp = SET_FGCOLOR (*srp, ccol1); 2103 *crp = SET_FGCOLOR (*crp, ccol1);
1948 *srp = SET_BGCOLOR (*srp, ccol2); 2104 *crp = SET_BGCOLOR (*crp, ccol2);
1949#endif 2105#endif
1950 } 2106 }
1951 } 2107 }
1952 2108
1953 /* make sure no outline cursor is left around */ 2109 /* make sure no outline cursor is left around */
… …
1957 if (screen.cur.row + TermWin.view_start != ocrow 2113 if (screen.cur.row + TermWin.view_start != ocrow
1958 || screen.cur.col != oldcursor.col) 2114 || screen.cur.col != oldcursor.col)
1959 { 2115 {
1960 if (ocrow < TermWin.nrow 2116 if (ocrow < TermWin.nrow
1961 && oldcursor.col < TermWin.ncol) 2117 && oldcursor.col < TermWin.ncol)
1962 {
1963 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2118 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1964 } 2119
1965 if (TermWin.focus || !showcursor) 2120 if (TermWin.focus || !showcursor)
1966 oldcursor.row = -1; 2121 oldcursor.row = -1;
1967 else 2122 else
1968 setoldcursor = 1; 2123 setoldcursor = 1;
1969 } 2124 }
1970 } 2125 }
1971 else if (!TermWin.focus) 2126 else if (!TermWin.focus)
1972 setoldcursor = 1; 2127 setoldcursor = 1;
2128
1973 if (setoldcursor) 2129 if (setoldcursor)
1974 { 2130 {
1975 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2131 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1976 oldcursor.row = -1; 2132 oldcursor.row = -1;
1977 else 2133 else
… …
1980 oldcursor.col = screen.cur.col; 2136 oldcursor.col = screen.cur.col;
1981 } 2137 }
1982 } 2138 }
1983 } 2139 }
1984 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
1985#ifndef NO_SLOW_LINK_SUPPORT 2148#ifndef NO_SLOW_LINK_SUPPORT
1986 /* 2149 /*
1987 * D: CopyArea pass - very useful for slower links 2150 * D: CopyArea pass - very useful for slower links
1988 * This has been deliberately kept simple. 2151 * This has been deliberately kept simple.
1989 */ 2152 */
1990 i = num_scr; 2153 i = num_scr;
2154 if (!display->is_local
1991 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2155 && refresh_type == FAST_REFRESH && num_scr_allow && i
1992 && abs (i) < TermWin.nrow && !must_clear) 2156 && abs (i) < TermWin.nrow && !must_clear)
1993 { 2157 {
1994 int16_t nits; 2158 int16_t nits;
1995 int j; 2159 int j;
1996 rend_t *drp2;
1997 text_t *dtp2;
1998 int len, wlen; 2160 int len, wlen;
1999 2161
2000 j = TermWin.nrow; 2162 j = TermWin.nrow;
2001 wlen = len = -1; 2163 wlen = len = -1;
2002 row = i > 0 ? 0 : j - 1; 2164 row = i > 0 ? 0 : j - 1;
2003 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2165 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2004 { 2166 {
2005 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2167 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2006 { 2168 {
2007 stp = screen.text[row + row_offset]; 2169 text_t *stp = screen.text[row + row_offset];
2008 srp = screen.rend[row + row_offset]; 2170 rend_t *srp = screen.rend[row + row_offset];
2009 dtp = drawn_text[row]; 2171 text_t *dtp = drawn_text[row];
2010 dtp2 = drawn_text[row + i]; 2172 text_t *dtp2 = drawn_text[row + i];
2011 drp = drawn_rend[row]; 2173 rend_t *drp = drawn_rend[row];
2012 drp2 = drawn_rend[row + i]; 2174 rend_t *drp2 = drawn_rend[row + i];
2013 2175
2014 for (nits = 0, col = TermWin.ncol; col--; ) 2176 for (nits = 0, col = TermWin.ncol; col--; )
2015 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2177 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2016 nits--; 2178 nits--;
2017 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2179 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2037 { 2199 {
2038 /* also comes here at end if needed because of >= above */ 2200 /* also comes here at end if needed because of >= above */
2039 if (wlen < len) 2201 if (wlen < len)
2040 SWAP_IT (wlen, len, int); 2202 SWAP_IT (wlen, len, int);
2041 2203
2042 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2043 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2204 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2044 TermWin.gc, 0, Row2Pixel (len + i), 2205 TermWin.gc, 0, Row2Pixel (len + i),
2045 (unsigned int)TermWin_TotalWidth (), 2206 (unsigned int)TermWin_TotalWidth (),
2046 (unsigned int)Height2Pixel (wlen - len + 1), 2207 (unsigned int)Height2Pixel (wlen - len + 1),
2047 0, Row2Pixel (len)); 2208 0, Row2Pixel (len));
… …
2054 /* 2215 /*
2055 * E: main pass across every character 2216 * E: main pass across every character
2056 */ 2217 */
2057 for (row = 0; row < TermWin.nrow; row++) 2218 for (row = 0; row < TermWin.nrow; row++)
2058 { 2219 {
2059 stp = screen.text[row + row_offset]; 2220 text_t *stp = screen.text[row + row_offset];
2060 srp = screen.rend[row + row_offset]; 2221 rend_t *srp = screen.rend[row + row_offset];
2061 dtp = drawn_text[row]; 2222 text_t *dtp = drawn_text[row];
2062 drp = drawn_rend[row]; 2223 rend_t *drp = drawn_rend[row];
2063 2224
2064 /* 2225 /*
2065 * E2: OK, now the real pass 2226 * E2: OK, now the real pass
2066 */ 2227 */
2067 int ypixel = (int)Row2Pixel (row); 2228 int ypixel = (int)Row2Pixel (row);
2068 2229
2069 for (col = 0; col < TermWin.ncol; col++) 2230 for (col = 0; col < TermWin.ncol; col++)
2070 { 2231 {
2071 /* compare new text with old - if exactly the same then continue */ 2232 /* compare new text with old - if exactly the same then continue */
2072 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2233 if (stp[col] == dtp[col] /* Must match characters to skip. */
2073 && (srp[col] == drp[col] /* Either rendition the same or */ 2234 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2074 || (stp[col] == ' ' /* space w/ no background change */ 2235 || (stp[col] == ' ' /* space w/ no background change */
2075 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2236 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2076 continue; 2237 continue;
2077 2238
2078 // redraw one or more characters 2239 // redraw one or more characters
2079 2240
2080 // seek to the beginning if wide characters 2241 // seek to the beginning of wide characters
2081 while (stp[col] == NOCHAR && col > 0) 2242 while (stp[col] == NOCHAR && col > 0)
2082 --col; 2243 --col;
2083 2244
2084 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2245 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2085 text_t *text = stp + col; 2246 text_t *text = stp + col;
… …
2088 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2089 drp[col] = rend; 2250 drp[col] = rend;
2090 2251
2091 int xpixel = Col2Pixel (col); 2252 int xpixel = Col2Pixel (col);
2092 2253
2093 // this loop looks very messy, it can probably be optimized
2094 // and cleaned a bit by you?
2095 for (i = 0; ++col < TermWin.ncol; ) 2254 for (i = 0; ++col < TermWin.ncol; )
2096 { 2255 {
2097 if (stp[col] == NOCHAR) 2256 if (stp[col] == NOCHAR)
2098 { 2257 {
2099 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2100 drp[col] = rend; 2259 drp[col] = rend;
2101 count++; 2260 count++;
2102
2103 if (i) // only possible skip if char unchanged
2104 i++; 2261 i++;
2105 2262
2106 continue; 2263 continue;
2107 } 2264 }
2108 2265
2109 if (rend != srp[col]) 2266 if (!RS_SAME (rend, srp[col]))
2110 break; 2267 break;
2111 2268
2112 count++; 2269 count++;
2113 2270
2114 if (stp[col] != dtp[col] 2271 if (stp[col] != dtp[col]
2115 || srp[col] != drp[col]) 2272 || !RS_SAME (srp[col], drp[col]))
2116 { 2273 {
2117 if (must_clear && (i++ > (count / 2))) 2274 if (must_clear && (i++ > count / 2))
2118 break; 2275 break;
2119 2276
2120 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2121 drp[col] = rend; 2278 drp[col] = rend;
2122 i = 0; 2279 i = 0;
2123 } 2280 }
2124 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2281 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2125 break; 2282 break;
2126 } 2283 }
2127 2284
2128 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2129 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
2130 2303
2131 /* 2304 /*
2132 * Determine the attributes for the string 2305 * Determine the attributes for the string
2133 */ 2306 */
2134 int fid = GET_FONT (rend);
2135 int fore = GET_FGCOLOR (rend); // desired foreground 2307 int fore = GET_FGCOLOR (rend); // desired foreground
2136 int back = GET_BGCOLOR (rend); // desired background 2308 int back = GET_BGCOLOR (rend); // desired background
2137 2309
2138 rend = GET_ATTR (rend); 2310 // only do special processing if ana attributes are set, which is rare
2139 2311 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2140 rvid = !!(rend & RS_RVid); 2312 {
2313 bool invert = rend & RS_RVid;
2141 2314
2142#ifndef NO_BOLD_UNDERLINE_REVERSE 2315#ifndef NO_BOLD_UNDERLINE_REVERSE
2143 if (rend & RS_Bold && fore == Color_fg) 2316 if (rend & RS_Bold
2317 && fore == Color_fg)
2144 { 2318 {
2145 if (ISSET_PIXCOLOR (Color_BD)) 2319 if (ISSET_PIXCOLOR (Color_BD))
2146 fore = Color_BD; 2320 fore = Color_BD;
2321# if !ENABLE_STYLES
2147 else 2322 else
2148 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
2149 } 2364 }
2150
2151 if (rend & RS_Uline)
2152 {
2153 if (ISSET_PIXCOLOR (Color_UL))
2154 fore = Color_UL;
2155 }
2156#endif
2157
2158 if (rvid)
2159 {
2160 SWAP_IT (fore, back, int);
2161
2162#ifndef NO_BOLD_UNDERLINE_REVERSE
2163 if (ISSET_PIXCOLOR (Color_RV)
2164# ifndef NO_CURSORCOLOR
2165 && !ISSET_PIXCOLOR (Color_cursor)
2166# endif
2167 )
2168 back = Color_RV;
2169#endif
2170 }
2171
2172#ifdef TEXT_BLINK
2173 if (rend & RS_Blink && back == Color_bg)
2174 {
2175 if (!text_blink_ev.active)
2176 {
2177 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2178 hidden_text = 0;
2179 }
2180 else if (hidden_text)
2181 fore = back;
2182 }
2183#endif
2184 2365
2185 /* 2366 /*
2186 * Actually do the drawing of the string here 2367 * Actually do the drawing of the string here
2187 */ 2368 */
2188 rxvt_font *font = (*TermWin.fontset)[fid]; 2369 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2189 2370
2190 if (back == fore) 2371 if (back == fore)
2191 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2372 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2192 TermWin.fwidth * count, TermWin.fheight, 2373 TermWin.fwidth * count, TermWin.fheight,
2193 back); 2374 back);
… …
2208 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2389 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2209 } 2390 }
2210 else 2391 else
2211 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2392 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2212 2393
2213 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
2214 XDrawLine (display->display, drawBuffer, TermWin.gc, 2403 XDrawLine (display->display, drawBuffer, TermWin.gc,
2215 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2216 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 }
2217 } /* for (col....) */ 2407 } /* for (col....) */
2218 } /* for (row....) */ 2408 } /* for (row....) */
2409
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2219 2413
2220 /* 2414 /*
2221 * G: cleanup cursor and display outline cursor if necessary 2415 * G: cleanup cursor and display outline cursor if necessary
2222 */ 2416 */
2223 if (showcursor) 2417 if (showcursor)
2224 { 2418 {
2225 if (TermWin.focus) 2419 if (TermWin.focus)
2226 { 2420 {
2227 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2228 [screen.cur.col]);
2229 *srp ^= RS_RVid; 2421 *crp ^= RS_RVid;
2230#ifndef NO_CURSORCOLOR 2422#ifndef NO_CURSORCOLOR
2231 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2423 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2232#endif 2424#endif
2233 } 2425 }
2234 else if (oldcursor.row >= 0) 2426 else if (oldcursor.row >= 0)
2235 { 2427 {
2236#ifndef NO_CURSORCOLOR 2428#ifndef NO_CURSORCOLOR
2237 if (ISSET_PIXCOLOR (Color_cursor)) 2429 if (ISSET_PIXCOLOR (Color_cursor))
2238 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2430 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2239#endif 2431#endif
2240 int cursorwidth = 1; 2432 int cursorwidth = 1;
2241 while (oldcursor.col + cursorwidth < TermWin.ncol 2433 while (oldcursor.col + cursorwidth < TermWin.ncol
2242 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2434 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2243 cursorwidth++; 2435 cursorwidth++;
… …
2253 /* 2445 /*
2254 * H: cleanup selection 2446 * H: cleanup selection
2255 */ 2447 */
2256 scr_reverse_selection (); 2448 scr_reverse_selection ();
2257 2449
2258 /*
2259 * I: other general cleanup
2260 */
2261 if (clearfirst && TermWin.int_bwidth)
2262 /*
2263 * clear the whole screen height, note that width == 0 is treated
2264 * specially by XClearArea
2265 */
2266 XClearArea (display->display, TermWin.vt, 0, 0,
2267 (unsigned int)TermWin.int_bwidth,
2268 (unsigned int)TermWin_TotalHeight (), False);
2269
2270 if (clearlast && TermWin.int_bwidth)
2271 /*
2272 * clear the whole screen height, note that width == 0 is treated
2273 * specially by XClearArea
2274 */
2275 XClearArea (display->display, TermWin.vt,
2276 TermWin.width + TermWin.int_bwidth, 0,
2277 (unsigned int)TermWin.int_bwidth,
2278 (unsigned int)TermWin_TotalHeight (), False);
2279
2280 if (refresh_type & SMOOTH_REFRESH) 2450 if (refresh_type & SMOOTH_REFRESH)
2281 XSync (display->display, False); 2451 XFlush (display->display);
2282 2452
2283 num_scr = 0; 2453 num_scr = 0;
2284 num_scr_allow = 1; 2454 num_scr_allow = 1;
2285 want_refresh = 0; /* screen is current */
2286} 2455}
2287 2456
2288void 2457void
2289rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2458rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2290{ 2459{
2291 if (!rp || !tp) 2460 if (!rp || !tp)
2292 return; 2461 return;
2293 2462
2294 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2463 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2295 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2464 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2296} 2465}
2297 2466
2298void 2467void
2299rxvt_term::scr_remap_chars () 2468rxvt_term::scr_remap_chars ()
2300{ 2469{
… …
2306 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2475 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2307 scr_remap_chars (swap.text[i], swap.rend[i]); 2476 scr_remap_chars (swap.text[i], swap.rend[i]);
2308 } 2477 }
2309} 2478}
2310 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
2311/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2312void 2511void
2313rxvt_term::scr_clear (bool really) 2512rxvt_term::scr_clear (bool really)
2314{ 2513{
2315 if (!TermWin.mapped) 2514 if (!TermWin.mapped)
2316 return; 2515 return;
2317 2516
2318 num_scr_allow = 0; 2517 num_scr_allow = 0;
2319 want_refresh = 1; 2518 want_refresh = 1;
2320 2519
2321#ifdef TRANSPARENT 2520#if TRANSPARENT
2322 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2521 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2323 { 2522 {
2324 int i; 2523 int i;
2325 2524
2326 if (! (Options & Opt_transparent_all)) 2525 if (!(options & Opt_transparent_all))
2327 i = 0; 2526 i = 0;
2328 else 2527 else
2329 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2528 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2330 2529
2331 while (i--) 2530 while (i--)
… …
2347 int end_row = TermWin.saveLines - TermWin.view_start; 2546 int end_row = TermWin.saveLines - TermWin.view_start;
2348 int i = selection.beg.row + TermWin.saveLines; 2547 int i = selection.beg.row + TermWin.saveLines;
2349 int col, row = selection.end.row + TermWin.saveLines; 2548 int col, row = selection.end.row + TermWin.saveLines;
2350 rend_t *srp; 2549 rend_t *srp;
2351 2550
2352 if (i >= end_row) 2551#if ENABLE_FRILLS
2353 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 }
2354 else 2560 else
2561#endif
2562 {
2563 if (i >= end_row)
2564 col = selection.beg.col;
2565 else
2355 { 2566 {
2356 col = 0; 2567 col = 0;
2357 i = end_row; 2568 i = end_row;
2358 } 2569 }
2359 2570
2360 end_row += TermWin.nrow; 2571 end_row += TermWin.nrow;
2572
2361 for (; i < row && i < end_row; i++, col = 0) 2573 for (; i < row && i < end_row; i++, col = 0)
2362 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2574 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2363 srp[col] ^= RS_RVid; 2575 srp[col] ^= RS_RVid;
2364 2576
2365 if (i == row && i < end_row) 2577 if (i == row && i < end_row)
2366 for (srp = screen.rend[i]; col < selection.end.col; col++) 2578 for (srp = screen.rend[i]; col < selection.end.col; col++)
2367 srp[col] ^= RS_RVid; 2579 srp[col] ^= RS_RVid;
2580 }
2368 } 2581 }
2369} 2582}
2370 2583
2371/* ------------------------------------------------------------------------- */ 2584/* ------------------------------------------------------------------------- */
2372/* 2585/*
… …
2408 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2621 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2409 */ 2622 */
2410void 2623void
2411rxvt_term::selection_check (int check_more) 2624rxvt_term::selection_check (int check_more)
2412{ 2625{
2413 row_col_t pos; 2626 row_col_t pos;
2414 2627
2415 if (!selection.op) 2628 if (!selection.op)
2416 return; 2629 return;
2417 2630
2418 pos.row = pos.col = 0; 2631 pos.row = pos.col = 0;
… …
2440/* ------------------------------------------------------------------------- */ 2653/* ------------------------------------------------------------------------- */
2441/* 2654/*
2442 * Paste a selection direct to the command fd 2655 * Paste a selection direct to the command fd
2443 */ 2656 */
2444void 2657void
2445rxvt_term::paste (const unsigned char *data, unsigned int len) 2658rxvt_term::paste (unsigned char *data, unsigned int len)
2446{ 2659{
2447 unsigned int i, j, n;
2448 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2449
2450#if 0
2451 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2452 ZERO_SCROLLBACK (r);
2453#endif
2454
2455 /* convert normal newline chars into common keyboard Return key sequence */ 2660 /* convert normal newline chars into common keyboard Return key sequence */
2456 for (i = 0; i < len; i += PROP_SIZE) 2661 for (unsigned int i = 0; i < len; i++)
2457 { 2662 if (data[i] == C0_LF)
2458 n = min (len - i, PROP_SIZE); 2663 data[i] = C0_CR;
2459 MEMCPY (ds, data + i, n);
2460 2664
2461 for (j = 0; j < n; j++) 2665 tt_write (data, len);
2462 if (ds[j] == '\n')
2463 ds[j] = '\r';
2464
2465 tt_write (ds, (int)n);
2466 }
2467
2468 free (ds);
2469} 2666}
2470 2667
2471/* ------------------------------------------------------------------------- */ 2668/* ------------------------------------------------------------------------- */
2472/* 2669/*
2473 * Respond to a notification that a primary selection has been sent 2670 * Respond to a notification that a primary selection has been sent
2474 * EXT: SelectionNotify 2671 * EXT: SelectionNotify
2475 */ 2672 */
2476int 2673void
2477rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2674rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2478{ 2675{
2479 long nread = 0;
2480 unsigned long bytes_after;
2481 XTextProperty ct;
2482
2483 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2484
2485 if (prop == None) /* check for failed XConvertSelection */ 2676 if (prop == None) /* check for failed XConvertSelection */
2486 { 2677 {
2487 if ((selection_type & Sel_CompoundText)) 2678 if ((selection_type & Sel_CompoundText))
2488 { 2679 {
2489 int selnum = selection_type & Sel_whereMask; 2680 int selnum = selection_type & Sel_whereMask;
… …
2502 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2693 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2503 else 2694 else
2504 selection_type = 0; 2695 selection_type = 0;
2505 } 2696 }
2506 2697
2507 return 0; 2698 return;
2508 }
2509
2510 for (;;)
2511 { 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
2512 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2723 if (XGetWindowProperty (display->display, win, prop,
2513 (long) (PROP_SIZE / 4), delete_prop, 2724 ct.nitems / 4, (bytes_after + 3) / 4,
2725 delete_prop, AnyPropertyType,
2514 AnyPropertyType, &ct.encoding, &ct.format, 2726 &ct2.encoding, &ct2.format,
2515 &ct.nitems, &bytes_after, 2727 &ct2.nitems, &bytes_after,
2516 &ct.value) != Success) 2728 &ct2.value) != Success)
2517 break; 2729 goto bailout;
2518 2730
2519 if (ct.encoding == 0) 2731 // realloc should be compatible to XFree, here, and elsewhere, too
2520 { 2732 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2521 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2733 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2522 break; 2734 ct.nitems += ct2.nitems;
2523 }
2524 2735
2736 XFree (ct2.value);
2737 }
2738
2525 if (ct.value == NULL) 2739 if (ct.value == 0)
2526 { 2740 goto bailout;
2527 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2528 continue;
2529 }
2530 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
2531 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 ();
2532 { 2768 }
2533 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2769 else
2770 {
2534 if (selection_wait == Sel_normal && nread == 0 2771 if (selection_wait == Sel_normal
2535 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2772 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2536 { 2773 {
2537 /* 2774 /*
2538 * pass through again trying CUT_BUFFER0 if we've come from 2775 * pass through again trying CUT_BUFFER0 if we've come from
2539 * XConvertSelection () but nothing was presented 2776 * XConvertSelection () but nothing was presented
2540 */ 2777 */
2541 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2542 selection_paste (display->root, XA_CUT_BUFFER0, False); 2778 selection_paste (display->root, XA_CUT_BUFFER0, False);
2543 } 2779 }
2544 2780
2545 nread = -1; /* discount any previous stuff */ 2781 goto bailout;
2546 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)
2547 } 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 }
2548 2793
2794 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2549 nread += ct.nitems; 2795 incr_buf_fill += ct.nitems;
2550 2796
2797 goto bailout;
2798 }
2799
2551 char **cl; 2800 char **cl;
2552 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
2553 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2817 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2554 &cr) >= 0 && cl) 2818 && cl)
2555 { 2819 {
2556 for (int i = 0; i < cr; i++) 2820 for (int i = 0; i < cr; i++)
2557 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2821 paste ((unsigned char *)cl[i], strlen (cl[i]));
2558 2822
2559 XFreeStringList (cl); 2823 XFreeStringList (cl);
2560 } 2824 }
2561 else 2825 else
2562 paste (ct.value, ct.nitems); 2826 paste (ct.value, ct.nitems); // paste raw
2563 2827
2564 if (bytes_after == 0) 2828bailout:
2565 break;
2566
2567 XFree (ct.value);
2568 }
2569
2570 if (ct.value)
2571 XFree (ct.value); 2829 XFree (ct.value);
2572 2830
2573 if (selection_wait == Sel_normal) 2831 if (selection_wait == Sel_normal)
2574 selection_wait = Sel_none; 2832 selection_wait = Sel_none;
2575
2576 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2577 return (int)nread;
2578} 2833}
2579 2834
2580void 2835void
2581rxvt_term::incr_cb (time_watcher &w) 2836rxvt_term::incr_cb (time_watcher &w)
2582{ 2837{
2583 selection_wait = Sel_none; 2838 selection_wait = Sel_none;
2584 2839
2840 incr_buf_size = 0;
2841 free (incr_buf);
2842
2585 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2843 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2586} 2844}
2587 2845
2588/*
2589 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2590 */
2591void 2846void
2592rxvt_term::selection_property (Window win, Atom prop) 2847rxvt_term::selection_property (Window win, Atom prop)
2593{ 2848{
2594 int reget_time = 0; 2849 if (prop == None || selection_wait != Sel_incr)
2595
2596 if (prop == None)
2597 return; 2850 return;
2598 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2599 if (selection_wait == Sel_normal)
2600 {
2601 int a, afmt;
2602 Atom atype;
2603 unsigned long bytes_after, nitems;
2604 unsigned char *s = NULL;
2605 2851
2606 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2607 xa[XA_INCR], &atype, &afmt, &nitems,
2608 &bytes_after, &s);
2609 if (s)
2610 XFree (s);
2611 if (a != Success)
2612 return;
2613#ifndef __CYGWIN32__
2614 if (atype == xa[XA_INCR])
2615 { /* start an INCR transfer */
2616 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2617 XDeleteProperty (display->display, win, prop);
2618 XFlush (display->display);
2619 reget_time = 1;
2620 selection_wait = Sel_incr;
2621 }
2622#endif
2623
2624 }
2625 else if (selection_wait == Sel_incr)
2626 {
2627 reget_time = 1;
2628 if (selection_paste (win, prop, True) == -1) 2852 selection_paste (win, prop, true);
2629 {
2630 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2631 selection_wait = Sel_none;
2632 incr_ev.stop ();
2633 }
2634 }
2635 if (reget_time) /* received more data so reget time */
2636 incr_ev.start (NOW + 10);
2637} 2853}
2854
2638/* ------------------------------------------------------------------------- */ 2855/* ------------------------------------------------------------------------- */
2639/* 2856/*
2640 * Request the current selection: 2857 * Request the current selection:
2641 * Order: > internal selection if available 2858 * Order: > internal selection if available
2642 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2859 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2646 * EXT: button 2 release 2863 * EXT: button 2 release
2647 */ 2864 */
2648void 2865void
2649rxvt_term::selection_request (Time tm, int x, int y) 2866rxvt_term::selection_request (Time tm, int x, int y)
2650{ 2867{
2651 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2652 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2868 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2653 return; /* outside window */ 2869 return; /* outside window */
2654 2870
2655 if (selection.text != NULL) 2871 if (selection.text)
2656 { /* internal selection */ 2872 { /* internal selection */
2657 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2658 paste (selection.text, selection.len); 2873 char *str = rxvt_wcstombs (selection.text, selection.len);
2874 paste ((unsigned char *)str, strlen (str));
2875 free (str);
2659 return; 2876 return;
2660 } 2877 }
2661 else 2878 else
2662 { 2879 {
2663 int i; 2880 int i;
2664 2881
2665 selection_request_time = tm; 2882 selection_request_time = tm;
2666 selection_wait = Sel_normal; 2883 selection_wait = Sel_normal;
2884
2667 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2885 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2668 { 2886 {
2669#if X_HAVE_UTF8_STRING 2887#if X_HAVE_UTF8_STRING
2670 selection_type = Sel_UTF8String; 2888 selection_type = Sel_UTF8String;
2671 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2889 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2673#else 2891#else
2674 selection_type = Sel_CompoundText; 2892 selection_type = Sel_CompoundText;
2675 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2893 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2676 return; 2894 return;
2677#endif 2895#endif
2678
2679 } 2896 }
2680 } 2897 }
2898
2681 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2899 selection_wait = Sel_none; /* don't loop in selection_paste () */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2683 selection_paste (display->root, XA_CUT_BUFFER0, False); 2900 selection_paste (display->root, XA_CUT_BUFFER0, false);
2684} 2901}
2685 2902
2686int 2903int
2687rxvt_term::selection_request_other (Atom target, int selnum) 2904rxvt_term::selection_request_other (Atom target, int selnum)
2688{ 2905{
2689 Atom sel; 2906 Atom sel;
2690#ifdef DEBUG_SELECT 2907#ifdef DEBUG_SELECT
2691 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2908 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2692#endif 2909#endif
2693 2910
2694 selection_type |= selnum; 2911 selection_type |= selnum;
2912
2695 if (selnum == Sel_Primary) 2913 if (selnum == Sel_Primary)
2696 sel = XA_PRIMARY; 2914 sel = XA_PRIMARY;
2697 else if (selnum == Sel_Secondary) 2915 else if (selnum == Sel_Secondary)
2698 sel = XA_SECONDARY; 2916 sel = XA_SECONDARY;
2699 else 2917 else
2700 sel = xa[XA_CLIPBOARD]; 2918 sel = xa[XA_CLIPBOARD];
2919
2701 if (XGetSelectionOwner (display->display, sel) != None) 2920 if (XGetSelectionOwner (display->display, sel) != None)
2702 { 2921 {
2703 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2704 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2922 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2705 TermWin.vt, selection_request_time); 2923 TermWin.vt, selection_request_time);
2706 return 1; 2924 return 1;
2707 } 2925 }
2926
2708 return 0; 2927 return 0;
2709} 2928}
2710 2929
2711/* ------------------------------------------------------------------------- */ 2930/* ------------------------------------------------------------------------- */
2712/* 2931/*
… …
2714 * EXT: SelectionClear 2933 * EXT: SelectionClear
2715 */ 2934 */
2716void 2935void
2717rxvt_term::selection_clear () 2936rxvt_term::selection_clear ()
2718{ 2937{
2719 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2720
2721 want_refresh = 1; 2938 want_refresh = 1;
2722 free (selection.text); 2939 free (selection.text);
2723 selection.text = NULL; 2940 selection.text = NULL;
2724 selection.len = 0; 2941 selection.len = 0;
2725 CLEAR_SELECTION (); 2942 CLEAR_SELECTION ();
2943
2944 if (display->selection_owner == this)
2945 display->selection_owner = 0;
2726} 2946}
2727 2947
2728/* ------------------------------------------------------------------------- */ 2948/* ------------------------------------------------------------------------- */
2729/* 2949/*
2730 * Copy a selection into the cut buffer 2950 * Copy a selection into the cut buffer
… …
2732 */ 2952 */
2733void 2953void
2734rxvt_term::selection_make (Time tm) 2954rxvt_term::selection_make (Time tm)
2735{ 2955{
2736 int i, col, end_col, row, end_row; 2956 int i, col, end_col, row, end_row;
2737 unsigned char *new_selection_text; 2957 wchar_t *new_selection_text;
2738 char *str;
2739 text_t *t; 2958 text_t *t;
2740 2959
2741 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2742 switch (selection.op) 2960 switch (selection.op)
2743 { 2961 {
2744 case SELECTION_CONT: 2962 case SELECTION_CONT:
2745 break; 2963 break;
2746 case SELECTION_INIT: 2964 case SELECTION_INIT:
… …
2756 selection.op = SELECTION_DONE; 2974 selection.op = SELECTION_DONE;
2757 2975
2758 if (selection.clicks == 4) 2976 if (selection.clicks == 4)
2759 return; /* nothing selected, go away */ 2977 return; /* nothing selected, go away */
2760 2978
2761 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2979 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2762 str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1); 2980 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2763
2764 new_selection_text = (unsigned char *)str;
2765 2981
2766 col = selection.beg.col; 2982 col = selection.beg.col;
2767 MAX_IT (col, 0);
2768 row = selection.beg.row + TermWin.saveLines; 2983 row = selection.beg.row + TermWin.saveLines;
2769 end_row = selection.end.row + TermWin.saveLines; 2984 end_row = selection.end.row + TermWin.saveLines;
2770 struct mbstate mbs; 2985 int ofs = 0;
2986 int extra = 0;
2771 2987
2772 for (; row <= end_row; row++, col = 0) 2988 for (; row <= end_row; row++, col = 0)
2773 { 2989 {
2774 t = & (screen.text[row][col]);
2775
2776 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);
2777 3001
2778 if (end_col == -1) 3002 if (end_col == -1)
2779 end_col = TermWin.ncol; 3003 end_col = TermWin.ncol;
2780 3004
2781 if (row == end_row) 3005 if (row == end_row || selection.rect)
2782 MIN_IT (end_col, selection.end.col); 3006 MIN_IT (end_col, selection.end.col);
2783 3007
3008 t = &screen.text[row][col];
2784 for (; col < end_col; col++) 3009 for (; col < end_col; col++)
3010 {
2785 if (*t == NOCHAR) 3011 if (*t == NOCHAR)
2786 t++; 3012 t++;
3013#if ENABLE_COMBINING
3014 else if (IS_COMPOSE (*t))
3015 {
3016 int len = rxvt_composite.expand (*t, 0);
3017
3018 extra -= (len - 1);
3019
3020 if (extra < 0)
3021 {
3022 extra += i;
3023 i += i;
3024 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
3025 }
3026
3027 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3028 }
3029#endif
2787 else 3030 else
2788 { 3031 new_selection_text[ofs++] = *t++;
2789 int len = wcrtomb (str, *t++, mbs);
2790 if (len > 0)
2791 str += len;
2792 } 3032 }
2793 3033
2794 if (screen.tlen[row] != -1 && row != end_row) 3034 if (screen.tlen[row] != -1 && row != end_row)
2795 *str++ = '\n'; 3035 new_selection_text[ofs++] = C0_LF;
2796 } 3036 }
2797 3037
2798#ifndef NO_OLD_SELECTION
2799 if (selection_style == OLD_SELECT)
2800 if (end_col == TermWin.ncol)
2801 *str++ = '\n';
2802#endif
2803#ifndef NO_NEW_SELECTION
2804 if (selection_style != OLD_SELECT)
2805 if (end_col != selection.end.col) 3038 if (end_col != selection.end.col)
2806 *str++ = '\n'; 3039 new_selection_text[ofs++] = C0_LF;
2807#endif
2808 *str = '\0';
2809 3040
2810 i = str - (char *)new_selection_text; 3041 new_selection_text[ofs] = 0;
3042
2811 if (i == 0) 3043 if (ofs == 0)
2812 { 3044 {
2813 free (new_selection_text); 3045 free (new_selection_text);
2814 return; 3046 return;
2815 } 3047 }
2816 3048
2817 // due to MB_CUR_MAX, selection wastage is usually high, so realloc
2818 if (str - (char *)new_selection_text > 1024)
2819 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2820
2821 selection.len = i;
2822
2823 if (selection.text)
2824 free (selection.text); 3049 free (selection.text);
2825 3050
2826 selection.text = new_selection_text; 3051 // we usually allocate much more than necessary, so realloc it smaller again
3052 selection.len = ofs;
3053 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2827 3054
2828 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3055 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2829 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3056 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2830 display->set_selection_owner (this); 3057 display->set_selection_owner (this);
2831 else 3058 else
2832 rxvt_print_error ("can't get primary selection"); 3059 rxvt_warn ("can't get primary selection, ignoring.\n");
2833 3060
2834 { 3061#if 0
2835 XTextProperty ct; 3062 XTextProperty ct;
2836 char *cl = (char *)selection.text;
2837 3063
2838 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 3064 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2839 { 3065 {
2840 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3066 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2841 PropModeReplace, ct.value, ct.nitems);
2842 XFree (ct.value); 3067 XFree (ct.value);
2843 } 3068 }
2844 else 3069#endif
2845 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2846 PropModeReplace, selection.text, (int)selection.len);
2847 }
2848 3070
2849 selection_time = tm; 3071 selection_time = tm;
2850 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2851} 3072}
2852 3073
2853/* ------------------------------------------------------------------------- */ 3074/* ------------------------------------------------------------------------- */
2854/* 3075/*
2855 * 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
2856 * EXT: button 1 press 3077 * EXT: button 1 press
2857 */ 3078 */
2858void 3079void
2859rxvt_term::selection_click (int clicks, int x, int y) 3080rxvt_term::selection_click (int clicks, int x, int y)
2860{ 3081{
2861 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2862
2863 clicks = ((clicks - 1) % 3) + 1; 3082 clicks = ((clicks - 1) % 3) + 1;
2864 selection.clicks = clicks; /* save clicks so extend will work */ 3083 selection.clicks = clicks; /* save clicks so extend will work */
2865 3084
2866 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3085 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2867 3086
… …
2881rxvt_term::selection_start_colrow (int col, int row) 3100rxvt_term::selection_start_colrow (int col, int row)
2882{ 3101{
2883 want_refresh = 1; 3102 want_refresh = 1;
2884 selection.mark.col = col; 3103 selection.mark.col = col;
2885 selection.mark.row = row - TermWin.view_start; 3104 selection.mark.row = row - TermWin.view_start;
3105
2886 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3106 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2887 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3107 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2888 MAX_IT (selection.mark.col, 0); 3108 MAX_IT (selection.mark.col, 0);
2889 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 3109 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2890 3110
3111 while (selection.mark.col > 0
3112 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
3113 --selection.mark.col;
3114
2891 if (selection.op) 3115 if (selection.op)
2892 { /* clear the old selection */ 3116 { /* clear the old selection */
2893 selection.beg.row = selection.end.row = selection.mark.row; 3117 selection.beg.row = selection.end.row = selection.mark.row;
2894 selection.beg.col = selection.end.col = selection.mark.col; 3118 selection.beg.col = selection.end.col = selection.mark.col;
2895 } 3119 }
3120
2896 selection.op = SELECTION_INIT; 3121 selection.op = SELECTION_INIT;
2897 selection.screen = current_screen; 3122 selection.screen = current_screen;
2898} 3123}
2899 3124
2900/* ------------------------------------------------------------------------- */ 3125/* ------------------------------------------------------------------------- */
… …
2902 * Word select: select text for 2 clicks 3127 * Word select: select text for 2 clicks
2903 * We now only find out the boundary in one direction 3128 * We now only find out the boundary in one direction
2904 */ 3129 */
2905 3130
2906/* 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 */
2907#define DELIMIT_TEXT(x) \ 3132#define DELIMIT_TEXT(x) \
2908 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 3133 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2909#define DELIMIT_REND(x) 1 3134#define DELIMIT_REND(x) 1
2910 3135
2911void 3136void
2912rxvt_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)
2913{ 3138{
2914 int col, row, dirnadd, tcol, trow, w1, w2; 3139 int col, row, dirnadd, tcol, trow, w1, w2;
2915 row_col_t bound; 3140 row_col_t bound;
2916 text_t *stp; 3141 text_t *stp;
2917 rend_t *srp; 3142 rend_t *srp;
2918 3143
2919 if (dirn == UP) 3144 if (dirn == UP)
2920 { 3145 {
2921 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3146 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2922 bound.col = 0; 3147 bound.col = 0;
… …
2926 { 3151 {
2927 bound.row = TermWin.saveLines + TermWin.nrow; 3152 bound.row = TermWin.saveLines + TermWin.nrow;
2928 bound.col = TermWin.ncol - 1; 3153 bound.col = TermWin.ncol - 1;
2929 dirnadd = 1; 3154 dirnadd = 1;
2930 } 3155 }
3156
2931 row = mark->row + TermWin.saveLines; 3157 row = mark->row + TermWin.saveLines;
2932 col = mark->col; 3158 col = mark->col;
2933 MAX_IT (col, 0); 3159 MAX_IT (col, 0);
2934 /* find the edge of a word */ 3160 /* find the edge of a word */
2935 stp = & (screen.text[row][col]); 3161 stp = &screen.text[row][col];
2936 w1 = DELIMIT_TEXT (*stp); 3162 w1 = DELIMIT_TEXT (*stp);
2937 3163
2938 if (selection_style != NEW_SELECT) 3164 srp = &screen.rend[row][col];
3165 w2 = DELIMIT_REND (*srp);
3166
3167 for (;;)
2939 { 3168 {
2940 if (w1 == 1) 3169 for (; col != bound.col; col += dirnadd)
2941 { 3170 {
2942 stp += dirnadd; 3171 stp += dirnadd;
2943 if (DELIMIT_TEXT (*stp) == 1)
2944 goto Old_Word_Selection_You_Die;
2945 col += dirnadd;
2946 }
2947 w1 = 0;
2948 }
2949 srp = (&screen.rend[row][col]);
2950 w2 = DELIMIT_REND (*srp);
2951
2952 for (;;)
2953 {
2954 for (; col != bound.col; col += dirnadd)
2955 {
2956 stp += dirnadd; 3172 srp += dirnadd;
3173
3174 if (*stp == NOCHAR)
3175 continue;
3176
2957 if (DELIMIT_TEXT (*stp) != w1) 3177 if (DELIMIT_TEXT (*stp) != w1)
2958 break; 3178 break;
2959 srp += dirnadd;
2960 if (DELIMIT_REND (*srp) != w2) 3179 if (DELIMIT_REND (*srp) != w2)
2961 break; 3180 break;
2962 } 3181 }
3182
2963 if ((col == bound.col) && (row != bound.row)) 3183 if ((col == bound.col) && (row != bound.row))
2964 { 3184 {
2965 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3185 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2966 { 3186 {
2967 trow = row + dirnadd; 3187 trow = row + dirnadd;
2968 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3188 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3189
2969 if (screen.text[trow] == NULL) 3190 if (screen.text[trow] == NULL)
2970 break; 3191 break;
3192
2971 stp = & (screen.text[trow][tcol]); 3193 stp = & (screen.text[trow][tcol]);
2972 srp = & (screen.rend[trow][tcol]); 3194 srp = & (screen.rend[trow][tcol]);
3195
2973 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3196 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2974 break; 3197 break;
3198
2975 row = trow; 3199 row = trow;
2976 col = tcol; 3200 col = tcol;
2977 continue; 3201 continue;
2978 } 3202 }
2979 } 3203 }
2980 break; 3204 break;
2981 } 3205 }
3206
2982Old_Word_Selection_You_Die: 3207Old_Word_Selection_You_Die:
2983 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));
2984
2985 if (dirn == DN) 3208 if (dirn == DN)
2986 col++; /* put us on one past the end */ 3209 col++; /* put us on one past the end */
2987 3210
2988 /* Poke the values back in */ 3211 /* Poke the values back in */
2989 ret->row = row - TermWin.saveLines; 3212 ret->row = row - TermWin.saveLines;
… …
3008 MAX_IT (row, 0); 3231 MAX_IT (row, 0);
3009 MIN_IT (row, (int)TermWin.nrow - 1); 3232 MIN_IT (row, (int)TermWin.nrow - 1);
3010 MAX_IT (col, 0); 3233 MAX_IT (col, 0);
3011 MIN_IT (col, (int)TermWin.ncol); 3234 MIN_IT (col, (int)TermWin.ncol);
3012 3235
3013#ifndef NO_NEW_SELECTION
3014 /* 3236 /*
3015 * If we're selecting characters (single click) then we must check first 3237 * If we're selecting characters (single click) then we must check first
3016 * if we are at the same place as the original mark. If we are then 3238 * if we are at the same place as the original mark. If we are then
3017 * select nothing. Otherwise, if we're to the right of the mark, you have to 3239 * select nothing. Otherwise, if we're to the right of the mark, you have to
3018 * be _past_ a character for it to be selected. 3240 * be _past_ a character for it to be selected.
3019 */ 3241 */
3020 if (selection_style != OLD_SELECT)
3021 {
3022 if (((selection.clicks % 3) == 1) && !flag 3242 if (((selection.clicks % 3) == 1) && !flag
3023 && (col == selection.mark.col 3243 && (col == selection.mark.col
3024 && (row == selection.mark.row + TermWin.view_start))) 3244 && (row == selection.mark.row + TermWin.view_start)))
3025 { 3245 {
3026 /* select nothing */ 3246 /* select nothing */
3027 selection.beg.row = selection.end.row = 0; 3247 selection.beg.row = selection.end.row = 0;
3028 selection.beg.col = selection.end.col = 0; 3248 selection.beg.col = selection.end.col = 0;
3029 selection.clicks = 4; 3249 selection.clicks = 4;
3030 want_refresh = 1; 3250 want_refresh = 1;
3031 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3032 return; 3251 return;
3033 }
3034 } 3252 }
3035#endif 3253
3036 if (selection.clicks == 4) 3254 if (selection.clicks == 4)
3037 selection.clicks = 1; 3255 selection.clicks = 1;
3038 3256
3039 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3257 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3040 flag == 1 ? 1 : 0, /* ? button press */ 3258 flag == 1 ? 1 : 0, /* ? button press */
… …
3046 * Extend the selection to the specified col/row 3264 * Extend the selection to the specified col/row
3047 */ 3265 */
3048void 3266void
3049rxvt_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)
3050{ 3268{
3051 int16_t ncol = TermWin.ncol; 3269 int16_t ncol = TermWin.ncol;
3052 int end_col; 3270 int end_col;
3053 row_col_t pos; 3271 row_col_t pos;
3054 enum { 3272 enum {
3055 LEFT, RIGHT 3273 LEFT, RIGHT
3056 } closeto = RIGHT; 3274 } closeto = RIGHT;
3057 3275
3058 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));
3059 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));
3060
3061 want_refresh = 1; 3276 want_refresh = 1;
3277
3062 switch (selection.op) 3278 switch (selection.op)
3063 { 3279 {
3064 case SELECTION_INIT: 3280 case SELECTION_INIT:
3065 CLEAR_SELECTION (); 3281 CLEAR_SELECTION ();
3066 selection.op = SELECTION_BEGIN; 3282 selection.op = SELECTION_BEGIN;
… …
3079 selection_start_colrow (col, row); 3295 selection_start_colrow (col, row);
3080 /* FALLTHROUGH */ 3296 /* FALLTHROUGH */
3081 default: 3297 default:
3082 return; 3298 return;
3083 } 3299 }
3300
3084 if (selection.beg.col == selection.end.col 3301 if (selection.beg.col == selection.end.col
3085 && selection.beg.col != selection.mark.col 3302 && selection.beg.col != selection.mark.col
3086 && selection.beg.row == selection.end.row 3303 && selection.beg.row == selection.end.row
3087 && selection.beg.row != selection.mark.row) 3304 && selection.beg.row != selection.mark.row)
3088 { 3305 {
3089 selection.beg.col = selection.end.col = selection.mark.col; 3306 selection.beg.col = selection.end.col = selection.mark.col;
3090 selection.beg.row = selection.end.row = selection.mark.row; 3307 selection.beg.row = selection.end.row = selection.mark.row;
3091 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));
3092 } 3308 }
3093 3309
3094 pos.col = col; 3310 pos.col = col;
3095 pos.row = row; 3311 pos.row = row;
3096 3312
3097 pos.row -= TermWin.view_start; /* adjust for scroll */ 3313 pos.row -= TermWin.view_start; /* adjust for scroll */
3098 3314
3099#ifndef NO_OLD_SELECTION
3100 /*
3101 * This mimics some of the selection behaviour of version 2.20 and before.
3102 * There are no ``selection modes'', button3 is always character extension.
3103 * Note: button3 drag is always available, c.f. v2.20
3104 * Selection always terminates (left or right as appropriate) at the mark.
3105 */
3106 if (selection_style == OLD_SELECT)
3107 {
3108 if (selection.clicks == 1 || button3)
3109 {
3110 if (hate_those_clicks)
3111 {
3112 hate_those_clicks = 0;
3113 if (selection.clicks == 1)
3114 {
3115 selection.beg.row = selection.mark.row;
3116 selection.beg.col = selection.mark.col;
3117 }
3118 else
3119 {
3120 selection.mark.row = selection.beg.row;
3121 selection.mark.col = selection.beg.col;
3122 }
3123 }
3124 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3125 {
3126 selection.end.row = selection.mark.row;
3127 selection.end.col = selection.mark.col + 1;
3128 selection.beg.row = pos.row;
3129 selection.beg.col = pos.col;
3130 }
3131 else
3132 {
3133 selection.beg.row = selection.mark.row;
3134 selection.beg.col = selection.mark.col;
3135 selection.end.row = pos.row;
3136 selection.end.col = pos.col + 1;
3137 }
3138 }
3139 else if (selection.clicks == 2)
3140 {
3141 selection_delimit_word (UP, & (selection.mark),
3142 & (selection.beg));
3143 selection_delimit_word (DN, & (selection.mark),
3144 & (selection.end));
3145 hate_those_clicks = 1;
3146 }
3147 else if (selection.clicks == 3)
3148 {
3149 selection.beg.row = selection.end.row = selection.mark.row;
3150 selection.beg.col = 0;
3151 selection.end.col = ncol;
3152 hate_those_clicks = 1;
3153 }
3154 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));
3155 return;
3156 }
3157#endif /* ! NO_OLD_SELECTION */
3158#ifndef NO_NEW_SELECTION
3159 /* selection_style must not be OLD_SELECT to get here */
3160 /* 3315 /*
3161 * This is mainly xterm style selection with a couple of differences, mainly 3316 * This is mainly xterm style selection with a couple of differences, mainly
3162 * in the way button3 drag extension works. 3317 * in the way button3 drag extension works.
3163 * We're either doing: button1 drag; button3 press; or button3 drag 3318 * We're either doing: button1 drag; button3 press; or button3 drag
3164 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3319 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3169 * a point/word/line which is either the start or end of the selection 3324 * a point/word/line which is either the start or end of the selection
3170 * and it was decided by whichever point/word/line was `fixed' at the 3325 * and it was decided by whichever point/word/line was `fixed' at the
3171 * time of the most recent button3 press 3326 * time of the most recent button3 press
3172 */ 3327 */
3173 if (button3 && buttonpress) 3328 if (button3 && buttonpress)
3174 { /* button3 press */ 3329 { /* button3 press */
3175 /* 3330 /*
3176 * first determine which edge of the selection we are closest to 3331 * first determine which edge of the selection we are closest to
3177 */ 3332 */
3178 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3333 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3179 || (!ROWCOL_IS_AFTER (pos, selection.end) 3334 || (!ROWCOL_IS_AFTER (pos, selection.end)
3180 && (((pos.col - selection.beg.col) 3335 && (((pos.col - selection.beg.col)
3181 + ((pos.row - selection.beg.row) * ncol)) 3336 + ((pos.row - selection.beg.row) * ncol))
3182 < ((selection.end.col - pos.col) 3337 < ((selection.end.col - pos.col)
3183 + ((selection.end.row - pos.row) * ncol))))) 3338 + ((selection.end.row - pos.row) * ncol)))))
3184 closeto = LEFT; 3339 closeto = LEFT;
3340
3185 if (closeto == LEFT) 3341 if (closeto == LEFT)
3186 { 3342 {
3187 selection.beg.row = pos.row; 3343 selection.beg.row = pos.row;
3188 selection.beg.col = pos.col; 3344 selection.beg.col = pos.col;
3189 selection.mark.row = selection.end.row; 3345 selection.mark.row = selection.end.row;
3190 selection.mark.col = selection.end.col 3346 selection.mark.col = selection.end.col - (selection.clicks == 2);
3191 - (selection.clicks == 2);
3192 } 3347 }
3193 else 3348 else
3194 { 3349 {
3195 selection.end.row = pos.row; 3350 selection.end.row = pos.row;
3196 selection.end.col = pos.col; 3351 selection.end.col = pos.col;
3197 selection.mark.row = selection.beg.row; 3352 selection.mark.row = selection.beg.row;
3198 selection.mark.col = selection.beg.col; 3353 selection.mark.col = selection.beg.col;
3199 } 3354 }
3200 } 3355 }
3201 else 3356 else
3202 { /* button1 drag or button3 drag */ 3357 { /* button1 drag or button3 drag */
3203 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3358 if (ROWCOL_IS_AFTER (selection.mark, pos))
3204 { 3359 {
3205 if ((selection.mark.row == selection.end.row) 3360 if (selection.mark.row == selection.end.row
3206 && (selection.mark.col == selection.end.col) 3361 && selection.mark.col == selection.end.col
3362 && clickchange
3207 && clickchange && selection.clicks == 2) 3363 && selection.clicks == 2)
3208 selection.mark.col--; 3364 selection.mark.col--;
3365
3209 selection.beg.row = pos.row; 3366 selection.beg.row = pos.row;
3210 selection.beg.col = pos.col; 3367 selection.beg.col = pos.col;
3211 selection.end.row = selection.mark.row; 3368 selection.end.row = selection.mark.row;
3212 selection.end.col = selection.mark.col 3369 selection.end.col = selection.mark.col + (selection.clicks == 2);
3213 + (selection.clicks == 2);
3214 } 3370 }
3215 else 3371 else
3216 { 3372 {
3217 selection.beg.row = selection.mark.row; 3373 selection.beg.row = selection.mark.row;
3218 selection.beg.col = selection.mark.col; 3374 selection.beg.col = selection.mark.col;
… …
3222 } 3378 }
3223 3379
3224 if (selection.clicks == 1) 3380 if (selection.clicks == 1)
3225 { 3381 {
3226 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3382 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3383
3227 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
3228 { 3389 )
3229#if 1
3230 selection.beg.col = ncol; 3390 selection.beg.col = ncol;
3231#else
3232 if (selection.beg.row != selection.end.row)
3233 selection.beg.col = ncol;
3234 else
3235 selection.beg.col = selection.mark.col;
3236#endif
3237 3391
3238 }
3239 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3392 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3240 if (end_col != -1 && selection.end.col > end_col) 3393
3394 if (
3395 selection.end.col > end_col
3396 && end_col != -1
3397#if ENABLE_FRILLS
3398 && !selection.rect
3399#endif
3400 )
3241 selection.end.col = ncol; 3401 selection.end.col = ncol;
3242
3243 } 3402 }
3244 else if (selection.clicks == 2) 3403 else if (selection.clicks == 2)
3245 { 3404 {
3246 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3405 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3247 selection.end.col--; 3406 selection.end.col--;
3407
3248 selection_delimit_word (UP, & (selection.beg), 3408 selection_delimit_word (UP, &selection.beg, &selection.beg);
3249 & (selection.beg));
3250 selection_delimit_word (DN, & (selection.end), 3409 selection_delimit_word (DN, &selection.end, &selection.end);
3251 & (selection.end));
3252 } 3410 }
3253 else if (selection.clicks == 3) 3411 else if (selection.clicks == 3)
3254 { 3412 {
3255#ifndef NO_FRILLS 3413#if ENABLE_FRILLS
3256 if ((Options & Opt_tripleclickwords)) 3414 if (options & Opt_tripleclickwords)
3257 { 3415 {
3258 int end_row; 3416 int end_row;
3259 3417
3260 selection_delimit_word (UP, & (selection.beg), 3418 selection_delimit_word (UP, &selection.beg, &selection.beg);
3261 & (selection.beg));
3262 end_row = screen.tlen[selection.mark.row 3419 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3263 + TermWin.saveLines]; 3420
3264 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3421 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3265 end_row++)
3266 { 3422 {
3267 end_col = screen.tlen[end_row + TermWin.saveLines]; 3423 end_col = screen.tlen[end_row + TermWin.saveLines];
3424
3268 if (end_col != -1) 3425 if (end_col != -1)
3269 { 3426 {
3270 selection.end.row = end_row; 3427 selection.end.row = end_row;
3271 selection.end.col = end_col; 3428 selection.end.col = end_col;
3272 selection_remove_trailing_spaces (); 3429 selection_remove_trailing_spaces ();
… …
3274 } 3431 }
3275 } 3432 }
3276 } 3433 }
3277 else 3434 else
3278#endif 3435#endif
3279
3280 { 3436 {
3281 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3437 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3282 selection.mark.col++; 3438 selection.mark.col++;
3439
3283 selection.beg.col = 0; 3440 selection.beg.col = 0;
3284 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++;
3285 } 3451 }
3286 } 3452 }
3453
3287 if (button3 && buttonpress) 3454 if (button3 && buttonpress)
3288 { /* mark may need to be changed */ 3455 { /* mark may need to be changed */
3289 if (closeto == LEFT) 3456 if (closeto == LEFT)
3290 { 3457 {
3291 selection.mark.row = selection.end.row; 3458 selection.mark.row = selection.end.row;
3292 selection.mark.col = selection.end.col 3459 selection.mark.col = selection.end.col - (selection.clicks == 2);
3293 - (selection.clicks == 2);
3294 } 3460 }
3295 else 3461 else
3296 { 3462 {
3297 selection.mark.row = selection.beg.row; 3463 selection.mark.row = selection.beg.row;
3298 selection.mark.col = selection.beg.col; 3464 selection.mark.col = selection.beg.col;
3299 } 3465 }
3300 } 3466 }
3301 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));
3302#endif /* ! NO_NEW_SELECTION */
3303}
3304 3467
3305#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
3306void 3475void
3307rxvt_term::selection_remove_trailing_spaces () 3476rxvt_term::selection_remove_trailing_spaces ()
3308{ 3477{
3309 int32_t end_col, end_row; 3478 int32_t end_col, end_row;
3310 text_t *stp; 3479 text_t *stp;
3311 3480
3312 end_col = selection.end.col; 3481 end_col = selection.end.col;
3313 end_row = selection.end.row; 3482 end_row = selection.end.row;
3483
3314 for ( ; end_row >= selection.beg.row; ) 3484 for ( ; end_row >= selection.beg.row; )
3315 { 3485 {
3316 stp = screen.text[end_row + TermWin.saveLines]; 3486 stp = screen.text[end_row + TermWin.saveLines];
3487
3317 while (--end_col >= 0) 3488 while (--end_col >= 0)
3318 { 3489 {
3319 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3490 if (stp[end_col] != ' '
3491 && stp[end_col] != '\t'
3492 && stp[end_col] != NOCHAR)
3320 break; 3493 break;
3321 } 3494 }
3495
3322 if (end_col >= 0 3496 if (end_col >= 0
3323 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3497 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3324 { 3498 {
3325 selection.end.col = end_col + 1; 3499 selection.end.col = end_col + 1;
3326 selection.end.row = end_row; 3500 selection.end.row = end_row;
3327 break; 3501 break;
3328 } 3502 }
3503
3329 end_row--; 3504 end_row--;
3330 end_col = TermWin.ncol; 3505 end_col = TermWin.ncol;
3331 } 3506 }
3507
3332 if (selection.mark.row > selection.end.row) 3508 if (selection.mark.row > selection.end.row)
3333 { 3509 {
3334 selection.mark.row = selection.end.row; 3510 selection.mark.row = selection.end.row;
3335 selection.mark.col = selection.end.col; 3511 selection.mark.col = selection.end.col;
3336 } 3512 }
… …
3352 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3528 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3353} 3529}
3354 3530
3355/* ------------------------------------------------------------------------- */ 3531/* ------------------------------------------------------------------------- */
3356/* 3532/*
3357 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3358 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3359 * the X11 protocol.
3360 */
3361typedef CARD32 Atom32;
3362
3363/* ------------------------------------------------------------------------- */
3364/*
3365 * Respond to a request for our current selection 3533 * Respond to a request for our current selection
3366 * EXT: SelectionRequest 3534 * EXT: SelectionRequest
3367 */ 3535 */
3368void 3536void
3369rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3537rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3370{ 3538{
3371 XSelectionEvent ev; 3539 XSelectionEvent ev;
3372 XTextProperty ct; 3540 dDisp;
3373 XICCEncodingStyle style;
3374 Atom target;
3375 3541
3376 ev.type = SelectionNotify; 3542 ev.type = SelectionNotify;
3377 ev.property = None; 3543 ev.property = None;
3378 ev.display = rq.display; 3544 ev.display = rq.display;
3379 ev.requestor = rq.requestor; 3545 ev.requestor = rq.requestor;
… …
3381 ev.target = rq.target; 3547 ev.target = rq.target;
3382 ev.time = rq.time; 3548 ev.time = rq.time;
3383 3549
3384 if (rq.target == xa[XA_TARGETS]) 3550 if (rq.target == xa[XA_TARGETS])
3385 { 3551 {
3386 Atom32 target_list[5]; 3552 Atom target_list[6];
3387 Atom32 *target = target_list; 3553 Atom *target = target_list;
3388 3554
3389 *target++ = (Atom32) xa[XA_TARGETS]; 3555 *target++ = xa[XA_TARGETS];
3556 *target++ = xa[XA_TIMESTAMP];
3390 *target++ = (Atom32) XA_STRING; 3557 *target++ = XA_STRING;
3391 *target++ = (Atom32) xa[XA_TEXT]; 3558 *target++ = xa[XA_TEXT];
3392 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3559 *target++ = xa[XA_COMPOUND_TEXT];
3393#if X_HAVE_UTF8_STRING 3560#if X_HAVE_UTF8_STRING
3394 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3561 *target++ = xa[XA_UTF8_STRING];
3395#endif 3562#endif
3563
3396 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3564 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3397 (8 * sizeof (target_list[0])), PropModeReplace, 3565 32, PropModeReplace,
3398 (unsigned char *)target_list, 3566 (unsigned char *)target_list, target - target_list);
3399 target - target_list);
3400 ev.property = rq.property; 3567 ev.property = rq.property;
3401 } 3568 }
3569#if TODO // TODO
3402 else if (rq.target == xa[XA_MULTIPLE]) 3570 else if (rq.target == xa[XA_MULTIPLE])
3403 { 3571 {
3404 /* TODO: Handle MULTIPLE */ 3572 /* TODO: Handle MULTIPLE */
3405 } 3573 }
3574#endif
3406 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3575 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3407 { 3576 {
3408 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3577 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3409 (8 * sizeof (Time)), PropModeReplace,
3410 (unsigned char *)&selection_time, 1); 3578 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3411 ev.property = rq.property; 3579 ev.property = rq.property;
3412 } 3580 }
3413 else if (rq.target == XA_STRING 3581 else if (rq.target == XA_STRING
3414 || rq.target == xa[XA_TEXT] 3582 || rq.target == xa[XA_TEXT]
3415 || rq.target == xa[XA_COMPOUND_TEXT] 3583 || rq.target == xa[XA_COMPOUND_TEXT]
3416 || rq.target == xa[XA_UTF8_STRING] 3584 || rq.target == xa[XA_UTF8_STRING]
3417 ) 3585 )
3418 { 3586 {
3587 XTextProperty ct;
3588 Atom target = rq.target;
3419 short freect = 0; 3589 short freect = 0;
3420 int selectlen; 3590 int selectlen;
3421 char *cl; 3591 wchar_t *cl;
3422 3592 enum {
3423 target = rq.target; 3593 enc_string = XStringStyle,
3594 enc_text = XStdICCTextStyle,
3595 enc_compound_text = XCompoundTextStyle,
3596#ifdef X_HAVE_UTF8_STRING
3597 enc_utf8 = XUTF8StringStyle,
3598#else
3599 enc_utf8 = -1,
3600#endif
3601 } style;
3424 3602
3425 if (target == XA_STRING) 3603 if (target == XA_STRING)
3426 // we actually don't do XA_STRING, but who cares, as i18n clients 3604 // we actually don't do XA_STRING, but who cares, as i18n clients
3427 // will ask for another format anyways. 3605 // will ask for another format anyways.
3428 style = XStringStyle; 3606 style = enc_string;
3429 else if (target == xa[XA_TEXT]) 3607 else if (target == xa[XA_TEXT])
3430 style = XTextStyle; 3608 style = enc_text;
3431 else if (target == xa[XA_COMPOUND_TEXT]) 3609 else if (target == xa[XA_COMPOUND_TEXT])
3432 style = XCompoundTextStyle; 3610 style = enc_compound_text;
3433#if X_HAVE_UTF8_STRING 3611#if ENABLE_FRILLS
3434 else if (target == xa[XA_UTF8_STRING]) 3612 else if (target == xa[XA_UTF8_STRING])
3435 style = XUTF8StringStyle; 3613 style = enc_utf8;
3436#endif 3614#endif
3437 else 3615 else
3438 { 3616 {
3439 target = xa[XA_COMPOUND_TEXT]; 3617 target = xa[XA_COMPOUND_TEXT];
3440 style = XCompoundTextStyle; 3618 style = enc_compound_text;
3441 } 3619 }
3442 3620
3443 if (selection.text) 3621 if (selection.text)
3444 { 3622 {
3445 cl = (char *)selection.text; 3623 cl = selection.text;
3446 selectlen = selection.len; 3624 selectlen = selection.len;
3447 } 3625 }
3448 else 3626 else
3449 { 3627 {
3450 cl = ""; 3628 cl = L"";
3451 selectlen = 0; 3629 selectlen = 0;
3452 } 3630 }
3453 3631
3632#if ENABLE_FRILLS
3633 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3634 // so recode it manually
3635 if (style == enc_utf8)
3636 {
3637 freect = 1;
3638 ct.encoding = target;
3639 ct.format = 8;
3640 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3641 ct.nitems = strlen ((char *)ct.value);
3642 }
3643 else
3644#endif
3454 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3645 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3455 freect = 1; 3646 freect = 1;
3456 else 3647 else
3457 { 3648 {
3458 /* if we failed to convert then send it raw */ 3649 /* if we failed to convert then send it raw */
3459 ct.value = (unsigned char *)cl; 3650 ct.value = (unsigned char *)cl;
3460 ct.nitems = selectlen; 3651 ct.nitems = selectlen;
3652 ct.encoding = target;
3461 } 3653 }
3462 3654
3463 XChangeProperty (display->display, rq.requestor, rq.property, 3655 XChangeProperty (disp, rq.requestor, rq.property,
3464 target, 8, PropModeReplace, 3656 ct.encoding, 8, PropModeReplace,
3465 ct.value, (int)ct.nitems); 3657 ct.value, (int)ct.nitems);
3466 ev.property = rq.property; 3658 ev.property = rq.property;
3467 3659
3468 if (freect) 3660 if (freect)
3469 XFree (ct.value); 3661 XFree (ct.value);
3470 } 3662 }
3663
3471 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3664 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3472} 3665}
3473 3666
3474/* ------------------------------------------------------------------------- * 3667/* ------------------------------------------------------------------------- *
3475 * MOUSE ROUTINES * 3668 * MOUSE ROUTINES *
3476 * ------------------------------------------------------------------------- */ 3669 * ------------------------------------------------------------------------- */
… …
3488} 3681}
3489 3682
3490/* ------------------------------------------------------------------------- */ 3683/* ------------------------------------------------------------------------- */
3491#ifdef USE_XIM 3684#ifdef USE_XIM
3492void 3685void
3493rxvt_term::im_set_position (XPoint *pos) 3686rxvt_term::im_set_position (XPoint &pos)
3494{ 3687{
3495 XWindowAttributes xwa; 3688 XWindowAttributes xwa;
3496 3689
3497 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3690 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3691
3498 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3692 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3499 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3693 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3500} 3694}
3501
3502#endif 3695#endif
3503/* ------------------------------------------------------------------------- */ 3696
3504 3697#if ENABLE_OVERLAY
3698void
3699rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3700{
3701 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3702 return;
3703
3704 want_refresh = 1;
3705
3706 scr_overlay_off ();
3707
3708 if (x < 0) x = TermWin.ncol - w;
3709 if (y < 0) y = TermWin.nrow - h;
3710
3711 // make space for border
3712 w += 2; MIN_IT (w, TermWin.ncol);
3713 h += 2; MIN_IT (h, TermWin.nrow);
3714
3715 x -= 1; MAX_IT (x, 0);
3716 y -= 1; MAX_IT (y, 0);
3717
3718 MIN_IT (x, TermWin.ncol - w);
3719 MIN_IT (y, TermWin.nrow - h);
3720
3721 ov_x = x; ov_y = y;
3722 ov_w = w; ov_h = h;
3723
3724 ov_text = new text_t *[h];
3725 ov_rend = new rend_t *[h];
3726
3727 for (y = 0; y < h; y++)
3728 {
3729 text_t *tp = ov_text[y] = new text_t[w];
3730 rend_t *rp = ov_rend[y] = new rend_t[w];
3731
3732 text_t t0, t1, t2;
3733 rend_t r = OVERLAY_RSTYLE;
3734
3735 if (y == 0)
3736 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3737 else if (y < h - 1)
3738 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3739 else
3740 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3741
3742 *tp++ = t0;
3743 *rp++ = r;
3744
3745 for (x = w - 2; x > 0; --x)
3746 {
3747 *tp++ = t1;
3748 *rp++ = r;
3749 }
3750
3751 *tp = t2;
3752 *rp = r;
3753 }
3754}
3755
3756void
3757rxvt_term::scr_overlay_off ()
3758{
3759 if (!ov_text)
3760 return;
3761
3762 want_refresh = 1;
3763
3764 for (int y = 0; y < ov_h; y++)
3765 {
3766 delete [] ov_text[y];
3767 delete [] ov_rend[y];
3768 }
3769
3770 delete [] ov_text; ov_text = 0;
3771 delete [] ov_rend; ov_rend = 0;
3772}
3773
3774void
3775rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3776{
3777 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3778 return;
3779
3780 x++, y++;
3781
3782 ov_text[y][x] = text;
3783 ov_rend[y][x] = rend;
3784}
3785
3786void
3787rxvt_term::scr_overlay_set (int x, int y, const char *s)
3788{
3789 while (*s)
3790 scr_overlay_set (x++, y, *s++);
3791}
3792
3793void
3794rxvt_term::scr_swap_overlay ()
3795{
3796 if (!ov_text)
3797 return;
3798
3799 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3800
3801 // swap screen mem with overlay
3802 for (int y = ov_h; y--; )
3803 {
3804 text_t *t1 = ov_text[y];
3805 rend_t *r1 = ov_rend[y];
3806
3807 text_t *t2 = screen.text[y + row_offset] + ov_x;
3808 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3809
3810 for (int x = ov_w; x--; )
3811 {
3812 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3813 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3814 }
3815 }
3816}
3817
3818#endif
3505/* ------------------------------------------------------------------------- * 3819/* ------------------------------------------------------------------------- */
3506 * DEBUG ROUTINES *
3507 * ------------------------------------------------------------------------- */
3508#if 0
3509void
3510rxvt_debug_colors (void)
3511{
3512 int color;
3513 const char *name[] =
3514 {
3515 "fg", "bg",
3516 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3517 };
3518
3519 fprintf (stderr, "Color ( ");
3520 if (rstyle & RS_RVid)
3521 fprintf (stderr, "rvid ");
3522 if (rstyle & RS_Bold)
3523 fprintf (stderr, "bold ");
3524 if (rstyle & RS_Blink)
3525 fprintf (stderr, "blink ");
3526 if (rstyle & RS_Uline)
3527 fprintf (stderr, "uline ");
3528 fprintf (stderr, "): ");
3529
3530 color = GET_FGCOLOR (rstyle);
3531#ifndef NO_BRIGHTCOLOR
3532 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3533 {
3534 color -= (minBrightCOLOR - minCOLOR);
3535 fprintf (stderr, "bright ");
3536 }
3537#endif
3538 fprintf (stderr, "%s on ", name[color]);
3539
3540 color = GET_BGCOLOR (rstyle);
3541#ifndef NO_BRIGHTCOLOR
3542 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3543 {
3544 color -= (minBrightCOLOR - minCOLOR);
3545 fprintf (stderr, "bright ");
3546 }
3547#endif
3548 fprintf (stderr, "%s\n", name[color]);
3549}
3550#endif

Diff Legend

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