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

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

Diff Legend

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