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

Diff Legend

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