ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.59 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.157 by root, Sun Feb 13 08:56:28 2005 UTC

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

Diff Legend

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