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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.27 by pcg, Mon Feb 9 07:11:49 2004 UTC

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

Diff Legend

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