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.16 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC

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

Diff Legend

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