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

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

Diff Legend

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