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.7 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.22 by pcg, Sat Jan 31 02:14:58 2004 UTC

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

Diff Legend

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