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

Diff Legend

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