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.23 by pcg, Sat Jan 31 02:31:17 2004 UTC vs.
Revision 1.77 by root, Mon Jul 26 14:57:12 2004 UTC

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

Diff Legend

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