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

Diff Legend

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