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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.16 by pcg, Fri Jan 16 22:11:09 2004 UTC

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

Diff Legend

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