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.16 by pcg, Fri Jan 16 22:11:09 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.c
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.4 2003/11/25 15:25:17 pcg Exp $ 4 * $Id: screen.C,v 1.16 2004/01/16 22:11:09 pcg Exp $
5 * 5 *
6 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
31#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32 32
33#include <stdint.h> 33#include <stdint.h>
34#include <wchar.h> 34#include <wchar.h>
35 35
36#include "salloc.C" // HACK!!
37
36inline void fill_text (text_t *start, text_t value, int len) 38inline void fill_text (text_t *start, text_t value, int len)
37{ 39{
38 while (len--) 40 while (len--)
39 *start++ = value; 41 *start++ = value;
40} 42}
41
42#define RESET_CHSTAT(H) \
43 if ((H)->chstat == WBYTE) \
44 (H)->chstat = SBYTE, (H)->lost_multi = 1
45 43
46/* ------------------------------------------------------------------------- */ 44/* ------------------------------------------------------------------------- */
47#define PROP_SIZE 16384 45#define PROP_SIZE 16384
48#define TABSIZE 8 /* default tab size */ 46#define TABSIZE 8 /* default tab size */
49 47
… …
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 93 */
96#define drawBuffer (R->TermWin.vt) 94#define drawBuffer TermWin.vt
97 95
98#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
99 if (R->TermWin.mapped) \ 97 if (TermWin.mapped) \
100 XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ 98 XClearArea (Xdisplay, drawBuffer, TermWin.int_bwidth, \
101 Row2Pixel(row), (unsigned int)R->TermWin.width, \ 99 Row2Pixel(row), (unsigned int)TermWin.width, \
102 (unsigned int)Height2Pixel(num), False) 100 (unsigned int)Height2Pixel(num), False)
103 101
104#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
105 if (R->TermWin.mapped) \ 103 if (TermWin.mapped) \
106 XClearArea(R->Xdisplay, drawBuffer, x, y, \ 104 XClearArea (Xdisplay, drawBuffer, x, y, \
107 (unsigned int)Width2Pixel(num), \ 105 (unsigned int)Width2Pixel(num), \
108 (unsigned int)Height2Pixel(1), False) 106 (unsigned int)Height2Pixel(1), False)
109 107
110#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
111 XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ 109 XFillRectangle (Xdisplay, drawBuffer, TermWin.gc, \
112 R->TermWin.int_bwidth, Row2Pixel(row), \ 110 TermWin.int_bwidth, Row2Pixel(row), \
113 (unsigned int)R->TermWin.width, \ 111 (unsigned int)TermWin.width, \
114 (unsigned int)Height2Pixel(num)) 112 (unsigned int)Height2Pixel(num))
115 113
116/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
117 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
118 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
119/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
120/* INTPROTO */
121void 118void
122rxvt_blank_line(pR_ text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
123{ 120{
124 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
125 efs = SET_FONT (efs, R->TermWin.fontset->find_font (' ')); 122 efs = SET_FONT (efs, TermWin.fontset->find_font (' '));
126 123
127 while (width--) 124 while (width--)
128 { 125 {
129 *et++ = ' '; 126 *et++ = ' ';
130 *er++ = efs; 127 *er++ = efs;
131 } 128 }
132} 129}
133 130
134/* ------------------------------------------------------------------------- */ 131/* ------------------------------------------------------------------------- */
135/* Fill a full line with blanks - make sure it is allocated first */ 132/* Fill a full line with blanks - make sure it is allocated first */
136/* INTPROTO */
137void 133void
138rxvt_blank_screen_mem(pR_ text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs)
139{ 135{
140 int width = R->TermWin.ncol;
141 rend_t *er;
142
143#ifdef DEBUG_STRICT 136#ifdef DEBUG_STRICT
144 assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); 137 assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
145#endif 138#endif
146 if (tp[row] == NULL) { 139 if (tp[row] == NULL)
147 tp[row] = (text_t *)rxvt_malloc(sizeof(text_t) * width);
148 rp[row] = (rend_t *)rxvt_malloc(sizeof(rend_t) * width);
149 } 140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144
150 rxvt_blank_line (aR_ tp[row], rp[row], width, efs); 145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
151} 146}
152 147
153/* ------------------------------------------------------------------------- * 148/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 149 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 150 * ------------------------------------------------------------------------- */
156/* EXTPROTO */
157void 151void
158rxvt_scr_reset(pR) 152rxvt_term::scr_reset ()
159{ 153{
160 unsigned int ncol, nrow, prev_ncol, prev_nrow, 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
161 total_rows, prev_total_rows;
162 unsigned int p, q; 155 unsigned int p, q;
163 int k; 156 int k;
164 rend_t setrstyle; 157 rend_t setrstyle;
165 158
166 D_SCREEN((stderr, "rxvt_scr_reset()")); 159 D_SCREEN((stderr, "rxvt_scr_reset()"));
167 160
168 R->TermWin.view_start = 0; 161 TermWin.view_start = 0;
169 RESET_CHSTAT(R);
170 R->num_scr = 0; 162 num_scr = 0;
171 163
172 prev_ncol = R->prev_ncol;
173 prev_nrow = R->prev_nrow;
174 if (R->TermWin.ncol == 0) 164 if (TermWin.ncol == 0)
175 R->TermWin.ncol = 80; 165 TermWin.ncol = 80;
166
176 if (R->TermWin.nrow == 0) 167 if (TermWin.nrow == 0)
177 R->TermWin.nrow = 24; 168 TermWin.nrow = 24;
169
178 ncol = R->TermWin.ncol; 170 ncol = TermWin.ncol;
179 nrow = R->TermWin.nrow; 171 nrow = TermWin.nrow;
172
180 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
181 return; 174 return;
182 175
183 R->want_refresh = 1; 176 want_refresh = 1;
184 177
185 total_rows = nrow + R->TermWin.saveLines; 178 total_rows = nrow + TermWin.saveLines;
186 prev_total_rows = prev_nrow + R->TermWin.saveLines; 179 prev_total_rows = prev_nrow + TermWin.saveLines;
187 180
188 R->screen.tscroll = 0; 181 screen.tscroll = 0;
189 R->screen.bscroll = nrow - 1; 182 screen.bscroll = nrow - 1;
190 183
184 if (!talloc)
185 {
186 talloc = new rxvt_salloc (ncol * sizeof (text_t));
187 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
188 }
189
191 if (prev_nrow == 0) { 190 if (prev_nrow == 0)
192/* 191 {
192 /*
193 * A: first time called so just malloc everything : don't rely on realloc 193 * first time called so just malloc everything : don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL 194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 195 */
196 R->screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); 196 screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *));
197 R->buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); 197 buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *));
198 R->drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); 198 drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *));
199 R->swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); 199 swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *));
200 200
201 R->screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); 201 screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t));
202 R->swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); 202 swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t));
203 203
204 R->screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 204 screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *));
205 R->buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 205 buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *));
206 R->drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); 206 drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *));
207 R->swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); 207 swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *));
208 208
209 for (p = 0; p < nrow; p++) { 209 for (p = 0; p < nrow; p++)
210 {
210 q = p + R->TermWin.saveLines; 211 q = p + TermWin.saveLines;
211 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 212 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
212 q, DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
213 rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend,
214 p, DEFAULT_RSTYLE);
215 R->screen.tlen[q] = R->swap.tlen[p] = 0; 214 screen.tlen[q] = swap.tlen[p] = 0;
216 rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, 215 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 p, DEFAULT_RSTYLE);
218 } 216 }
217
219 MEMSET(R->charsets, 'B', sizeof(R->charsets)); 218 MEMSET(charsets, 'B', sizeof(charsets));
220 R->TermWin.nscrolled = 0; /* no saved lines */ 219 TermWin.nscrolled = 0; /* no saved lines */
221 R->rstyle = DEFAULT_RSTYLE; 220 rstyle = DEFAULT_RSTYLE;
222 R->screen.flags = Screen_DefaultFlags; 221 screen.flags = Screen_DefaultFlags;
223 R->screen.cur.row = R->screen.cur.col = 0; 222 screen.cur.row = screen.cur.col = 0;
224 R->screen.charset = 0; 223 screen.charset = 0;
225 R->current_screen = PRIMARY; 224 current_screen = PRIMARY;
226 rxvt_scr_cursor(aR_ SAVE); 225 rxvt_scr_cursor (this, SAVE);
226
227#if NSCREENS 227#if NSCREENS
228 R->swap.flags = Screen_DefaultFlags; 228 swap.flags = Screen_DefaultFlags;
229 R->swap.cur.row = R->swap.cur.col = 0; 229 swap.cur.row = swap.cur.col = 0;
230 R->swap.charset = 0; 230 swap.charset = 0;
231 R->current_screen = SECONDARY; 231 current_screen = SECONDARY;
232 rxvt_scr_cursor(aR_ SAVE); 232 rxvt_scr_cursor (this, SAVE);
233 R->current_screen = PRIMARY; 233 current_screen = PRIMARY;
234#endif 234#endif
235
235 R->selection.text = NULL; 236 selection.text = NULL;
236 R->selection.len = 0; 237 selection.len = 0;
237 R->selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
238 R->selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
239 R->selection.clicks = 0; 240 selection.clicks = 0;
240 CLEAR_ALL_SELECTION(R); 241 CLEAR_ALL_SELECTION (this);
241 R->rvideo = 0; 242 rvideo = 0;
242 243 }
243 } else { 244 else
244/* 245 {
246 /*
245 * B1: add or delete rows as appropriate 247 * add or delete rows as appropriate
246 */ 248 */
247 setrstyle = DEFAULT_RSTYLE; 249 setrstyle = DEFAULT_RSTYLE;
248 250
249 if (nrow < prev_nrow) { 251 if (nrow < prev_nrow)
252 {
250 /* delete rows */ 253 /* delete rows */
251 k = min(R->TermWin.nscrolled, prev_nrow - nrow); 254 k = min (TermWin.nscrolled, prev_nrow - nrow);
252 rxvt_scroll_text(aR_ 0, (int)prev_nrow - 1, k, 1); 255 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
256
253 for (p = nrow; p < prev_nrow; p++) { 257 for (p = nrow; p < prev_nrow; p++)
258 {
254 q = p + R->TermWin.saveLines; 259 q = p + TermWin.saveLines;
255 if (R->screen.text[q]) { 260 if (screen.text[q])
261 {
256#ifdef DEBUG_STRICT 262#ifdef DEBUG_STRICT
257 assert(R->screen.rend[q]); 263 assert (screen.rend[q]);
258#endif 264#endif
259 free(R->screen.text[q]); 265 talloc->free (screen.text[q]);
260 free(R->screen.rend[q]); 266 ralloc->free (screen.rend[q]);
261 } 267 }
262 if (R->swap.text[p]) { 268 if (swap.text[p])
269 {
263#ifdef DEBUG_STRICT 270#ifdef DEBUG_STRICT
264 assert(R->swap.rend[p]); 271 assert (swap.rend[p]);
265#endif 272#endif
266 free(R->swap.text[p]); 273 talloc->free (swap.text[p]);
267 free(R->swap.rend[p]); 274 ralloc->free (swap.rend[p]);
268 } 275 }
269#ifdef DEBUG_STRICT 276#ifdef DEBUG_STRICT
270 assert(R->drawn_text[p] && R->drawn_rend[p]); 277 assert (drawn_text[p] && drawn_rend[p]);
271#endif 278#endif
272 free(R->drawn_text[p]); 279 talloc->free (drawn_text[p]);
273 free(R->drawn_rend[p]); 280 ralloc->free (drawn_rend[p]);
274 } 281 }
282
275 /* we have fewer rows so fix up cursor position */ 283 /* we have fewer rows so fix up cursor position */
276 MIN_IT(R->screen.cur.row, (int32_t)nrow - 1); 284 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
277 MIN_IT(R->swap.cur.row, (int32_t)nrow - 1); 285 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
278 286
279 rxvt_scr_reset_realloc(aR); /* realloc _last_ */ 287 scr_reset_realloc (); /* realloc _last_ */
280 288 }
281 } else if (nrow > prev_nrow) { 289 else if (nrow > prev_nrow)
290 {
282 /* add rows */ 291 /* add rows */
283 rxvt_scr_reset_realloc(aR); /* realloc _first_ */ 292 scr_reset_realloc (); /* realloc _first_ */
284 293
294 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
295
285 k = min(R->TermWin.nscrolled, nrow - prev_nrow); 296 k = min (TermWin.nscrolled, nrow - prev_nrow);
297
286 for (p = prev_total_rows; p < total_rows; p++) { 298 for (p = prev_total_rows; p < total_rows; p++)
299 {
287 R->screen.tlen[p] = 0; 300 screen.tlen[p] = 0;
288 R->screen.text[p] = NULL; 301 screen.text[p] = NULL;
289 R->screen.rend[p] = NULL; 302 screen.rend[p] = NULL;
290 } 303 }
304
291 for (p = prev_total_rows; p < total_rows - k; p++) 305 for (p = prev_total_rows; p < total_rows - k; p++)
292 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 306 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
293 p, setrstyle); 307
294 for (p = prev_nrow; p < nrow; p++) { 308 for (p = prev_nrow; p < nrow; p++)
309 {
295 R->swap.tlen[p] = 0; 310 swap.tlen[p] = 0;
296 R->swap.text[p] = NULL; 311 swap.text[p] = NULL;
297 R->swap.rend[p] = NULL; 312 swap.rend[p] = NULL;
298 R->drawn_text[p] = NULL; 313 drawn_text[p] = NULL;
299 R->drawn_rend[p] = NULL; 314 drawn_rend[p] = NULL;
300 rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, 315 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, 316 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
303 p, setrstyle);
304 } 317 }
318
305 if (k > 0) { 319 if (k > 0)
320 {
306 rxvt_scroll_text(aR_ 0, (int)nrow - 1, -k, 1); 321 scr_scroll_text (0, (int)nrow - 1, -k, 1);
307 R->screen.cur.row += k; 322 screen.cur.row += k;
308 R->screen.s_cur.row += k; 323 screen.s_cur.row += k;
309 R->TermWin.nscrolled -= k; 324 TermWin.nscrolled -= k;
310 } 325 }
311#ifdef DEBUG_STRICT 326#ifdef DEBUG_STRICT
312 assert(R->screen.cur.row < R->TermWin.nrow); 327 assert(screen.cur.row < TermWin.nrow);
313 assert(R->swap.cur.row < R->TermWin.nrow); 328 assert(swap.cur.row < TermWin.nrow);
314#else /* drive with your eyes closed */ 329#else /* drive with your eyes closed */
330
315 MIN_IT(R->screen.cur.row, nrow - 1); 331 MIN_IT(screen.cur.row, nrow - 1);
316 MIN_IT(R->swap.cur.row, nrow - 1); 332 MIN_IT(swap.cur.row, nrow - 1);
317#endif 333#endif
334 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
318 } 335 }
336
319/* B2: resize columns */ 337 /* resize columns */
320 if (ncol != prev_ncol) { 338 if (ncol != prev_ncol)
339 {
340 int common = min (prev_ncol, ncol);
341 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
342 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
343
321 for (p = 0; p < total_rows; p++) { 344 for (p = 0; p < total_rows; p++)
345 {
322 if (R->screen.text[p]) { 346 if (screen.text[p])
323 R->screen.text[p] = (text_t *)rxvt_realloc(R->screen.text[p], ncol * sizeof(text_t)); 347 {
324 R->screen.rend[p] = (rend_t *)rxvt_realloc(R->screen.rend[p], ncol * sizeof(rend_t)); 348 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t;
349 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r;
350
325 MIN_IT(R->screen.tlen[p], (int16_t)ncol); 351 MIN_IT(screen.tlen[p], (int16_t)ncol);
352
326 if (ncol > prev_ncol) 353 if (ncol > prev_ncol)
327 rxvt_blank_line(aR_ 354 scr_blank_line (&(screen.text[p][prev_ncol]),
328 &(R->screen.text[p][prev_ncol]),
329 &(R->screen.rend[p][prev_ncol]), 355 &(screen.rend[p][prev_ncol]),
330 ncol - prev_ncol, 356 ncol - prev_ncol,
331 setrstyle); 357 setrstyle);
332 } 358 }
333 } 359 }
360
334 for (p = 0; p < nrow; p++) { 361 for (p = 0; p < nrow; p++)
335 R->drawn_text[p] = (text_t *)rxvt_realloc(R->drawn_text[p], ncol * sizeof(text_t)); 362 {
336 R->drawn_rend[p] = (rend_t *)rxvt_realloc(R->drawn_rend[p], ncol * sizeof(rend_t)); 363 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t;
364 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r;
365
366 if (ncol > prev_ncol)
367 scr_blank_line (&(drawn_text[p][prev_ncol]),
368 &(drawn_rend[p][prev_ncol]),
369 ncol - prev_ncol, setrstyle);
370
337 if (R->swap.text[p]) { 371 if (swap.text[p])
338 R->swap.text[p] = (text_t *)rxvt_realloc(R->swap.text[p], ncol * sizeof(text_t)); 372 {
339 R->swap.rend[p] = (rend_t *)rxvt_realloc(R->swap.rend[p], ncol * sizeof(rend_t)); 373 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t;
374 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r;
375
340 MIN_IT(R->swap.tlen[p], (int16_t)ncol); 376 MIN_IT(swap.tlen[p], (int16_t)ncol);
377
341 if (ncol > prev_ncol) 378 if (ncol > prev_ncol)
342 rxvt_blank_line(aR_ 379 scr_blank_line (&(swap.text[p][prev_ncol]),
343 &(R->swap.text[p][prev_ncol]),
344 &(R->swap.rend[p][prev_ncol]), 380 &(swap.rend[p][prev_ncol]),
345 ncol - prev_ncol, setrstyle); 381 ncol - prev_ncol, setrstyle);
346 } 382 }
347 if (ncol > prev_ncol) 383
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 } 384 }
385
353 MIN_IT(R->screen.cur.col, (int16_t)ncol - 1); 386 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
354 MIN_IT(R->swap.cur.col, (int16_t)ncol - 1); 387 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
388
389 delete talloc; talloc = ta;
390 delete ralloc; ralloc = ra;
355 } 391 }
392
356 if (R->tabs) 393 if (tabs)
357 free(R->tabs); 394 free(tabs);
358 } 395 }
359 396
397 prev_nrow = nrow;
398 prev_ncol = ncol;
399
360 R->tabs = (char *)rxvt_malloc(ncol * sizeof(char)); 400 tabs = (char *)rxvt_malloc (ncol * sizeof(char));
361 401
362 for (p = 0; p < ncol; p++) 402 for (p = 0; p < ncol; p++)
363 R->tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 403 tabs[p] = (p % TABSIZE == 0) ? 1 : 0;
364 404
365 R->prev_nrow = nrow; 405 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} 406}
370 407
371/* INTPROTO */
372void 408void
373rxvt_scr_reset_realloc(pR) 409rxvt_term::scr_reset_realloc()
374{ 410{
375 uint16_t total_rows, nrow; 411 uint16_t total_rows, nrow;
376 412
377 nrow = R->TermWin.nrow; 413 nrow = TermWin.nrow;
378 total_rows = nrow + R->TermWin.saveLines; 414 total_rows = nrow + TermWin.saveLines;
379/* *INDENT-OFF* */ 415 /* *INDENT-OFF* */
380 R->screen.text = (text_t **)rxvt_realloc(R->screen.text, total_rows * sizeof(text_t *)); 416 screen.text = (text_t **)rxvt_realloc(screen.text, total_rows * sizeof(text_t *));
381 R->buf_text = (text_t **)rxvt_realloc(R->buf_text , total_rows * sizeof(text_t *)); 417 buf_text = (text_t **)rxvt_realloc(buf_text , total_rows * sizeof(text_t *));
382 R->drawn_text = (text_t **)rxvt_realloc(R->drawn_text , nrow * sizeof(text_t *)); 418 drawn_text = (text_t **)rxvt_realloc(drawn_text , nrow * sizeof(text_t *));
383 R->swap.text = (text_t **)rxvt_realloc(R->swap.text , nrow * sizeof(text_t *)); 419 swap.text = (text_t **)rxvt_realloc(swap.text , nrow * sizeof(text_t *));
384 420
385 R->screen.tlen = (int16_t *)rxvt_realloc(R->screen.tlen, total_rows * sizeof(int16_t)); 421 screen.tlen = (int16_t *)rxvt_realloc(screen.tlen, total_rows * sizeof(int16_t));
386 R->swap.tlen = (int16_t *)rxvt_realloc(R->swap.tlen , total_rows * sizeof(int16_t)); 422 swap.tlen = (int16_t *)rxvt_realloc(swap.tlen , total_rows * sizeof(int16_t));
387 423
388 R->screen.rend = (rend_t **)rxvt_realloc(R->screen.rend, total_rows * sizeof(rend_t *)); 424 screen.rend = (rend_t **)rxvt_realloc(screen.rend, total_rows * sizeof(rend_t *));
389 R->buf_rend = (rend_t **)rxvt_realloc(R->buf_rend , total_rows * sizeof(rend_t *)); 425 buf_rend = (rend_t **)rxvt_realloc(buf_rend , total_rows * sizeof(rend_t *));
390 R->drawn_rend = (rend_t **)rxvt_realloc(R->drawn_rend , nrow * sizeof(rend_t *)); 426 drawn_rend = (rend_t **)rxvt_realloc(drawn_rend , nrow * sizeof(rend_t *));
391 R->swap.rend = (rend_t **)rxvt_realloc(R->swap.rend , nrow * sizeof(rend_t *)); 427 swap.rend = (rend_t **)rxvt_realloc(swap.rend , nrow * sizeof(rend_t *));
392/* *INDENT-ON* */ 428 /* *INDENT-ON* */
393} 429}
394 430
395/* ------------------------------------------------------------------------- */ 431/* ------------------------------------------------------------------------- */
396/* 432/*
397 * Free everything. That way malloc debugging can find leakage. 433 * Free everything. That way malloc debugging can find leakage.
398 */ 434 */
399/* EXTPROTO */
400void 435void
401rxvt_scr_release(pR) 436rxvt_term::scr_release()
402{ 437{
403 uint16_t total_rows; 438 uint16_t total_rows;
404 int i; 439 int i;
405 440
406 total_rows = R->TermWin.nrow + R->TermWin.saveLines; 441 total_rows = TermWin.nrow + TermWin.saveLines;
407 for (i = 0; i < total_rows; i++) { 442
408 if (R->screen.text[i]) { /* then so is R->screen.rend[i] */
409 free(R->screen.text[i]);
410#ifdef DEBUG_STRICT 443#ifdef DEBUG_STRICT
444 for (i = 0; i < total_rows; i++)
445 {
446 if (screen.text[i])
447 /* then so is screen.rend[i] */
411 assert(R->screen.rend[i]); 448 assert(screen.rend[i]);
412#endif
413 free(R->screen.rend[i]);
414 }
415 } 449 }
416 for (i = 0; i < R->TermWin.nrow; i++) { 450#endif
417 free(R->drawn_text[i]); 451
418 free(R->drawn_rend[i]); 452 delete talloc; talloc = 0;
419 free(R->swap.text[i]); 453 delete ralloc; ralloc = 0;
420 free(R->swap.rend[i]); 454
421 }
422 free(R->screen.text); 455 free (screen.text);
423 free(R->screen.tlen); 456 free (screen.tlen);
424 free(R->screen.rend); 457 free (screen.rend);
425 free(R->drawn_text); 458 free (drawn_text);
426 free(R->drawn_rend); 459 free (drawn_rend);
427 free(R->swap.text); 460 free (swap.text);
428 free(R->swap.tlen); 461 free (swap.tlen);
429 free(R->swap.rend); 462 free (swap.rend);
430 free(R->buf_text); 463 free (buf_text);
431 free(R->buf_rend); 464 free (buf_rend);
432 free(R->tabs); 465 free (tabs);
433 466
434/* NULL these so if anything tries to use them, we'll know about it */ 467 /* NULL these so if anything tries to use them, we'll know about it */
435 R->screen.text = R->drawn_text = R->swap.text = NULL; 468 screen.text = drawn_text = swap.text = NULL;
436 R->screen.rend = R->drawn_rend = R->swap.rend = NULL; 469 screen.rend = drawn_rend = swap.rend = NULL;
437 R->screen.tlen = R->swap.tlen = NULL; 470 screen.tlen = swap.tlen = NULL;
438 R->buf_text = NULL; 471 buf_text = NULL;
439 R->buf_rend = NULL; 472 buf_rend = NULL;
440 R->tabs = NULL; 473 tabs = NULL;
441} 474}
442 475
443/* ------------------------------------------------------------------------- */ 476/* ------------------------------------------------------------------------- */
444/* 477/*
445 * Hard reset 478 * Hard reset
446 */ 479 */
447/* EXTPROTO */ 480/* EXTPROTO */
448void 481void
449rxvt_scr_poweron(pR) 482rxvt_scr_poweron(pR)
450{ 483{
451 D_SCREEN((stderr, "rxvt_scr_poweron()")); 484 D_SCREEN((stderr, "rxvt_scr_poweron()"));
452 485
453 rxvt_scr_release(aR); 486 R->scr_release ();
454 R->prev_nrow = R->prev_ncol = 0; 487 R->prev_nrow = R->prev_ncol = 0;
455 rxvt_scr_reset(aR); 488 R->scr_reset ();
456 489
457 rxvt_scr_clear(aR); 490 R->scr_clear ();
458 rxvt_scr_refresh(aR_ SLOW_REFRESH); 491 R->scr_refresh (SLOW_REFRESH);
459#ifdef RXVT_GRAPHICS 492#ifdef RXVT_GRAPHICS
460 rxvt_Gr_reset(aR); 493 rxvt_Gr_reset (aR);
461#endif 494#endif
462} 495}
463 496
464/* ------------------------------------------------------------------------- * 497/* ------------------------------------------------------------------------- *
465 * PROCESS SCREEN COMMANDS * 498 * PROCESS SCREEN COMMANDS *
… …
532 R->want_refresh = 1; 565 R->want_refresh = 1;
533 566
534 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); 567 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn));
535 568
536 R->TermWin.view_start = 0; 569 R->TermWin.view_start = 0;
537 RESET_CHSTAT(R);
538 570
539 if (R->current_screen == scrn) 571 if (R->current_screen == scrn)
540 return R->current_screen; 572 return R->current_screen;
541 573
542 rxvt_selection_check(aR_ 2); /* check for boundary cross */ 574 rxvt_selection_check(aR_ 2); /* check for boundary cross */
… …
582 if (R->current_screen == PRIMARY 614 if (R->current_screen == PRIMARY
583# ifdef RXVT_GRAPHICS 615# ifdef RXVT_GRAPHICS
584 && !rxvt_Gr_Displayed(aR) 616 && !rxvt_Gr_Displayed(aR)
585# endif 617# endif
586 ) 618 )
587 rxvt_scroll_text(aR_ 0, (R->prev_nrow - 1), R->prev_nrow, 0); 619 R->scr_scroll_text(0, (R->prev_nrow - 1), R->prev_nrow, 0);
588# endif 620# endif
589#endif 621#endif
590 return scrn; 622 return scrn;
591} 623}
592 624
… …
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 658 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 659 * count positive ==> scroll up
628 * count negative ==> scroll down 660 * count negative ==> scroll down
629 * spec == 0 for normal routines 661 * spec == 0 for normal routines
630 */ 662 */
631/* EXTPROTO */
632int 663int
633rxvt_scroll_text(pR_ int row1, int row2, int count, int spec) 664rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
634{ 665{
635 int i, j; 666 int i, j;
636 long nscrolled; 667 long nscrolled;
637 668
638 if (count == 0 || (row1 > row2)) 669 if (count == 0 || (row1 > row2))
639 return 0; 670 return 0;
640 671
641 R->want_refresh = 1; 672 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")); 673 D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
643 674
644 if ((count > 0) && (row1 == 0) && (R->current_screen == PRIMARY)) { 675 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY))
676 {
645 nscrolled = (long)R->TermWin.nscrolled + (long)count;; 677 nscrolled = (long)TermWin.nscrolled + (long)count;
678
646 if (nscrolled > (long)R->TermWin.saveLines) 679 if (nscrolled > (long)TermWin.saveLines)
647 R->TermWin.nscrolled = R->TermWin.saveLines; 680 TermWin.nscrolled = TermWin.saveLines;
648 else 681 else
649 R->TermWin.nscrolled = (uint16_t)nscrolled; 682 TermWin.nscrolled = (uint16_t)nscrolled;
683
650 if ((R->Options & Opt_scrollWithBuffer) 684 if ((Options & Opt_scrollWithBuffer)
651 && R->TermWin.view_start != 0 685 && TermWin.view_start != 0
652 && R->TermWin.view_start != R->TermWin.saveLines) 686 && TermWin.view_start != TermWin.saveLines)
653 rxvt_scr_page(aR_ UP, count); 687 rxvt_scr_page (this, UP, count);
688 }
654 } else if (!spec) 689 else if (!spec)
655 row1 += R->TermWin.saveLines;
656 row2 += R->TermWin.saveLines; 690 row1 += TermWin.saveLines;
657 691
692 row2 += TermWin.saveLines;
693
658 if (R->selection.op && R->current_screen == R->selection.screen) { 694 if (selection.op && current_screen == selection.screen)
695 {
659 i = R->selection.beg.row + R->TermWin.saveLines; 696 i = selection.beg.row + TermWin.saveLines;
660 j = R->selection.end.row + R->TermWin.saveLines; 697 j = selection.end.row + TermWin.saveLines;
661 if ((i < row1 && j > row1) 698 if ((i < row1 && j > row1)
662 || (i < row2 && j > row2) 699 || (i < row2 && j > row2)
663 || (i - count < row1 && i >= row1) 700 || (i - count < row1 && i >= row1)
664 || (i - count > row2 && i <= row2) 701 || (i - count > row2 && i <= row2)
665 || (j - count < row1 && j >= row1) 702 || (j - count < row1 && j >= row1)
666 || (j - count > row2 && j <= row2)) { 703 || (j - count > row2 && j <= row2))
704 {
667 CLEAR_ALL_SELECTION(R); 705 CLEAR_ALL_SELECTION (this);
668 R->selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 706 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
707 }
669 } else if (j >= row1 && j <= row2) { 708 else if (j >= row1 && j <= row2)
709 {
670 /* move selected region too */ 710 /* move selected region too */
671 R->selection.beg.row -= count; 711 selection.beg.row -= count;
672 R->selection.end.row -= count; 712 selection.end.row -= count;
673 R->selection.mark.row -= count; 713 selection.mark.row -= count;
674 } 714 }
675 } 715 }
716
676 rxvt_selection_check(aR_ 0); /* _after_ R->TermWin.nscrolled update */ 717 rxvt_selection_check (this, 0); /* _after_ TermWin.nscrolled update */
677 718
678 R->num_scr += count; 719 num_scr += count;
679 j = count; 720 j = count;
721
680 if (count < 0) 722 if (count < 0)
681 count = -count; 723 count = -count;
724
682 i = row2 - row1 + 1; 725 i = row2 - row1 + 1;
683 MIN_IT(count, i); 726 MIN_IT(count, i);
684 727
685 if (j > 0) { 728 if (j > 0)
729 {
686/* A: scroll up */ 730 /* A: scroll up */
687 731
688/* A1: Copy lines that will get clobbered by the rotation */ 732 /* A1: Copy lines that will get clobbered by the rotation */
689 for (i = 0, j = row1; i < count; i++, j++) { 733 for (i = 0, j = row1; i < count; i++, j++)
734 {
690 R->buf_text[i] = R->screen.text[j]; 735 buf_text[i] = screen.text[j];
691 R->buf_rend[i] = R->screen.rend[j]; 736 buf_rend[i] = screen.rend[j];
692 } 737 }
693/* A2: Rotate lines */ 738 /* A2: Rotate lines */
694 for (j = row1, i = j + count; i <= row2; i++, j++) { 739 for (j = row1, i = j + count; i <= row2; i++, j++)
740 {
695 R->screen.tlen[j] = R->screen.tlen[i]; 741 screen.tlen[j] = screen.tlen[i];
696 R->screen.text[j] = R->screen.text[i]; 742 screen.text[j] = screen.text[i];
697 R->screen.rend[j] = R->screen.rend[i]; 743 screen.rend[j] = screen.rend[i];
698 } 744 }
699 j = row2 - count + 1, i = count; 745 j = row2 - count + 1, i = count;
746 }
700 } else /* if (j < 0) */ { 747 else /* if (j < 0) */
748 {
701/* B: scroll down */ 749 /* B: scroll down */
702 750
703/* B1: Copy lines that will get clobbered by the rotation */ 751 /* B1: Copy lines that will get clobbered by the rotation */
704 for (i = 0, j = row2; i < count; i++, j--) { 752 for (i = 0, j = row2; i < count; i++, j--)
753 {
705 R->buf_text[i] = R->screen.text[j]; 754 buf_text[i] = screen.text[j];
706 R->buf_rend[i] = R->screen.rend[j]; 755 buf_rend[i] = screen.rend[j];
707 } 756 }
708/* B2: Rotate lines */ 757 /* B2: Rotate lines */
709 for (j = row2, i = j - count; i >= row1; i--, j--) { 758 for (j = row2, i = j - count; i >= row1; i--, j--)
759 {
710 R->screen.tlen[j] = R->screen.tlen[i]; 760 screen.tlen[j] = screen.tlen[i];
711 R->screen.text[j] = R->screen.text[i]; 761 screen.text[j] = screen.text[i];
712 R->screen.rend[j] = R->screen.rend[i]; 762 screen.rend[j] = screen.rend[i];
713 } 763 }
714 j = row1, i = count; 764 j = row1, i = count;
715 count = -count; 765 count = -count;
716 } 766 }
717 767
718/* C: Resurrect lines */ 768 /* C: Resurrect lines */
719 for (; i--; j++) { 769 for (; i--; j++)
770 {
720 R->screen.tlen[j] = 0; 771 screen.tlen[j] = 0;
721 R->screen.text[j] = R->buf_text[i]; 772 screen.text[j] = buf_text[i];
722 R->screen.rend[j] = R->buf_rend[i]; 773 screen.rend[j] = buf_rend[i];
774
723 if (!spec) /* line length may not equal TermWin.ncol */ 775 if (!spec) /* line length may not equal TermWin.ncol */
724 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 776 scr_blank_screen_mem (screen.text, screen.rend,
725 (unsigned int)j, R->rstyle); 777 (unsigned int)j, rstyle);
726 } 778 }
727 779
728#ifdef RXVT_GRAPHICS 780#ifdef RXVT_GRAPHICS
729 if (rxvt_Gr_Displayed(aR)) 781 if (rxvt_Gr_Displayed (this))
730 rxvt_Gr_scroll(aR_ count); 782 rxvt_Gr_scroll(this, count);
731#endif 783#endif
784
732 return count; 785 return count;
733} 786}
734 787
735/* ------------------------------------------------------------------------- */ 788/* ------------------------------------------------------------------------- */
736/* 789/*
737 * Add text given in <str> of length <len> to screen struct 790 * Add text given in <str> of length <len> to screen struct
… …
758 nlines += (R->screen.cur.row - R->screen.bscroll); 811 nlines += (R->screen.cur.row - R->screen.bscroll);
759 if ((nlines > 0) 812 if ((nlines > 0)
760 && (R->screen.tscroll == 0) 813 && (R->screen.tscroll == 0)
761 && (R->screen.bscroll == (R->TermWin.nrow - 1))) { 814 && (R->screen.bscroll == (R->TermWin.nrow - 1))) {
762 /* _at least_ this many lines need to be scrolled */ 815 /* _at least_ this many lines need to be scrolled */
763 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, nlines, 816 R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, nlines, 0);
764 0);
765 R->screen.cur.row -= nlines; 817 R->screen.cur.row -= nlines;
766 } 818 }
767 } 819 }
768#ifdef DEBUG_STRICT 820#ifdef DEBUG_STRICT
769 assert(R->screen.cur.col < last_col); 821 assert(R->screen.cur.col < last_col);
… …
785 837
786 for (i = 0; i < len;) { 838 for (i = 0; i < len;) {
787 c = str[i++]; 839 c = str[i++];
788 switch (c) { 840 switch (c) {
789 case '\t': 841 case '\t':
790 rxvt_scr_tab(aR_ 1); 842 rxvt_scr_tab (aR_ 1);
791 continue; 843 continue;
792 case '\n': 844 case '\n':
793 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 845 if (R->screen.tlen[row] != -1) /* XXX: think about this */
794 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 846 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
795 R->screen.flags &= ~Screen_WrapNext; 847 R->screen.flags &= ~Screen_WrapNext;
796 if (R->screen.cur.row == R->screen.bscroll) 848 if (R->screen.cur.row == R->screen.bscroll)
797 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); 849 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, 1, 0);
798 else if (R->screen.cur.row < (R->TermWin.nrow - 1)) 850 else if (R->screen.cur.row < (R->TermWin.nrow - 1))
799 row = (++R->screen.cur.row) + R->TermWin.saveLines; 851 row = (++R->screen.cur.row) + R->TermWin.saveLines;
800 stp = R->screen.text[row]; /* _must_ refresh */ 852 stp = R->screen.text[row]; /* _must_ refresh */
801 srp = R->screen.rend[row]; /* _must_ refresh */ 853 srp = R->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 (R->screen.tlen[row] != -1) /* XXX: think about this */
806 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 857 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
807 R->screen.flags &= ~Screen_WrapNext; 858 R->screen.flags &= ~Screen_WrapNext;
808 R->screen.cur.col = 0; 859 R->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;
… …
821 clearsel = 1; 871 clearsel = 1;
822 } 872 }
823 if (R->screen.flags & Screen_WrapNext) { 873 if (R->screen.flags & Screen_WrapNext) {
824 R->screen.tlen[row] = -1; 874 R->screen.tlen[row] = -1;
825 if (R->screen.cur.row == R->screen.bscroll) 875 if (R->screen.cur.row == R->screen.bscroll)
826 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); 876 R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, 1, 0);
827 else if (R->screen.cur.row < (R->TermWin.nrow - 1)) 877 else if (R->screen.cur.row < (R->TermWin.nrow - 1))
828 row = (++R->screen.cur.row) + R->TermWin.saveLines; 878 row = (++R->screen.cur.row) + R->TermWin.saveLines;
829 stp = R->screen.text[row]; /* _must_ refresh */ 879 stp = R->screen.text[row]; /* _must_ refresh */
830 srp = R->screen.rend[row]; /* _must_ refresh */ 880 srp = R->screen.rend[row]; /* _must_ refresh */
831 R->screen.cur.col = 0; 881 R->screen.cur.col = 0;
… …
849 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 899 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
850 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 900 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
851 } 901 }
852 902
853 rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); 903 rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c));
904 // rely on wcwidth to tell us the character width, at least for non-ascii
905 int width = c <= 128 ? 1 : wcwidth (c);
854 906
855 stp[R->screen.cur.col] = c; 907 // width 0 characters (e.g. combining chars) are ignored. your problem, really
856 srp[R->screen.cur.col] = rend; 908 while (width-- > 0)
857
858 if (c > 255)
859 { 909 {
860 // rely on wcwidth to tell us the character width, at least for non iso-8859-1 910 stp[R->screen.cur.col] = c;
861 int width = wcwidth (c); 911 srp[R->screen.cur.col] = rend;
912
913 if (R->screen.cur.col < last_col - 1)
914 R->screen.cur.col++;
862 915 else
863 if (width > 1)
864 { 916 {
865 while (--width > 0 && R->screen.cur.col < last_col - 1) 917 R->screen.tlen[row] = last_col;
918 if (R->screen.flags & Screen_Autowrap)
919 R->screen.flags |= Screen_WrapNext;
866 { 920 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 } 921 }
922
923 c = NOCHAR;
875 } 924 }
876
877 if (R->screen.cur.col < last_col - 1)
878 R->screen.cur.col++;
879 else {
880 R->screen.tlen[row] = last_col;
881 if (R->screen.flags & Screen_Autowrap)
882 R->screen.flags |= Screen_WrapNext;
883 }
884 } 925 }
885 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 926 if (R->screen.tlen[row] != -1) /* XXX: think about this */
886 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 927 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
887 928
888/* 929/*
… …
907 */ 948 */
908/* EXTPROTO */ 949/* EXTPROTO */
909void 950void
910rxvt_scr_backspace(pR) 951rxvt_scr_backspace(pR)
911{ 952{
912 RESET_CHSTAT(R);
913 R->want_refresh = 1; 953 R->want_refresh = 1;
914 if (R->screen.cur.col == 0) { 954 if (R->screen.cur.col == 0) {
915 if (R->screen.cur.row > 0) { 955 if (R->screen.cur.row > 0) {
916#ifdef TERMCAP_HAS_BW 956#ifdef TERMCAP_HAS_BW
917 R->screen.cur.col = R->TermWin.ncol - 1; 957 R->screen.cur.col = R->TermWin.ncol - 1;
… …
936{ 976{
937 int i, x; 977 int i, x;
938 978
939 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); 979 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count));
940 R->want_refresh = 1; 980 R->want_refresh = 1;
941 RESET_CHSTAT(R);
942 i = x = R->screen.cur.col; 981 i = x = R->screen.cur.col;
943 if (count == 0) 982 if (count == 0)
944 return; 983 return;
945 else if (count > 0) { 984 else if (count > 0) {
946 for (; ++i < R->TermWin.ncol; ) 985 for (; ++i < R->TermWin.ncol; )
… …
1023void 1062void
1024rxvt_scr_gotorc(pR_ int row, int col, int relative) 1063rxvt_scr_gotorc(pR_ int row, int col, int relative)
1025{ 1064{
1026 R->want_refresh = 1; 1065 R->want_refresh = 1;
1027 ZERO_SCROLLBACK(R); 1066 ZERO_SCROLLBACK(R);
1028 RESET_CHSTAT(R);
1029#ifdef RXVT_GRAPHICS 1067#ifdef RXVT_GRAPHICS
1030 if (rxvt_Gr_Displayed(aR)) 1068 if (rxvt_Gr_Displayed(aR))
1031 rxvt_Gr_scroll(aR_ 0); 1069 rxvt_Gr_scroll(aR_ 0);
1032#endif 1070#endif
1033 1071
… …
1077 R->want_refresh = 1; 1115 R->want_refresh = 1;
1078 dirn = ((direction == UP) ? 1 : -1); 1116 dirn = ((direction == UP) ? 1 : -1);
1079 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); 1117 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn));
1080 1118
1081 ZERO_SCROLLBACK(R); 1119 ZERO_SCROLLBACK(R);
1082 RESET_CHSTAT(R);
1083 1120
1084#ifdef RXVT_GRAPHICS 1121#ifdef RXVT_GRAPHICS
1085 if (rxvt_Gr_Displayed(aR)) 1122 if (rxvt_Gr_Displayed(aR))
1086 rxvt_Gr_scroll(aR_ 0); 1123 rxvt_Gr_scroll(aR_ 0);
1087#endif 1124#endif
1088 1125
1089 R->screen.flags &= ~Screen_WrapNext; 1126 R->screen.flags &= ~Screen_WrapNext;
1090 if ((R->screen.cur.row == R->screen.bscroll && direction == UP) 1127 if ((R->screen.cur.row == R->screen.bscroll && direction == UP)
1091 || (R->screen.cur.row == R->screen.tscroll && direction == DN)) 1128 || (R->screen.cur.row == R->screen.tscroll && direction == DN))
1092 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, dirn, 0); 1129 R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, dirn, 0);
1093 else 1130 else
1094 R->screen.cur.row += dirn; 1131 R->screen.cur.row += dirn;
1095 MAX_IT(R->screen.cur.row, 0); 1132 MAX_IT(R->screen.cur.row, 0);
1096 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1133 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1);
1097 rxvt_selection_check(aR_ 0); 1134 rxvt_selection_check(aR_ 0);
… …
1106 */ 1143 */
1107/* EXTPROTO */ 1144/* EXTPROTO */
1108void 1145void
1109rxvt_scr_erase_line(pR_ int mode) 1146rxvt_scr_erase_line(pR_ int mode)
1110{ 1147{
1111 unsigned int row, col, num; 1148 unsigned int row, col, num;
1112 1149
1113 R->want_refresh = 1; 1150 R->want_refresh = 1;
1114 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row)); 1151 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row));
1115 ZERO_SCROLLBACK(R); 1152 ZERO_SCROLLBACK (R);
1116 RESET_CHSTAT(R);
1117 1153
1118#ifdef RXVT_GRAPHICS 1154#ifdef RXVT_GRAPHICS
1119 if (rxvt_Gr_Displayed(aR)) 1155 if (rxvt_Gr_Displayed (aR))
1120 rxvt_Gr_scroll(aR_ 0); 1156 rxvt_Gr_scroll (aR_ 0);
1121#endif 1157#endif
1122 1158
1123 rxvt_selection_check(aR_ 1); 1159 rxvt_selection_check (aR_ 1);
1124 1160
1125 R->screen.flags &= ~Screen_WrapNext; 1161 R->screen.flags &= ~Screen_WrapNext;
1126 1162
1127 row = R->TermWin.saveLines + R->screen.cur.row; 1163 row = R->TermWin.saveLines + R->screen.cur.row;
1128 switch (mode) { 1164 switch (mode)
1165 {
1129 case 0: /* erase to end of line */ 1166 case 0: /* erase to end of line */
1130 col = R->screen.cur.col; 1167 col = R->screen.cur.col;
1131 num = R->TermWin.ncol - col; 1168 num = R->TermWin.ncol - col;
1132 MIN_IT(R->screen.tlen[row], (int16_t)col); 1169 MIN_IT(R->screen.tlen[row], (int16_t)col);
1133 if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) 1170 if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)
1134 || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) 1171 || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur))
1135 CLEAR_SELECTION(R); 1172 CLEAR_SELECTION(R);
1136 break; 1173 break;
1137 case 1: /* erase to beginning of line */ 1174 case 1: /* erase to beginning of line */
1138 col = 0; 1175 col = 0;
1139 num = R->screen.cur.col + 1; 1176 num = R->screen.cur.col + 1;
1140 if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) 1177 if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur)
1141 || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) 1178 || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur))
1142 CLEAR_SELECTION(R); 1179 CLEAR_SELECTION(R);
1143 break; 1180 break;
1144 case 2: /* erase whole line */ 1181 case 2: /* erase whole line */
1145 col = 0; 1182 col = 0;
1146 num = R->TermWin.ncol; 1183 num = R->TermWin.ncol;
1147 R->screen.tlen[row] = 0; 1184 R->screen.tlen[row] = 0;
1148 if (R->selection.beg.row <= R->screen.cur.row 1185 if (R->selection.beg.row <= R->screen.cur.row
1149 && R->selection.end.row >= R->screen.cur.row) 1186 && R->selection.end.row >= R->screen.cur.row)
1150 CLEAR_SELECTION(R); 1187 CLEAR_SELECTION(R);
1151 break; 1188 break;
1152 default: 1189 default:
1153 return; 1190 return;
1154 } 1191 }
1192
1155 if (R->screen.text[row]) 1193 if (R->screen.text[row])
1156 rxvt_blank_line(aR_ 1194 R->scr_blank_line (&(R->screen.text[row][col]),
1157 &(R->screen.text[row][col]),
1158 &(R->screen.rend[row][col]), num, R->rstyle); 1195 &(R->screen.rend[row][col]), num, R->rstyle);
1159 else 1196 else
1160 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, row, 1197 R->scr_blank_screen_mem (R->screen.text, R->screen.rend, row, R->rstyle);
1161 R->rstyle);
1162} 1198}
1163 1199
1164/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1165/* 1201/*
1166 * Erase part of whole of the screen 1202 * Erase part of whole of the screen
1167 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1203 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1168 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1204 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1169 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1205 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1170 */ 1206 */
1171/* EXTPROTO */
1172void 1207void
1173rxvt_scr_erase_screen(pR_ int mode) 1208rxvt_term::scr_erase_screen (int mode)
1174{ 1209{
1175 int num; 1210 int num;
1176 int32_t row, row_offset; 1211 int32_t row, row_offset;
1177 rend_t ren; 1212 rend_t ren;
1178 XGCValues gcvalue; 1213 XGCValues gcvalue;
1179 1214
1180 R->want_refresh = 1; 1215 want_refresh = 1;
1181 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, R->screen.cur.row)); 1216 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row));
1182 ZERO_SCROLLBACK(R); 1217 ZERO_SCROLLBACK(this);
1183 RESET_CHSTAT(R);
1184 row_offset = (int32_t)R->TermWin.saveLines; 1218 row_offset = (int32_t)TermWin.saveLines;
1185 1219
1186 switch (mode) { 1220 switch (mode) {
1187 case 0: /* erase to end of screen */ 1221 case 0: /* erase to end of screen */
1188 rxvt_selection_check(aR_ 1); 1222 rxvt_selection_check(this,1);
1189 rxvt_scr_erase_line(aR_ 0); 1223 rxvt_scr_erase_line(this,0);
1190 row = R->screen.cur.row + 1; /* possible OOB */ 1224 row = screen.cur.row + 1; /* possible OOB */
1191 num = R->TermWin.nrow - row; 1225 num = TermWin.nrow - row;
1192 break; 1226 break;
1193 case 1: /* erase to beginning of screen */ 1227 case 1: /* erase to beginning of screen */
1194 rxvt_selection_check(aR_ 3); 1228 rxvt_selection_check(this,3);
1195 rxvt_scr_erase_line(aR_ 1); 1229 rxvt_scr_erase_line(this,1);
1196 row = 0; 1230 row = 0;
1197 num = R->screen.cur.row; 1231 num = screen.cur.row;
1198 break; 1232 break;
1199 case 2: /* erase whole screen */ 1233 case 2: /* erase whole screen */
1200 rxvt_selection_check(aR_ 3); 1234 rxvt_selection_check (this, 3);
1201#ifdef RXVT_GRAPHICS 1235#ifdef RXVT_GRAPHICS
1202 rxvt_Gr_ClearScreen(aR); 1236 rxvt_Gr_ClearScreen (this);
1203#endif 1237#endif
1204 row = 0; 1238 row = 0;
1205 num = R->TermWin.nrow; 1239 num = TermWin.nrow;
1206 break; 1240 break;
1207 default: 1241 default:
1208 return; 1242 return;
1209 } 1243 }
1210 R->refresh_type |= REFRESH_BOUNDS; 1244 refresh_type |= REFRESH_BOUNDS;
1211 if (R->selection.op && R->current_screen == R->selection.screen 1245 if (selection.op && current_screen == selection.screen
1212 && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) 1246 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1213 || (R->selection.end.row >= row 1247 || (selection.end.row >= row
1214 && R->selection.end.row <= row + num))) 1248 && selection.end.row <= row + num)))
1215 CLEAR_SELECTION(R); 1249 CLEAR_SELECTION (this);
1216 if (row >= R->TermWin.nrow) /* Out Of Bounds */ 1250 if (row >= TermWin.nrow) /* Out Of Bounds */
1217 return; 1251 return;
1218 MIN_IT(num, (R->TermWin.nrow - row)); 1252 MIN_IT(num, (TermWin.nrow - row));
1219 if (R->rstyle & (RS_RVid | RS_Uline)) 1253 if (rstyle & (RS_RVid | RS_Uline))
1220 ren = (rend_t) ~RS_None; 1254 ren = (rend_t) ~RS_None;
1221 else if (GET_BASEBG(R->rstyle) == Color_bg) { 1255 else if (GET_BASEBG(rstyle) == Color_bg) {
1222 ren = DEFAULT_RSTYLE; 1256 ren = DEFAULT_RSTYLE;
1223 CLEAR_ROWS(row, num); 1257 CLEAR_ROWS(row, num);
1224 } else { 1258 } else {
1225 ren = (R->rstyle & (RS_fgMask | RS_bgMask)); 1259 ren = (rstyle & (RS_fgMask | RS_bgMask));
1226 gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->rstyle)]; 1260 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)];
1227 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1261 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue);
1228 ERASE_ROWS(row, num); 1262 ERASE_ROWS(row, num);
1229 gcvalue.foreground = R->PixColors[Color_fg]; 1263 gcvalue.foreground = PixColors[Color_fg];
1230 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1264 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue);
1231 } 1265 }
1232 for (; num--; row++) { 1266 for (; num--; row++) {
1233 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 1267 scr_blank_screen_mem (screen.text, screen.rend,
1234 (unsigned int)(row + row_offset), R->rstyle); 1268 (unsigned int)(row + row_offset), rstyle);
1235 R->screen.tlen[row + row_offset] = 0; 1269 screen.tlen[row + row_offset] = 0;
1236 rxvt_blank_line(aR_ 1270 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); 1271 (unsigned int)TermWin.ncol, ren);
1239 } 1272 }
1240} 1273}
1241 1274
1242/* ------------------------------------------------------------------------- */ 1275/* ------------------------------------------------------------------------- */
1243/* 1276/*
… …
1252 rend_t *r1, fs; 1285 rend_t *r1, fs;
1253 1286
1254 R->want_refresh = 1; 1287 R->want_refresh = 1;
1255 R->num_scr_allow = 0; 1288 R->num_scr_allow = 0;
1256 ZERO_SCROLLBACK(R); 1289 ZERO_SCROLLBACK(R);
1257 RESET_CHSTAT(R);
1258 rxvt_selection_check(aR_ 3); 1290 rxvt_selection_check(aR_ 3);
1259 1291
1260 fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); 1292 fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E'));
1261 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1293 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) {
1262 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1294 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */
… …
1275rxvt_scr_insdel_lines(pR_ int count, int insdel) 1307rxvt_scr_insdel_lines(pR_ int count, int insdel)
1276{ 1308{
1277 int end; 1309 int end;
1278 1310
1279 ZERO_SCROLLBACK(R); 1311 ZERO_SCROLLBACK(R);
1280 RESET_CHSTAT(R);
1281 1312
1282#ifdef RXVT_GRAPHICS 1313#ifdef RXVT_GRAPHICS
1283 if (rxvt_Gr_Displayed(aR)) 1314 if (rxvt_Gr_Displayed(aR))
1284 rxvt_Gr_scroll(aR_ 0); 1315 rxvt_Gr_scroll(aR_ 0);
1285#endif 1316#endif
… …
1296 else if (insdel == INSERT) 1327 else if (insdel == INSERT)
1297 count = end; 1328 count = end;
1298 } 1329 }
1299 R->screen.flags &= ~Screen_WrapNext; 1330 R->screen.flags &= ~Screen_WrapNext;
1300 1331
1301 rxvt_scroll_text(aR_ R->screen.cur.row, R->screen.bscroll, insdel * count, 1332 R->scr_scroll_text(R->screen.cur.row, R->screen.bscroll, insdel * count, 0);
1302 0);
1303} 1333}
1304 1334
1305/* ------------------------------------------------------------------------- */ 1335/* ------------------------------------------------------------------------- */
1306/* 1336/*
1307 * Insert/Delete <count> characters from the current position 1337 * Insert/Delete <count> characters from the current position
… …
1316 rend_t *srp; 1346 rend_t *srp;
1317 int16_t *slp; 1347 int16_t *slp;
1318 1348
1319 R->want_refresh = 1; 1349 R->want_refresh = 1;
1320 ZERO_SCROLLBACK(R); 1350 ZERO_SCROLLBACK(R);
1321#if 0
1322 RESET_CHSTAT(R);
1323#endif
1324 1351
1325#ifdef RXVT_GRAPHICS 1352#ifdef RXVT_GRAPHICS
1326 if (rxvt_Gr_Displayed(aR)) 1353 if (rxvt_Gr_Displayed(aR))
1327 rxvt_Gr_scroll(aR_ 0); 1354 rxvt_Gr_scroll(aR_ 0);
1328#endif 1355#endif
… …
1359 R->selection.beg.col += count; 1386 R->selection.beg.col += count;
1360 R->selection.mark.col += count; /* XXX: yes? */ 1387 R->selection.mark.col += count; /* XXX: yes? */
1361 R->selection.end.col += count; 1388 R->selection.end.col += count;
1362 } 1389 }
1363 } 1390 }
1364 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1391 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]),
1365 (unsigned int)count, R->rstyle); 1392 (unsigned int)count, R->rstyle);
1366 break; 1393 break;
1367 case ERASE: 1394 case ERASE:
1368 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1395 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */
1369 rxvt_selection_check(aR_ 1); 1396 rxvt_selection_check(aR_ 1);
1370 R->screen.cur.col -= count; 1397 R->screen.cur.col -= count;
1371 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1398 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]),
1372 (unsigned int)count, R->rstyle); 1399 (unsigned int)count, R->rstyle);
1373 break; 1400 break;
1374 case DELETE: 1401 case DELETE:
1375 tr = srp[R->TermWin.ncol - 1] 1402 tr = srp[R->TermWin.ncol - 1]
1376 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1403 & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1377 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1404 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) {
1378 stp[col] = stp[col + count]; 1405 stp[col] = stp[col + count];
1379 srp[col] = srp[col + count]; 1406 srp[col] = srp[col + count];
1380 } 1407 }
1381 rxvt_blank_line(aR_ 1408 R->scr_blank_line (&(stp[R->TermWin.ncol - count]),
1382 &(stp[R->TermWin.ncol - count]),
1383 &(srp[R->TermWin.ncol - count]), 1409 &(srp[R->TermWin.ncol - count]),
1384 (unsigned int)count, tr); 1410 (unsigned int)count, tr);
1385 if (*slp == -1) /* break line continuation */ 1411 if (*slp == -1) /* break line continuation */
1386 *slp = R->TermWin.ncol; 1412 *slp = R->TermWin.ncol;
1387 *slp -= count; 1413 *slp -= count;
1388 MAX_IT(*slp, 0); 1414 MAX_IT(*slp, 0);
1389 if (R->selection.op && R->current_screen == R->selection.screen 1415 if (R->selection.op && R->current_screen == R->selection.screen
… …
1534 1560
1535 gcvalue.foreground = R->PixColors[Color_fg]; 1561 gcvalue.foreground = R->PixColors[Color_fg];
1536 gcvalue.background = R->PixColors[Color_bg]; 1562 gcvalue.background = R->PixColors[Color_bg];
1537 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1563 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground,
1538 &gcvalue); 1564 &gcvalue);
1539 rxvt_scr_clear(aR); 1565 R->scr_clear ();
1540 rxvt_scr_touch(aR_ True); 1566 R->scr_touch (true);
1541 } 1567 }
1542} 1568}
1543 1569
1544/* ------------------------------------------------------------------------- */ 1570/* ------------------------------------------------------------------------- */
1545/* 1571/*
… …
1548 */ 1574 */
1549/* EXTPROTO */ 1575/* EXTPROTO */
1550void 1576void
1551rxvt_scr_report_position(pR) 1577rxvt_scr_report_position(pR)
1552{ 1578{
1553 rxvt_tt_printf(aR_ "\033[%d;%dR", R->screen.cur.row + 1, 1579 R->tt_printf("\033[%d;%dR", R->screen.cur.row + 1, R->screen.cur.col + 1);
1554 R->screen.cur.col + 1);
1555} 1580}
1556 1581
1557/* ------------------------------------------------------------------------- * 1582/* ------------------------------------------------------------------------- *
1558 * FONTS * 1583 * FONTS *
1559 * ------------------------------------------------------------------------- */ 1584 * ------------------------------------------------------------------------- */
… …
1649 PART_BEG = 0, 1674 PART_BEG = 0,
1650 PART_END, 1675 PART_END,
1651 RC_COUNT 1676 RC_COUNT
1652}; 1677};
1653 1678
1654/* EXTPROTO */
1655void 1679void
1656rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) 1680rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1657{ 1681{
1658 int i; 1682 int i;
1659 row_col_t rc[RC_COUNT]; 1683 row_col_t rc[RC_COUNT];
1660 1684
1661 if (R->drawn_text == NULL) /* sanity check */ 1685 if (drawn_text == NULL) /* sanity check */
1662 return; 1686 return;
1663 1687
1664#ifdef DEBUG_STRICT 1688#ifdef DEBUG_STRICT
1665 x = max(x, (int)R->TermWin.int_bwidth); 1689 x = max(x, (int)TermWin.int_bwidth);
1666 x = min(x, (int)R->TermWin.width); 1690 x = min(x, (int)TermWin.width);
1667 y = max(y, (int)R->TermWin.int_bwidth); 1691 y = max(y, (int)TermWin.int_bwidth);
1668 y = min(y, (int)R->TermWin.height); 1692 y = min(y, (int)TermWin.height);
1669#endif 1693#endif
1670 1694
1671/* round down */ 1695/* round down */
1672 rc[PART_BEG].col = Pixel2Col(x); 1696 rc[PART_BEG].col = Pixel2Col(x);
1673 rc[PART_BEG].row = Pixel2Row(y); 1697 rc[PART_BEG].row = Pixel2Row(y);
1674/* round up */ 1698/* round up */
1675 rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); 1699 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1);
1676 rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); 1700 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1);
1677 1701
1678/* sanity checks */ 1702/* sanity checks */
1679 for (i = PART_BEG; i < RC_COUNT; i++) { 1703 for (i = PART_BEG; i < RC_COUNT; i++)
1704 {
1680 MIN_IT(rc[i].col, R->TermWin.ncol - 1); 1705 MIN_IT(rc[i].col, TermWin.ncol - 1);
1681 MIN_IT(rc[i].row, R->TermWin.nrow - 1); 1706 MIN_IT(rc[i].row, TermWin.nrow - 1);
1682 } 1707 }
1683 1708
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)); 1709 D_SCREEN((stderr, "rxvt_scr_expose(x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)-(c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1685 1710
1686 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1711 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1687 fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, 1712 fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0,
1688 (rc[PART_END].col - rc[PART_BEG].col + 1)); 1713 (rc[PART_END].col - rc[PART_BEG].col + 1));
1689 1714
1690 if (refresh) 1715 if (refresh)
1691 rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); 1716 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1692} 1717}
1693 1718
1694/* ------------------------------------------------------------------------- */ 1719/* ------------------------------------------------------------------------- */
1695/* 1720/*
1696 * Refresh the entire screen 1721 * Refresh the entire screen
1697 */ 1722 */
1698/* EXTPROTO */
1699void 1723void
1700rxvt_scr_touch(pR_ Bool refresh) 1724rxvt_term::scr_touch (bool refresh)
1701{ 1725{
1702 rxvt_scr_expose(aR_ 0, 0, R->TermWin.width, R->TermWin.height, refresh); 1726 scr_expose (0, 0, TermWin.width, TermWin.height, refresh);
1703} 1727}
1704 1728
1705/* ------------------------------------------------------------------------- */ 1729/* ------------------------------------------------------------------------- */
1706/* 1730/*
1707 * Move the display so that the line represented by scrollbar value Y is at 1731 * Move the display so that the line represented by scrollbar value Y is at
… …
1844#define FONT_LBEAR(X, Y) \ 1868#define FONT_LBEAR(X, Y) \
1845 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing 1869 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing
1846#define IS_FONT_CHAR(X, Y) \ 1870#define IS_FONT_CHAR(X, Y) \
1847 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1871 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1848 1872
1849/* EXTPROTO */
1850void 1873void
1851rxvt_scr_refresh(pR_ unsigned char refresh_type) 1874rxvt_term::scr_refresh (unsigned char refresh_type)
1852{ 1875{
1853 unsigned char clearfirst, /* first character writes before cell */ 1876 unsigned char clearfirst, /* first character writes before cell */
1854 clearlast, /* last character writes beyond cell */ 1877 clearlast, /* last character writes beyond cell */
1855 must_clear, /* use draw_string not draw_image_string */ 1878 must_clear, /* use draw_string not draw_image_string */
1856#ifndef NO_BOLDFONT 1879#ifndef NO_BOLDFONT
… …
1869 rend_t cc1; /* store colours at cursor position(s) */ 1892 rend_t cc1; /* store colours at cursor position(s) */
1870 rend_t cc2; /* store colours at cursor position(s) */ 1893 rend_t cc2; /* store colours at cursor position(s) */
1871#endif 1894#endif
1872 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1895 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1873 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1896 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1874 char *buffer; /* local copy of R->buffer */
1875 1897
1876 if (refresh_type == NO_REFRESH || !R->TermWin.mapped) 1898 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1877 return; 1899 return;
1878 1900
1879 /* 1901 /*
1880 * A: set up vars 1902 * A: set up vars
1881 */ 1903 */
1882 clearfirst = clearlast = must_clear = wbyte = 0; 1904 clearfirst = clearlast = must_clear = wbyte = 0;
1883#ifndef NO_BOLDFONT 1905#ifndef NO_BOLDFONT
1884 bfont = 0; 1906 bfont = 0;
1885#endif 1907#endif
1886 1908
1887 if (R->currmaxcol < R->TermWin.ncol) 1909 if (currmaxcol < TermWin.ncol)
1888 { 1910 {
1889 R->currmaxcol = R->TermWin.ncol; 1911 currmaxcol = TermWin.ncol;
1890 R->buffer = (char *)rxvt_realloc (R->buffer, 1912 buffer = (char *)rxvt_realloc (buffer,
1891 sizeof(char) * (R->currmaxcol + 1) * MB_CUR_MAX); 1913 sizeof(char) * (currmaxcol + 1) * MB_CUR_MAX);
1892 } 1914 }
1893 1915
1894 buffer = R->buffer;
1895 R->refresh_count = 0; 1916 refresh_count = 0;
1896 1917
1897 row_offset = R->TermWin.saveLines - R->TermWin.view_start; 1918 row_offset = TermWin.saveLines - TermWin.view_start;
1898 1919
1899 if ((refresh_type & REFRESH_BOUNDS)) 1920 if ((refresh_type & REFRESH_BOUNDS))
1900 { 1921 {
1901 clearfirst = clearlast = 1; 1922 clearfirst = clearlast = 1;
1902 R->refresh_type &= ~REFRESH_BOUNDS; 1923 refresh_type &= ~REFRESH_BOUNDS;
1903 } 1924 }
1904 1925
1905#if defined(XPM_BACKGROUND) 1926#if defined(XPM_BACKGROUND)
1906 must_clear |= (R->bgPixmap.pixmap != None); 1927 must_clear |= (bgPixmap.pixmap != None);
1907#endif 1928#endif
1908#if defined(TRANSPARENT) 1929#if defined(TRANSPARENT)
1909 must_clear |= ((R->Options & Opt_transparent) && R->am_transparent); 1930 must_clear |= ((Options & Opt_transparent) && am_transparent);
1910#endif 1931#endif
1911 ocrow = R->oldcursor.row; /* is there an old outline cursor on screen? */ 1932 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1912 1933
1913/* 1934 /*
1914 * B: reverse any characters which are selected 1935 * B: reverse any characters which are selected
1915 */ 1936 */
1916 rxvt_scr_reverse_selection(aR); 1937 rxvt_scr_reverse_selection (this);
1917 1938
1918/* 1939 /*
1919 * C: set the cursor character(s) 1940 * C: set the cursor character(s)
1920 */ 1941 */
1921 { 1942 {
1922 unsigned char setoldcursor; 1943 unsigned char setoldcursor;
1923 rend_t ccol1, /* Cursor colour */ 1944 rend_t ccol1, /* Cursor colour */
1924 ccol2; /* Cursor colour2 */ 1945 ccol2; /* Cursor colour2 */
1925 1946
1926 showcursor = (R->screen.flags & Screen_VisibleCursor); 1947 showcursor = (screen.flags & Screen_VisibleCursor);
1927 cursorwidth = 0; 1948 cursorwidth = 0;
1928#ifdef CURSOR_BLINK 1949#ifdef CURSOR_BLINK
1929 if (R->hidden_cursor) 1950 if (hidden_cursor)
1930 showcursor = 0; 1951 showcursor = 0;
1931#endif 1952#endif
1932 1953
1933 cursorwidth = 0; 1954 cursorwidth = 0;
1934 1955
1935 if (showcursor) 1956 if (showcursor)
1936 { 1957 {
1937 cursorwidth++; 1958 cursorwidth++;
1938 1959
1939 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 1960 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
1940 [R->screen.cur.col]); 1961 [screen.cur.col]);
1941 1962
1942 if (showcursor && R->TermWin.focus) 1963 if (showcursor && TermWin.focus)
1943 { 1964 {
1944 *srp ^= RS_RVid; 1965 *srp ^= RS_RVid;
1945#ifndef NO_CURSORCOLOR 1966#ifndef NO_CURSORCOLOR
1946 cc1 = *srp & (RS_fgMask | RS_bgMask); 1967 cc1 = *srp & (RS_fgMask | RS_bgMask);
1947 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) 1968 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor))
1948 ccol1 = Color_cursor; 1969 ccol1 = Color_cursor;
1949 else 1970 else
1950#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1971#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1951 ccol1 = GET_FGCOLOR(R->rstyle); 1972 ccol1 = GET_FGCOLOR(rstyle);
1952#else 1973#else
1953 ccol1 = Color_fg; 1974 ccol1 = Color_fg;
1954#endif 1975#endif
1955 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor2)) 1976 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor2))
1956 ccol2 = Color_cursor2; 1977 ccol2 = Color_cursor2;
1957 else 1978 else
1958#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1979#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1959 ccol2 = GET_BGCOLOR(R->rstyle); 1980 ccol2 = GET_BGCOLOR(rstyle);
1960#else 1981#else
1961 ccol2 = Color_bg; 1982 ccol2 = Color_bg;
1962#endif 1983#endif
1963 *srp = SET_FGCOLOR(*srp, ccol1); 1984 *srp = SET_FGCOLOR(*srp, ccol1);
1964 *srp = SET_BGCOLOR(*srp, ccol2); 1985 *srp = SET_BGCOLOR(*srp, ccol2);
… …
1970 } 1991 }
1971 1992
1972 /* make sure no outline cursor is left around */ 1993 /* make sure no outline cursor is left around */
1973 setoldcursor = 0; 1994 setoldcursor = 0;
1974 if (ocrow != -1) { 1995 if (ocrow != -1) {
1975 if (R->screen.cur.row + R->TermWin.view_start != ocrow 1996 if (screen.cur.row + TermWin.view_start != ocrow
1976 || R->screen.cur.col != R->oldcursor.col) { 1997 || screen.cur.col != oldcursor.col) {
1977 if (ocrow < R->TermWin.nrow 1998 if (ocrow < TermWin.nrow
1978 && R->oldcursor.col < R->TermWin.ncol) { 1999 && oldcursor.col < TermWin.ncol) {
1979 R->drawn_rend[ocrow][R->oldcursor.col] ^= (RS_RVid | RS_Uline); 2000 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1980 } 2001 }
1981 if (R->TermWin.focus || !showcursor) 2002 if (TermWin.focus || !showcursor)
1982 R->oldcursor.row = -1; 2003 oldcursor.row = -1;
1983 else 2004 else
1984 setoldcursor = 1; 2005 setoldcursor = 1;
1985 } 2006 }
1986 } else if (!R->TermWin.focus) 2007 } else if (!TermWin.focus)
1987 setoldcursor = 1; 2008 setoldcursor = 1;
1988 if (setoldcursor) { 2009 if (setoldcursor) {
1989 if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow) 2010 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1990 R->oldcursor.row = -1; 2011 oldcursor.row = -1;
1991 else { 2012 else {
1992 R->oldcursor.row = R->screen.cur.row + R->TermWin.view_start; 2013 oldcursor.row = screen.cur.row + TermWin.view_start;
1993 R->oldcursor.col = R->screen.cur.col; 2014 oldcursor.col = screen.cur.col;
1994 } 2015 }
1995 } 2016 }
1996 } 2017 }
1997 2018
1998#ifndef NO_SLOW_LINK_SUPPORT 2019#ifndef NO_SLOW_LINK_SUPPORT
1999/* 2020 /*
2000 * D: CopyArea pass - very useful for slower links 2021 * D: CopyArea pass - very useful for slower links
2001 * This has been deliberately kept simple. 2022 * This has been deliberately kept simple.
2002 */ 2023 */
2003 i = R->num_scr; 2024 i = num_scr;
2004 if (refresh_type == FAST_REFRESH && R->num_scr_allow && i 2025 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2005 && abs(i) < R->TermWin.nrow && !must_clear) 2026 && abs(i) < TermWin.nrow && !must_clear)
2006 { 2027 {
2007 int16_t nits; 2028 int16_t nits;
2008 int j; 2029 int j;
2009 rend_t *drp2; 2030 rend_t *drp2;
2010 text_t *dtp2; 2031 text_t *dtp2;
2011 int len, wlen; 2032 int len, wlen;
2012 2033
2013 j = R->TermWin.nrow; 2034 j = TermWin.nrow;
2014 wlen = len = -1; 2035 wlen = len = -1;
2015 row = i > 0 ? 0 : j - 1; 2036 row = i > 0 ? 0 : j - 1;
2016 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2037 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2017 { 2038 {
2018 if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) 2039 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2019 { 2040 {
2020 stp = R->screen.text[row + row_offset]; 2041 stp = screen.text[row + row_offset];
2021 srp = R->screen.rend[row + row_offset]; 2042 srp = screen.rend[row + row_offset];
2022 dtp = R->drawn_text[row]; 2043 dtp = drawn_text[row];
2023 dtp2 = R->drawn_text[row + i]; 2044 dtp2 = drawn_text[row + i];
2024 drp = R->drawn_rend[row]; 2045 drp = drawn_rend[row];
2025 drp2 = R->drawn_rend[row + i]; 2046 drp2 = drawn_rend[row + i];
2026 2047
2027 for (nits = 0, col = R->TermWin.ncol; col--; ) 2048 for (nits = 0, col = TermWin.ncol; col--; )
2028 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2049 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2029 nits--; 2050 nits--;
2030 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2051 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2031 nits++; 2052 nits++;
2032 2053
2033 if (nits > 8) /* XXX: arbitrary choice */ 2054 if (nits > 8) /* XXX: arbitrary choice */
2034 { 2055 {
2035 for (col = R->TermWin.ncol; col--; ) 2056 for (col = TermWin.ncol; col--; )
2036 { 2057 {
2037 *dtp++ = *dtp2++; 2058 *dtp++ = *dtp2++;
2038 *drp++ = *drp2++; 2059 *drp++ = *drp2++;
2039 } 2060 }
2040 2061
… …
2049 if (len != -1) 2070 if (len != -1)
2050 { 2071 {
2051 /* also comes here at end if needed because of >= above */ 2072 /* also comes here at end if needed because of >= above */
2052 if (wlen < len) 2073 if (wlen < len)
2053 SWAP_IT(wlen, len, int); 2074 SWAP_IT(wlen, len, int);
2075
2054 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); 2076 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, 2077 XCopyArea (Xdisplay, TermWin.vt, TermWin.vt,
2056 R->TermWin.gc, 0, Row2Pixel(len + i), 2078 TermWin.gc, 0, Row2Pixel (len + i),
2057 (unsigned int)TermWin_TotalWidth(), 2079 (unsigned int)TermWin_TotalWidth (),
2058 (unsigned int)Height2Pixel(wlen - len + 1), 2080 (unsigned int)Height2Pixel (wlen - len + 1),
2059 0, Row2Pixel(len)); 2081 0, Row2Pixel (len));
2060 len = -1; 2082 len = -1;
2061 } 2083 }
2062 } 2084 }
2063 } 2085 }
2064#endif 2086#endif
2065 2087
2066/* 2088 /*
2067 * E: main pass across every character 2089 * E: main pass across every character
2068 */ 2090 */
2069 for (row = 0; row < R->TermWin.nrow; row++) 2091 for (row = 0; row < TermWin.nrow; row++)
2070 { 2092 {
2071 stp = R->screen.text[row + row_offset]; 2093 stp = screen.text[row + row_offset];
2072 srp = R->screen.rend[row + row_offset]; 2094 srp = screen.rend[row + row_offset];
2073 dtp = R->drawn_text[row]; 2095 dtp = drawn_text[row];
2074 drp = R->drawn_rend[row]; 2096 drp = drawn_rend[row];
2075 2097
2076/* 2098 /*
2077 * E2: OK, now the real pass 2099 * E2: OK, now the real pass
2078 */ 2100 */
2079 int ypixel = (int)Row2Pixel(row); 2101 int ypixel = (int)Row2Pixel(row);
2080 2102
2081 for (col = 0; col < R->TermWin.ncol; col++) 2103 for (col = 0; col < TermWin.ncol; col++)
2082 { 2104 {
2083 /* compare new text with old - if exactly the same then continue */ 2105 /* compare new text with old - if exactly the same then continue */
2084 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2106 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2085 2107
2086 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2108 if (stp[col] == dtp[col] /* Must match characters to skip. */
… …
2102 2124
2103 int xpixel = Col2Pixel(col); 2125 int xpixel = Col2Pixel(col);
2104 2126
2105 // this loop looks very messy, it can probably be optimized 2127 // this loop looks very messy, it can probably be optimized
2106 // and cleaned a bit by you? 2128 // and cleaned a bit by you?
2107 for (i = 0; ++col < R->TermWin.ncol; ) 2129 for (i = 0; ++col < TermWin.ncol; )
2108 { 2130 {
2109 if (stp[col] == NOCHAR) 2131 if (stp[col] == NOCHAR)
2110 { 2132 {
2111 dtp[col] = stp[col]; 2133 dtp[col] = stp[col];
2112 drp[col] = rend; 2134 drp[col] = rend;
… …
2138 } 2160 }
2139 2161
2140 col--; /* went one too far. move back */ 2162 col--; /* went one too far. move back */
2141 count -= i; /* dump any matching trailing chars */ 2163 count -= i; /* dump any matching trailing chars */
2142 2164
2143/* 2165 /*
2144 * Determine the attributes for the string 2166 * Determine the attributes for the string
2145 */ 2167 */
2146 int fid = GET_FONT(rend); 2168 int fid = GET_FONT(rend);
2147 fore = GET_FGCOLOR(rend); 2169 fore = GET_FGCOLOR(rend);
2148 back = GET_BGCOLOR(rend); 2170 back = GET_BGCOLOR(rend);
2149 rend = GET_ATTR(rend); 2171 rend = GET_ATTR(rend);
2150 2172
2151 rvid = (rend & RS_RVid) ? 1 : 0; 2173 rvid = (rend & RS_RVid) ? 1 : 0;
2152#ifdef OPTION_HC 2174#ifdef OPTION_HC
2153 if (!rvid && (rend & RS_Blink)) 2175 if (!rvid && (rend & RS_Blink))
2154 { 2176 {
2155 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_HC)) 2177 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC))
2156 back = Color_HC; 2178 back = Color_HC;
2157 else 2179 else
2158 rvid = !rvid; /* fall back */ 2180 rvid = !rvid; /* fall back */
2159 } 2181 }
2160#endif 2182#endif
2161 if (rvid) 2183 if (rvid)
2162 { 2184 {
2163 SWAP_IT(fore, back, int); 2185 SWAP_IT(fore, back, int);
2164 2186
2165#ifndef NO_BOLD_UNDERLINE_REVERSE 2187#ifndef NO_BOLD_UNDERLINE_REVERSE
2166 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_RV) 2188 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_RV)
2167# ifndef NO_CURSORCOLOR 2189# ifndef NO_CURSORCOLOR
2168 && !ISSET_PIXCOLOR(R, Color_cursor) 2190 && !ISSET_PIXCOLOR (this, Color_cursor)
2169# endif 2191# endif
2170 ) 2192 )
2171 back = Color_RV; 2193 back = Color_RV;
2172#endif 2194#endif
2173 } 2195 }
2174#ifndef NO_BOLD_UNDERLINE_REVERSE 2196#ifndef NO_BOLD_UNDERLINE_REVERSE
2175 else if (rend & RS_Bold) 2197 else if (rend & RS_Bold)
2176 { 2198 {
2177 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_BD)) 2199 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD))
2178 { 2200 {
2179 fore = Color_BD; 2201 fore = Color_BD;
2180# ifndef VERYBOLD 2202# ifndef VERYBOLD
2181 rend &= ~RS_Bold; /* we've taken care of it */ 2203 rend &= ~RS_Bold; /* we've taken care of it */
2182# endif 2204# endif
2183 } 2205 }
2184 } 2206 }
2185 else if (rend & RS_Uline) 2207 else if (rend & RS_Uline)
2186 { 2208 {
2187 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_UL)) 2209 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL))
2188 { 2210 {
2189 fore = Color_UL; 2211 fore = Color_UL;
2190 rend &= ~RS_Uline; /* we've taken care of it */ 2212 rend &= ~RS_Uline; /* we've taken care of it */
2191 } 2213 }
2192 } 2214 }
2193#endif 2215#endif
2194 2216
2195/* 2217 /*
2196 * Actually do the drawing of the string here 2218 * Actually do the drawing of the string here
2197 */ 2219 */
2198 rxvt_font *font = (*R->TermWin.fontset)[fid]; 2220 rxvt_font *font = (*TermWin.fontset)[fid];
2199 2221
2200 if (back == Color_bg) 2222 if (back == Color_bg)
2201 { 2223 {
2202 if (must_clear) 2224 if (must_clear)
2203 { 2225 {
… …
2206 { 2228 {
2207 font->draw (xpixel, ypixel, text, count, fore, -1); 2229 font->draw (xpixel, ypixel, text, count, fore, -1);
2208 goto nodraw; 2230 goto nodraw;
2209 } 2231 }
2210 2232
2211 CLEAR_CHARS(xpixel, ypixel, count); 2233 CLEAR_CHARS (xpixel, ypixel, count);
2212nodraw: ; 2234nodraw: ;
2213 } 2235 }
2214 else 2236 else
2215 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2237 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2216 } 2238 }
2217 else 2239 else
2218 font->draw (xpixel, ypixel, text, count, fore, back); 2240 font->draw (xpixel, ypixel, text, count, fore, back);
2219 2241
2220 if ((rend & RS_Uline) && (font->descent > 1)) 2242 if ((rend & RS_Uline) && (font->descent > 1))
2221 XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc, 2243 XDrawLine(Xdisplay, drawBuffer, TermWin.gc,
2222 xpixel, ypixel + font->ascent + 1, 2244 xpixel, ypixel + font->ascent + 1,
2223 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2245 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1);
2224 } /* for (col....) */ 2246 } /* for (col....) */
2225 } /* for (row....) */ 2247 } /* for (row....) */
2226 2248
2227/* 2249 /*
2228 * G: cleanup cursor and display outline cursor if necessary 2250 * G: cleanup cursor and display outline cursor if necessary
2229 */ 2251 */
2230 if (showcursor) { 2252 if (showcursor) {
2231 if (R->TermWin.focus) { 2253 if (TermWin.focus) {
2232 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 2254 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
2233 [R->screen.cur.col]); 2255 [screen.cur.col]);
2234 *srp ^= RS_RVid; 2256 *srp ^= RS_RVid;
2235#ifndef NO_CURSORCOLOR 2257#ifndef NO_CURSORCOLOR
2236 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2258 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1;
2237#endif 2259#endif
2238 } else if (R->oldcursor.row >= 0) { 2260 } else if (oldcursor.row >= 0) {
2239#ifndef NO_CURSORCOLOR 2261#ifndef NO_CURSORCOLOR
2240 unsigned long gcmask; /* Graphics Context mask */ 2262 unsigned long gcmask; /* Graphics Context mask */
2241 2263
2242 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) { 2264 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor))
2243 XSetForeground (R->Xdisplay, R->TermWin.gc, R->PixColors[Color_cursor]); 2265 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]);
2244 }
2245#endif 2266#endif
2246 XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, 2267 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
2247 Col2Pixel(R->oldcursor.col), 2268 Col2Pixel(oldcursor.col),
2248 Row2Pixel(R->oldcursor.row), 2269 Row2Pixel(oldcursor.row),
2249 (unsigned int)(Width2Pixel(cursorwidth) - 1), 2270 (unsigned int)(Width2Pixel(cursorwidth) - 1),
2250 (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1)); 2271 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1));
2251 } 2272 }
2252 } 2273 }
2253/* 2274
2275 /*
2254 * H: cleanup selection 2276 * H: cleanup selection
2255 */ 2277 */
2256 rxvt_scr_reverse_selection(aR); 2278 rxvt_scr_reverse_selection (this);
2257 2279
2258/* 2280 /*
2259 * I: other general cleanup 2281 * I: other general cleanup
2260 */ 2282 */
2261 if (clearfirst && R->TermWin.int_bwidth) 2283 if (clearfirst && TermWin.int_bwidth)
2262 /* 2284 /*
2263 * clear the whole screen height, note that width == 0 is treated 2285 * clear the whole screen height, note that width == 0 is treated
2264 * specially by XClearArea 2286 * specially by XClearArea
2265 */ 2287 */
2266 XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0, 2288 XClearArea(Xdisplay, TermWin.vt, 0, 0,
2267 (unsigned int)R->TermWin.int_bwidth, 2289 (unsigned int)TermWin.int_bwidth,
2268 (unsigned int)TermWin_TotalHeight(), False); 2290 (unsigned int)TermWin_TotalHeight(), False);
2269 if (clearlast && R->TermWin.int_bwidth) 2291 if (clearlast && TermWin.int_bwidth)
2270 /* 2292 /*
2271 * clear the whole screen height, note that width == 0 is treated 2293 * clear the whole screen height, note that width == 0 is treated
2272 * specially by XClearArea 2294 * specially by XClearArea
2273 */ 2295 */
2274 XClearArea(R->Xdisplay, R->TermWin.vt, 2296 XClearArea(Xdisplay, TermWin.vt,
2275 R->TermWin.width + R->TermWin.int_bwidth, 0, 2297 TermWin.width + TermWin.int_bwidth, 0,
2276 (unsigned int)R->TermWin.int_bwidth, 2298 (unsigned int)TermWin.int_bwidth,
2277 (unsigned int)TermWin_TotalHeight(), False); 2299 (unsigned int)TermWin_TotalHeight(), False);
2278 if (refresh_type & SMOOTH_REFRESH) 2300 if (refresh_type & SMOOTH_REFRESH)
2279 XSync(R->Xdisplay, False); 2301 XSync(Xdisplay, False);
2280 2302
2281 R->num_scr = 0; 2303 num_scr = 0;
2282 R->num_scr_allow = 1; 2304 num_scr_allow = 1;
2283 R->want_refresh = 0; /* screen is current */ 2305 want_refresh = 0; /* screen is current */
2284} 2306}
2285/* ------------------------------------------------------------------------- */
2286 2307
2287/* EXTPROTO */ 2308/* ------------------------------------------------------------------------- */
2288void 2309void
2289rxvt_scr_clear(pR) 2310rxvt_term::scr_clear()
2290{ 2311{
2291 if (!R->TermWin.mapped) 2312 if (!TermWin.mapped)
2292 return; 2313 return;
2314
2293 R->num_scr_allow = 0; 2315 num_scr_allow = 0;
2294 R->want_refresh = 1; 2316 want_refresh = 1;
2295#ifdef TRANSPARENT 2317#ifdef TRANSPARENT
2296 if ((R->Options & Opt_transparent) && (R->am_pixmap_trans == 0)) { 2318 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2297 int i; 2319 {
2320 int i;
2298 2321
2299 if (!(R->Options & Opt_transparent_all)) 2322 if (!(Options & Opt_transparent_all))
2300 i = 0; 2323 i = 0;
2301 else 2324 else
2302 i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2325 i = (int)(sizeof(TermWin.parent) / sizeof(Window));
2303 for (; i--;) 2326
2327 while (i--)
2304 if (R->TermWin.parent[i] != None) 2328 if (TermWin.parent[i] != None)
2305 XClearWindow(R->Xdisplay, R->TermWin.parent[i]); 2329 XClearWindow(Xdisplay, TermWin.parent[i]);
2306 } 2330 }
2307#endif 2331#endif
2332
2308 XClearWindow(R->Xdisplay, R->TermWin.vt); 2333 XClearWindow (Xdisplay, TermWin.vt);
2309} 2334}
2310 2335
2311/* ------------------------------------------------------------------------- */ 2336/* ------------------------------------------------------------------------- */
2312/* INTPROTO */ 2337/* INTPROTO */
2313void 2338void
… …
2415 2440
2416/* ------------------------------------------------------------------------- */ 2441/* ------------------------------------------------------------------------- */
2417/* 2442/*
2418 * Paste a selection direct to the command fd 2443 * Paste a selection direct to the command fd
2419 */ 2444 */
2420/* INTPROTO */
2421void 2445void
2422rxvt_PasteIt(pR_ const unsigned char *data, unsigned int nitems) 2446rxvt_term::paste (const unsigned char *data, unsigned int len)
2423{ 2447{
2424 unsigned int i, j, n; 2448 unsigned int i, j, n;
2425 unsigned char *ds = (unsigned char *)rxvt_malloc(PROP_SIZE); 2449 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2426 2450
2451#if 0
2452 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2453 ZERO_SCROLLBACK (r);
2454#endif
2455
2427/* convert normal newline chars into common keyboard Return key sequence */ 2456 /* convert normal newline chars into common keyboard Return key sequence */
2428 for (i = 0; i < nitems; i += PROP_SIZE) { 2457 for (i = 0; i < len; i += PROP_SIZE)
2458 {
2429 n = min(nitems - i, PROP_SIZE); 2459 n = min (len - i, PROP_SIZE);
2430 MEMCPY(ds, data + i, n); 2460 MEMCPY (ds, data + i, n);
2461
2431 for (j = 0; j < n; j++) 2462 for (j = 0; j < n; j++)
2432 if (ds[j] == '\n') 2463 if (ds[j] == '\n')
2433 ds[j] = '\r'; 2464 ds[j] = '\r';
2465
2434 rxvt_tt_write(aR_ ds, (int)n); 2466 tt_write (ds, (int)n);
2435 } 2467 }
2468
2436 free(ds); 2469 free(ds);
2437} 2470}
2438 2471
2439/* ------------------------------------------------------------------------- */ 2472/* ------------------------------------------------------------------------- */
2440/* 2473/*
2441 * Respond to a notification that a primary selection has been sent 2474 * Respond to a notification that a primary selection has been sent
… …
2443 */ 2476 */
2444/* EXTPROTO */ 2477/* EXTPROTO */
2445int 2478int
2446rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2479rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop)
2447{ 2480{
2448 long nread = 0; 2481 long nread = 0;
2449 unsigned long bytes_after; 2482 unsigned long bytes_after;
2450 XTextProperty ct; 2483 XTextProperty ct;
2451#ifdef MULTICHAR_SET 2484 int dummy_count;
2452 int dummy_count; 2485 char **cl;
2453 char **cl;
2454#endif
2455 2486
2456 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); 2487 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait));
2457 2488
2458 if (prop == None) { /* check for failed XConvertSelection */ 2489 if (prop == None) /* check for failed XConvertSelection */
2459#ifdef MULTICHAR_SET 2490 {
2460 if ((R->selection_type & Sel_CompoundText)) { 2491 if ((R->selection_type & Sel_CompoundText))
2492 {
2461 int selnum = R->selection_type & Sel_whereMask; 2493 int selnum = R->selection_type & Sel_whereMask;
2462 2494
2463 R->selection_type = 0; 2495 R->selection_type = 0;
2464 if (selnum != Sel_direct) 2496 if (selnum != Sel_direct)
2465 rxvt_selection_request_other(aR_ XA_STRING, selnum); 2497 rxvt_selection_request_other(aR_ XA_STRING, selnum);
2498 }
2466 } 2499
2467#endif
2468 return 0; 2500 return 0;
2469 } 2501 }
2502
2470 for (;;) { 2503 for (;;)
2504 {
2471 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2505 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4),
2472 (long)(PROP_SIZE / 4), delete_prop, 2506 (long)(PROP_SIZE / 4), delete_prop,
2473 AnyPropertyType, &ct.encoding, &ct.format, 2507 AnyPropertyType, &ct.encoding, &ct.format,
2474 &ct.nitems, &bytes_after, 2508 &ct.nitems, &bytes_after,
2475 &ct.value) != Success) 2509 &ct.value) != Success)
2476 break; 2510 break;
2511
2477 if (ct.encoding == 0) { 2512 if (ct.encoding == 0)
2513 {
2478 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2514 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!"));
2479 break; 2515 break;
2480 } 2516 }
2517
2481 if (ct.value == NULL) { 2518 if (ct.value == NULL)
2519 {
2482 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); 2520 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!"));
2483 continue; 2521 continue;
2484 } 2522 }
2523
2485 if (ct.nitems == 0) { 2524 if (ct.nitems == 0)
2525 {
2486 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2526 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2487 if (R->selection_wait == Sel_normal && nread == 0) { 2527 if (R->selection_wait == Sel_normal && nread == 0)
2528 {
2488 /* 2529 /*
2489 * pass through again trying CUT_BUFFER0 if we've come from 2530 * pass through again trying CUT_BUFFER0 if we've come from
2490 * XConvertSelection() but nothing was presented 2531 * XConvertSelection() but nothing was presented
2491 */ 2532 */
2492 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2533 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2493 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2534 rxvt_selection_paste (aR_ Xroot, XA_CUT_BUFFER0, False);
2494 } 2535 }
2536
2495 nread = -1; /* discount any previous stuff */ 2537 nread = -1; /* discount any previous stuff */
2496 break; 2538 break;
2497 } 2539 }
2540
2498 nread += ct.nitems; 2541 nread += ct.nitems;
2499#ifdef MULTICHAR_SET
2500 if (XmbTextPropertyToTextList(R->Xdisplay, &ct, &cl, 2542 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl,
2501 &dummy_count) == Success && cl) { 2543 &dummy_count) == Success && cl)
2502 rxvt_PasteIt(aR_ cl[0], STRLEN(cl[0])); 2544 {
2545 R->paste ((unsigned char *)cl[0], STRLEN (cl[0]));
2503 XFreeStringList(cl); 2546 XFreeStringList (cl);
2547 }
2504 } else 2548 else
2505#endif 2549 R->paste (ct.value, ct.nitems);
2506 rxvt_PasteIt(aR_ ct.value, (unsigned int)ct.nitems); 2550
2507 if (bytes_after == 0) 2551 if (bytes_after == 0)
2508 break; 2552 break;
2553
2509 XFree(ct.value); 2554 XFree (ct.value);
2510 } 2555 }
2556
2511 if (ct.value) 2557 if (ct.value)
2512 XFree(ct.value); 2558 XFree (ct.value);
2559
2513 if (R->selection_wait == Sel_normal) 2560 if (R->selection_wait == Sel_normal)
2514 R->selection_wait = Sel_none; 2561 R->selection_wait = Sel_none;
2562
2515 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); 2563 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2516 return (int)nread; 2564 return (int)nread;
2565}
2566
2567void
2568rxvt_term::incr_cb (time_watcher &w)
2569{
2570 selection_wait = Sel_none;
2571
2572 rxvt_print_error ("data loss: timeout on INCR selection paste");
2517} 2573}
2518 2574
2519/* 2575/*
2520 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2576 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2521 */ 2577 */
… …
2553 } else if (R->selection_wait == Sel_incr) { 2609 } else if (R->selection_wait == Sel_incr) {
2554 reget_time = 1; 2610 reget_time = 1;
2555 if (rxvt_selection_paste(aR_ win, prop, True) == -1) { 2611 if (rxvt_selection_paste(aR_ win, prop, True) == -1) {
2556 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); 2612 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2557 R->selection_wait = Sel_none; 2613 R->selection_wait = Sel_none;
2558 R->timeout[TIMEOUT_INCR].tv_sec = 0; /* turn off timer */ 2614 R->incr_ev.stop ();
2559 } 2615 }
2560 } 2616 }
2561 if (reget_time) { /* received more data so reget time */ 2617 if (reget_time) /* received more data so reget time */
2562 (void)gettimeofday(&(R->timeout[TIMEOUT_INCR]), NULL); 2618 R->incr_ev.start (NOW + 10);
2563 R->timeout[TIMEOUT_INCR].tv_sec += 10; /* ten seconds wait */
2564 }
2565} 2619}
2566/* ------------------------------------------------------------------------- */ 2620/* ------------------------------------------------------------------------- */
2567/* 2621/*
2568 * Request the current selection: 2622 * Request the current selection:
2569 * Order: > internal selection if available 2623 * Order: > internal selection if available
… …
2581 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2635 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height)
2582 return; /* outside window */ 2636 return; /* outside window */
2583 2637
2584 if (R->selection.text != NULL) { /* internal selection */ 2638 if (R->selection.text != NULL) { /* internal selection */
2585 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2639 D_SELECT((stderr, "rxvt_selection_request: pasting internal"));
2586 rxvt_PasteIt(aR_ R->selection.text, R->selection.len); 2640 R->paste (R->selection.text, R->selection.len);
2587 return; 2641 return;
2588 } else { 2642 } else {
2589 int i; 2643 int i;
2590 2644
2591 R->selection_request_time = tm; 2645 R->selection_request_time = tm;
2592 R->selection_wait = Sel_normal; 2646 R->selection_wait = Sel_normal;
2593 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2647 for (i = Sel_Primary; i <= Sel_Clipboard; i++) {
2594#ifdef MULTICHAR_SET
2595 R->selection_type = Sel_CompoundText; 2648 R->selection_type = Sel_CompoundText;
2596#else
2597 R->selection_type = 0;
2598#endif
2599 if (rxvt_selection_request_other(aR_ 2649 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i))
2600#ifdef MULTICHAR_SET
2601 R->xa[XA_COMPOUND_TEXT],
2602#else
2603 XA_STRING,
2604#endif
2605 i))
2606 return; 2650 return;
2607 } 2651 }
2608 } 2652 }
2609 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2653 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */
2610 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2654 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
… …
2767/* ------------------------------------------------------------------------- */ 2811/* ------------------------------------------------------------------------- */
2768/* 2812/*
2769 * Mark or select text based upon number of clicks: 1, 2, or 3 2813 * Mark or select text based upon number of clicks: 1, 2, or 3
2770 * EXT: button 1 press 2814 * EXT: button 1 press
2771 */ 2815 */
2772/* EXTPROTO */
2773void 2816void
2774rxvt_selection_click(pR_ int clicks, int x, int y) 2817rxvt_term::selection_click (int clicks, int x, int y)
2775{ 2818{
2776 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); 2819 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2777 2820
2778 clicks = ((clicks - 1) % 3) + 1; 2821 clicks = ((clicks - 1) % 3) + 1;
2779 R->selection.clicks = clicks; /* save clicks so extend will work */ 2822 selection.clicks = clicks; /* save clicks so extend will work */
2780 2823
2781 rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); 2824 rxvt_selection_start_colrow (this, Pixel2Col(x), Pixel2Row(y));
2825
2782 if (clicks == 2 || clicks == 3) 2826 if (clicks == 2 || clicks == 3)
2783 rxvt_selection_extend_colrow(aR_ R->selection.mark.col, 2827 rxvt_selection_extend_colrow (this, selection.mark.col,
2784 R->selection.mark.row
2785 + R->TermWin.view_start, 2828 selection.mark.row + TermWin.view_start,
2786 0, /* button 3 */ 2829 0, /* button 3 */
2787 1, /* button press */ 2830 1, /* button press */
2788 0); /* click change */ 2831 0); /* click change */
2789} 2832}
2790 2833
2791/* ------------------------------------------------------------------------- */ 2834/* ------------------------------------------------------------------------- */
2792/* 2835/*
2793 * Mark a selection at the specified col/row 2836 * Mark a selection at the specified col/row
… …
2819 */ 2862 */
2820 2863
2821/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2864/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2822#define DELIMIT_TEXT(x) \ 2865#define DELIMIT_TEXT(x) \
2823 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) 2866 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->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 2867#define DELIMIT_REND(x) 1
2828#endif
2829 2868
2830/* INTPROTO */ 2869/* INTPROTO */
2831void 2870void
2832rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2871rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2833{ 2872{
… …
2907 * EXT: button 3 press; button 1 or 3 drag 2946 * EXT: button 3 press; button 1 or 3 drag
2908 * flag == 0 ==> button 1 2947 * flag == 0 ==> button 1
2909 * flag == 1 ==> button 3 press 2948 * flag == 1 ==> button 3 press
2910 * flag == 2 ==> button 3 motion 2949 * flag == 2 ==> button 3 motion
2911 */ 2950 */
2912/* EXTPROTO */
2913void 2951void
2914rxvt_selection_extend(pR_ int x, int y, int flag) 2952rxvt_term::selection_extend (int x, int y, int flag)
2915{ 2953{
2916 int col, row; 2954 int col, row;
2917 2955
2918 col = Pixel2Col(x); 2956 col = Pixel2Col(x);
2919 row = Pixel2Row(y); 2957 row = Pixel2Row(y);
2920 MAX_IT(row, 0); 2958 MAX_IT(row, 0);
2921 MIN_IT(row, (int)R->TermWin.nrow - 1); 2959 MIN_IT(row, (int)TermWin.nrow - 1);
2922 MAX_IT(col, 0); 2960 MAX_IT(col, 0);
2923 MIN_IT(col, (int)R->TermWin.ncol); 2961 MIN_IT(col, (int)TermWin.ncol);
2962
2924#ifndef NO_NEW_SELECTION 2963#ifndef NO_NEW_SELECTION
2925/* 2964 /*
2926 * If we're selecting characters (single click) then we must check first 2965 * If we're selecting characters (single click) then we must check first
2927 * if we are at the same place as the original mark. If we are then 2966 * if we are at the same place as the original mark. If we are then
2928 * select nothing. Otherwise, if we're to the right of the mark, you have to 2967 * select nothing. Otherwise, if we're to the right of the mark, you have to
2929 * be _past_ a character for it to be selected. 2968 * be _past_ a character for it to be selected.
2930 */ 2969 */
2931 if (R->selection_style != OLD_SELECT) { 2970 if (selection_style != OLD_SELECT)
2971 {
2932 if (((R->selection.clicks % 3) == 1) && !flag 2972 if (((selection.clicks % 3) == 1) && !flag
2933 && (col == R->selection.mark.col 2973 && (col == selection.mark.col
2934 && (row == R->selection.mark.row + R->TermWin.view_start))) { 2974 && (row == selection.mark.row + TermWin.view_start)))
2975 {
2935 /* select nothing */ 2976 /* select nothing */
2936 R->selection.beg.row = R->selection.end.row = 0; 2977 selection.beg.row = selection.end.row = 0;
2937 R->selection.beg.col = R->selection.end.col = 0; 2978 selection.beg.col = selection.end.col = 0;
2938 R->selection.clicks = 4; 2979 selection.clicks = 4;
2939 R->want_refresh = 1; 2980 want_refresh = 1;
2940 D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4")); 2981 D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4"));
2941 return; 2982 return;
2942 } 2983 }
2943 } 2984 }
2944#endif 2985#endif
2945 if (R->selection.clicks == 4) 2986 if (selection.clicks == 4)
2946 R->selection.clicks = 1; 2987 selection.clicks = 1;
2988
2947 rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ 2989 rxvt_selection_extend_colrow (this, col, row, !!flag, /* ? button 3 */
2948 flag == 1 ? 1 : 0, /* ? button press */ 2990 flag == 1 ? 1 : 0, /* ? button press */
2949 0); /* no click change */ 2991 0); /* no click change */
2950} 2992}
2951 2993
2952/* ------------------------------------------------------------------------- */ 2994/* ------------------------------------------------------------------------- */
2953/* 2995/*
2954 * Extend the selection to the specified col/row 2996 * Extend the selection to the specified col/row
… …
3208/* ------------------------------------------------------------------------- */ 3250/* ------------------------------------------------------------------------- */
3209/* 3251/*
3210 * Double click on button 3 when already selected 3252 * Double click on button 3 when already selected
3211 * EXT: button 3 double click 3253 * EXT: button 3 double click
3212 */ 3254 */
3213/* EXTPROTO */
3214void 3255void
3215rxvt_selection_rotate(pR_ int x, int y) 3256rxvt_term::selection_rotate (int x, int y)
3216{ 3257{
3217 R->selection.clicks = R->selection.clicks % 3 + 1; 3258 selection.clicks = selection.clicks % 3 + 1;
3218 rxvt_selection_extend_colrow(aR_ Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3259 rxvt_selection_extend_colrow (this, Pixel2Col(x), Pixel2Row(y), 1, 0, 1);
3219} 3260}
3220 3261
3221/* ------------------------------------------------------------------------- */ 3262/* ------------------------------------------------------------------------- */
3222/* 3263/*
3223 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3264 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
… …
3327 * ------------------------------------------------------------------------- */ 3368 * ------------------------------------------------------------------------- */
3328 3369
3329/* 3370/*
3330 * return col/row values corresponding to x/y pixel values 3371 * return col/row values corresponding to x/y pixel values
3331 */ 3372 */
3332/* EXTPROTO */
3333void 3373void
3334rxvt_pixel_position(pR_ int *x, int *y) 3374rxvt_term::pixel_position (int *x, int *y)
3335{ 3375{
3336 *x = Pixel2Col(*x); 3376 *x = Pixel2Col(*x);
3337/* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3377 /* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */
3338 *y = Pixel2Row(*y); 3378 *y = Pixel2Row(*y);
3339/* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3379 /* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */
3340} 3380}
3381
3341/* ------------------------------------------------------------------------- */ 3382/* ------------------------------------------------------------------------- */
3342#ifdef USE_XIM 3383#ifdef USE_XIM
3343/* EXTPROTO */
3344void 3384void
3345rxvt_setPosition(pR_ XPoint *pos) 3385rxvt_term::set_position (XPoint *pos)
3346{ 3386{
3347 XWindowAttributes xwa; 3387 XWindowAttributes xwa;
3348 3388
3349 XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); 3389 XGetWindowAttributes (Xdisplay, TermWin.vt, &xwa);
3350 pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; 3390 pos->x = Col2Pixel (screen.cur.col) + xwa.x;
3351 pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y 3391 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3352 - R->TermWin.lineSpace;
3353} 3392}
3393
3354#endif 3394#endif
3355/* ------------------------------------------------------------------------- */ 3395/* ------------------------------------------------------------------------- */
3356 3396
3357/* ------------------------------------------------------------------------- * 3397/* ------------------------------------------------------------------------- *
3358 * DEBUG ROUTINES * 3398 * DEBUG ROUTINES *

Diff Legend

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