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.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.162 by root, Sun Apr 17 22:36:13 2005 UTC

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

Diff Legend

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