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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.17 by pcg, Mon Jan 19 17:26:43 2004 UTC

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

Diff Legend

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