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

Diff Legend

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