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.17 by pcg, Mon Jan 19 17:26:43 2004 UTC vs.
Revision 1.78 by root, Fri Jul 30 18:35:11 2004 UTC

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

Diff Legend

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