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.19 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.74 by pcg, Sun May 9 18:19:49 2004 UTC

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

Diff Legend

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