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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.21 by pcg, Sat Jan 31 00:20:21 2004 UTC

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

Diff Legend

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