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

Diff Legend

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