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

Diff Legend

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