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.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC

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

Diff Legend

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