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

Diff Legend

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