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

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

Diff Legend

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