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