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

Diff Legend

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