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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.22 by pcg, Sat Jan 31 02:14:58 2004 UTC

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

Diff Legend

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