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

Diff Legend

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