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.5 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.20 by pcg, Fri Jan 30 15:58:07 2004 UTC

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

Diff Legend

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