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.5 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.37 by pcg, Tue Feb 24 23:58:13 2004 UTC

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

Diff Legend

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